From 073e0eb3c9148d6dd8b2c9ce788843b8180351cb Mon Sep 17 00:00:00 2001 From: Darkvater Date: Tue, 26 Dec 2006 17:36:18 +0000 Subject: (svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to use in debug.h. grfmsg() is now used as a specific debug-function for grf. --- yapf/yapf_base.hpp | 2 +- yapf/yapf_costcache.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'yapf') diff --git a/yapf/yapf_base.hpp b/yapf/yapf_base.hpp index 0c7e7effe..1d0417987 100644 --- a/yapf/yapf_base.hpp +++ b/yapf/yapf_base.hpp @@ -146,7 +146,7 @@ public: 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; - 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)); + DEBUG(yapf, 3, "[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)); return bDestFound; } diff --git a/yapf/yapf_costcache.hpp b/yapf/yapf_costcache.hpp index 4d1f5ea0f..c90d37302 100644 --- a/yapf/yapf_costcache.hpp +++ b/yapf/yapf_costcache.hpp @@ -155,7 +155,7 @@ protected: // some statistics if (last_date != _date) { last_date = _date; - DEBUG(yapf, 1) ("pf time today:%5d ms", _total_pf_time_us / 1000); + DEBUG(yapf, 2, "Pf time today: %5d ms", _total_pf_time_us / 1000); _total_pf_time_us = 0; } -- cgit v1.2.3-70-g09d2