# HG changeset patch # User KUDr # Date 1149412439 0 # Node ID 7ab994b0fe9cdee3fd7f923bb9aa20e955d7cab8 # Parent c9e039a60682ca1956907631b3c6e2e25f159e58 (svn r5093) -CodeChange: [YAPF] min. debug level changed from 1 to 3 and 4 for frequent debug messages (performance stats) diff -r c9e039a60682 -r 7ab994b0fe9c roadveh_cmd.c --- a/roadveh_cmd.c Sun Jun 04 09:10:24 2006 +0000 +++ b/roadveh_cmd.c Sun Jun 04 09:13:59 2006 +0000 @@ -993,7 +993,7 @@ void* perf = NpfBeginInterval(); NPFFoundTargetData ret = NPFRouteToStationOrTile(tile, trackdir, target, type, owner, railtypes); int t = NpfEndInterval(perf); - DEBUG(yapf, 1)("[YAPF][NPFR] %d us - %d rounds - %d open - %d closed -- ", t, 0, _aystar_stats_open_size, _aystar_stats_closed_size); + DEBUG(yapf, 4)("[YAPF][NPFR] %d us - %d rounds - %d open - %d closed -- ", t, 0, _aystar_stats_open_size, _aystar_stats_closed_size); return ret; } diff -r c9e039a60682 -r 7ab994b0fe9c ship_cmd.c --- a/ship_cmd.c Sun Jun 04 09:10:24 2006 +0000 +++ b/ship_cmd.c Sun Jun 04 09:13:59 2006 +0000 @@ -526,7 +526,7 @@ void* perf = NpfBeginInterval(); NPFFoundTargetData ret = NPFRouteToStationOrTile(tile, trackdir, target, type, owner, railtypes); int t = NpfEndInterval(perf); - DEBUG(yapf, 1)("[YAPF][NPFW] %d us - %d rounds - %d open - %d closed -- ", t, 0, _aystar_stats_open_size, _aystar_stats_closed_size); + DEBUG(yapf, 4)("[YAPF][NPFW] %d us - %d rounds - %d open - %d closed -- ", t, 0, _aystar_stats_open_size, _aystar_stats_closed_size); return ret; } diff -r c9e039a60682 -r 7ab994b0fe9c train_cmd.c --- a/train_cmd.c Sun Jun 04 09:10:24 2006 +0000 +++ b/train_cmd.c Sun Jun 04 09:13:59 2006 +0000 @@ -2212,7 +2212,7 @@ } time = NpfEndInterval(perf); - DEBUG(yapf, 1)("[YAPF][NPFT] %d us - %d rounds - %d open - %d closed -- ", time, 0, _aystar_stats_open_size, _aystar_stats_closed_size); + DEBUG(yapf, 4)("[YAPF][NPFT] %d us - %d rounds - %d open - %d closed -- ", time, 0, _aystar_stats_open_size, _aystar_stats_closed_size); } else { void* perf = NpfBeginInterval(); int time = 0; @@ -2235,7 +2235,7 @@ } time = NpfEndInterval(perf); - DEBUG(yapf, 1)("[YAPF][NTPT] %d us - %d rounds - %d open - %d closed -- ", time, 0, 0, 0); + DEBUG(yapf, 4)("[YAPF][NTPT] %d us - %d rounds - %d open - %d closed -- ", time, 0, 0, 0); } #ifdef PF_BENCHMARK diff -r c9e039a60682 -r 7ab994b0fe9c yapf/yapf_base.hpp --- a/yapf/yapf_base.hpp Sun Jun 04 09:10:24 2006 +0000 +++ b/yapf/yapf_base.hpp Sun Jun 04 09:13:59 2006 +0000 @@ -154,7 +154,7 @@ #ifdef UNITTEST printf("%c%c%4d-%6d us -%5d rounds -%4d open -%5d closed - CHR %4.1f%% - c/d(%d, %d) - c%d(sc%d, ts%d, o%d) -- \n", bDestFound ? '-' : '!', ttc, veh_idx, t, m_num_steps, m_nodes.OpenCount(), m_nodes.ClosedCount(), cache_hit_ratio, cost, dist, m_perf_cost.Get(1000000), m_perf_slope_cost.Get(1000000), m_perf_ts_cost.Get(1000000), m_perf_other_cost.Get(1000000)); #else - DEBUG(yapf, 1)("[YAPF][YAPF%c]%c%4d- %d us - %d rounds - %d open - %d closed - CHR %4.1f%% - c%d(sc%d, ts%d, o%d) -- ", ttc, bDestFound ? '-' : '!', veh_idx, t, m_num_steps, m_nodes.OpenCount(), m_nodes.ClosedCount(), cache_hit_ratio, cost, dist, m_perf_cost.Get(1000000), m_perf_slope_cost.Get(1000000), m_perf_ts_cost.Get(1000000), m_perf_other_cost.Get(1000000)); + DEBUG(yapf, 3)("[YAPF][YAPF%c]%c%4d- %d us - %d rounds - %d open - %d closed - CHR %4.1f%% - c%d(sc%d, ts%d, o%d) -- ", ttc, bDestFound ? '-' : '!', veh_idx, t, m_num_steps, m_nodes.OpenCount(), m_nodes.ClosedCount(), cache_hit_ratio, cost, dist, m_perf_cost.Get(1000000), m_perf_slope_cost.Get(1000000), m_perf_ts_cost.Get(1000000), m_perf_other_cost.Get(1000000)); #endif return bDestFound; }