gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r5169) - CodeChange: [YAPF] RVs now use YAPF_TILE_LENGTH as base unit and 2 configurable settings (slope and crossing penalties) for cost calculation

Browse Source
This commit is contained in:
KUDr 2006-06-08 17:31:03 +00:00
parent 0b3e83a2fb
commit c7d1e2eab5
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
settings.c
View File

@ -1412,6 +1412,9 @@ const SettingDesc _patch_settings[] = {
SDT_CONDVAR (Patches, yapf.rail_longer_platform_per_tile_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 0 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), SDT_CONDVAR (Patches, yapf.rail_longer_platform_per_tile_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 0 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL),
SDT_CONDVAR (Patches, yapf.rail_shorter_platform_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 40 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), SDT_CONDVAR (Patches, yapf.rail_shorter_platform_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 40 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL),
SDT_CONDVAR (Patches, yapf.rail_shorter_platform_per_tile_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 0 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), SDT_CONDVAR (Patches, yapf.rail_shorter_platform_per_tile_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 0 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL),
// road vehicles - penalties
SDT_CONDVAR (Patches, yapf.road_slope_penalty , SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 2 * YAPF_TILE_LENGTH, 0, 1000000, STR_NULL, NULL),
SDT_CONDVAR (Patches, yapf.rail_crossing_penalty , SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 3 * YAPF_TILE_LENGTH, 0, 1000000, STR_NULL, NULL),
SDT_END() SDT_END()
}; };

12
yapf/yapf_road.cpp
View File

@ -33,7 +33,7 @@ protected:
if (z2 - z1 > 1) { if (z2 - z1 > 1) {
/* Slope up */ /* Slope up */
return Yapf().PfGetSettings().rail_slope_penalty; return Yapf().PfGetSettings().road_slope_penalty;
} }
return 0; return 0;
} }
@ -44,12 +44,12 @@ protected:
int cost = 0; int cost = 0;
// set base cost // set base cost
if (IsDiagonalTrackdir(trackdir)) { if (IsDiagonalTrackdir(trackdir)) {
cost += 10; cost += YAPF_TILE_LENGTH;
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_STREET: case MP_STREET:
/* Increase the cost for level crossings */ /* Increase the cost for level crossings */
if (IsLevelCrossing(tile)) if (IsLevelCrossing(tile))
cost += Yapf().PfGetSettings().rail_crossing_penalty; cost += Yapf().PfGetSettings().road_crossing_penalty;
break; break;
default: default:
@ -57,7 +57,7 @@ protected:
} }
} else { } else {
// non-diagonal trackdir // non-diagonal trackdir
cost = 7; cost = YAPF_TILE_CORNER_LENGTH;
} }
return cost; return cost;
} }
@ -95,7 +95,7 @@ public:
if (F.m_new_tile == n.m_key.m_tile && new_td == n.m_key.m_td) return false; if (F.m_new_tile == n.m_key.m_tile && new_td == n.m_key.m_td) return false;
// if we skipped some tunnel tiles, add their cost // if we skipped some tunnel tiles, add their cost
segment_cost += 10 * F.m_tiles_skipped; segment_cost += F.m_tiles_skipped * YAPF_TILE_LENGTH;
// add hilly terrain penalty // add hilly terrain penalty
segment_cost += Yapf().SlopeCost(tile, F.m_new_tile, trackdir); segment_cost += Yapf().SlopeCost(tile, F.m_new_tile, trackdir);
@ -206,7 +206,7 @@ public:
int dy = abs(y1 - y2); int dy = abs(y1 - y2);
int dmin = min(dx, dy); int dmin = min(dx, dy);
int dxy = abs(dx - dy); int dxy = abs(dx - dy);
int d = dmin * 7 + (dxy - 1) * 5; int d = dmin * YAPF_TILE_CORNER_LENGTH + (dxy - 1) * (YAPF_TILE_LENGTH / 2);
n.m_estimate = n.m_cost + d; n.m_estimate = n.m_cost + d;
assert(n.m_estimate >= n.m_parent->m_estimate); assert(n.m_estimate >= n.m_parent->m_estimate);
return true; return true;

2
yapf/yapf_settings.h
View File

@ -36,6 +36,8 @@ YS_DEF_BEGIN
YS_DEF(bool , ship_use_yapf) ///< use YAPF for ships YS_DEF(bool , ship_use_yapf) ///< use YAPF for ships
YS_DEF(bool , road_use_yapf) ///< use YAPF for road YS_DEF(bool , road_use_yapf) ///< use YAPF for road
YS_DEF(bool , rail_use_yapf) ///< use YAPF for rail YS_DEF(bool , rail_use_yapf) ///< use YAPF for rail
YS_DEF(uint32, road_slope_penalty) ///< penalty for up-hill slope
YS_DEF(uint32, road_crossing_penalty) ///< penalty for level crossing
YS_DEF(bool , rail_firstred_twoway_eol) ///< treat first red two-way signal as dead end YS_DEF(bool , rail_firstred_twoway_eol) ///< treat first red two-way signal as dead end
YS_DEF(uint32, rail_firstred_penalty) ///< penalty for first red signal YS_DEF(uint32, rail_firstred_penalty) ///< penalty for first red signal
YS_DEF(uint32, rail_firstred_exit_penalty) ///< penalty for first red exit signal YS_DEF(uint32, rail_firstred_exit_penalty) ///< penalty for first red exit signal