diff -r 48ab394a84e8 -r 241260bd5505 yapf/yapf_base.hpp --- a/yapf/yapf_base.hpp Wed Sep 06 13:58:31 2006 +0000 +++ b/yapf/yapf_base.hpp Wed Sep 06 14:24:43 2006 +0000 @@ -76,13 +76,8 @@ FORCEINLINE CYapfBaseT() : m_pBestDestNode(NULL) , m_pBestIntermediateNode(NULL) -#if defined(UNITTEST) - , m_settings(NULL) - , m_max_search_nodes(100000) -#else , m_settings(&_patches.yapf) , m_max_search_nodes(PfGetSettings().max_search_nodes) -#endif , m_veh(NULL) , m_stats_cost_calcs(0) , m_stats_cache_hits(0) @@ -151,11 +146,7 @@ float cache_hit_ratio = (float)m_stats_cache_hits / (float)(m_stats_cache_hits + m_stats_cost_calcs) * 100.0f; int cost = bDestFound ? m_pBestDestNode->m_cost : -1; int dist = bDestFound ? m_pBestDestNode->m_estimate - m_pBestDestNode->m_cost : -1; -#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, 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; }