From 86a2b6eb070ce1ce0b13b95ff4e0deac2cbf61c4 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Tue, 8 Mar 2016 22:37:08 +0100 Subject: [PATCH] Remove obsolete debug information --- .../routing_algorithms/map_matching.hpp | 13 -- include/util/matching_debug_info.hpp | 142 ------------------ src/engine/plugins/match.cpp | 7 - 3 files changed, 162 deletions(-) delete mode 100644 include/util/matching_debug_info.hpp diff --git a/include/engine/routing_algorithms/map_matching.hpp b/include/engine/routing_algorithms/map_matching.hpp index 9a0da8866..7d8b04e99 100644 --- a/include/engine/routing_algorithms/map_matching.hpp +++ b/include/engine/routing_algorithms/map_matching.hpp @@ -10,7 +10,6 @@ #include "util/coordinate_calculation.hpp" #include "util/json_logger.hpp" #include "util/for_each_pair.hpp" -#include "util/matching_debug_info.hpp" #include @@ -162,9 +161,6 @@ class MapMatching final : public BasicRoutingInterfaceGetNumberOfNodes()); engine_working_data.InitializeOrClearSecondThreadLocalStorage( @@ -297,10 +293,6 @@ class MapMatching final : public BasicRoutingInterface current_viterbi[s_prime]) { current_viterbi[s_prime] = new_value; @@ -330,8 +322,6 @@ class MapMatching final : public BasicRoutingInterfacemap->at("matching"); - } - } - - template void initialize(const CandidateLists &candidates_list) - { - // json logger not enabled - if (!logger) - { - return; - } - - json::Array states; - for (auto &elem : candidates_list) - { - json::Array timestamps; - for (auto &elem_s : elem) - { - json::Object state; - state.values["transitions"] = json::Array(); - state.values["coordinate"] = json::make_array( - static_cast(toFloating(elem_s.phantom_node.location.lat)), - static_cast(toFloating(elem_s.phantom_node.location.lon))); - state.values["viterbi"] = - json::clamp_float(engine::map_matching::IMPOSSIBLE_LOG_PROB); - state.values["pruned"] = 0u; - timestamps.values.push_back(state); - } - states.values.push_back(timestamps); - } - json::get(*object, "states") = states; - } - - void add_transition_info(const unsigned prev_t, - const unsigned current_t, - const unsigned prev_state, - const unsigned current_state, - const double prev_viterbi, - const double emission_pr, - const double transition_pr, - const double network_distance, - const double haversine_distance) - { - // json logger not enabled - if (!logger) - { - return; - } - - json::Object transistion; - transistion.values["to"] = json::make_array(current_t, current_state); - transistion.values["properties"] = json::make_array( - json::clamp_float(prev_viterbi), json::clamp_float(emission_pr), - json::clamp_float(transition_pr), network_distance, haversine_distance); - - json::get(*object, "states", prev_t, prev_state, "transitions") - .get>() - .get() - .values.push_back(transistion); - } - - void set_viterbi(const std::vector> &viterbi, - const std::vector> &pruned) - { - // json logger not enabled - if (!logger) - { - return; - } - - for (auto t = 0u; t < viterbi.size(); t++) - { - for (auto s_prime = 0u; s_prime < viterbi[t].size(); ++s_prime) - { - json::get(*object, "states", t, s_prime, "viterbi") = - json::clamp_float(viterbi[t][s_prime]); - json::get(*object, "states", t, s_prime, "pruned") = - static_cast(pruned[t][s_prime]); - } - } - } - - void add_chosen(const unsigned t, const unsigned s) - { - // json logger not enabled - if (!logger) - { - return; - } - - json::get(*object, "states", t, s, "chosen") = true; - } - - void add_breakage(const std::vector &breakage) - { - // json logger not enabled - if (!logger) - { - return; - } - - // convert std::vector to osrm::json::Array - json::Array a; - for (const bool v : breakage) - { - if (v) - a.values.emplace_back(json::True()); - else - a.values.emplace_back(json::False()); - } - - json::get(*object, "breakage") = std::move(a); - } - - const json::Logger *logger; - json::Value *object; -}; -} -} - -#endif // MATCHING_DEBUG_INFO_HPP diff --git a/src/engine/plugins/match.cpp b/src/engine/plugins/match.cpp index 5c05e98cc..f115a822d 100644 --- a/src/engine/plugins/match.cpp +++ b/src/engine/plugins/match.cpp @@ -159,10 +159,6 @@ Status MatchPlugin::HandleRequest(const api::MatchParameters ¶meters, json_result); } - // setup logging if enabled - if (util::json::Logger::get()) - util::json::Logger::get()->initialize("matching"); - // call the actual map matching SubMatchingList sub_matchings = map_matching(candidates_lists, parameters.coordinates, parameters.timestamps, parameters.radiuses); @@ -195,9 +191,6 @@ Status MatchPlugin::HandleRequest(const api::MatchParameters ¶meters, api::MatchAPI match_api{BasePlugin::facade, parameters}; match_api.MakeResponse(sub_matchings, sub_routes, json_result); - if (util::json::Logger::get()) - util::json::Logger::get()->render("matching", json_result); - return Status::Ok; } }