From e0527a2478e336837db4f4ee11755aa9a161cb9e Mon Sep 17 00:00:00 2001 From: eric bryant Date: Sun, 22 Nov 2020 17:25:30 -0500 Subject: [PATCH] Omit user log lines for untraveled systems --- .../classes/TravelerList/userlog.cpp | 34 +++++++++---------- siteupdate/python-teresco/siteupdate.py | 27 +++++++-------- 2 files changed, 28 insertions(+), 33 deletions(-) diff --git a/siteupdate/cplusplus/classes/TravelerList/userlog.cpp b/siteupdate/cplusplus/classes/TravelerList/userlog.cpp index aa42d40e..e6a9d9ba 100644 --- a/siteupdate/cplusplus/classes/TravelerList/userlog.cpp +++ b/siteupdate/cplusplus/classes/TravelerList/userlog.cpp @@ -41,21 +41,21 @@ void TravelerList::userlog double t_system_overall = 0; if (system_region_mileages.find(h) != system_region_mileages.end()) t_system_overall = system_region_miles(h); - log << "System " << h->systemname << " (" << h->level_name() << ") overall: " << format_clinched_mi(t_system_overall, h->total_mileage()) << '\n'; if (t_system_overall) - if (h->active()) - active_systems_traveled++; - else preview_systems_traveled++; - if (t_system_overall == h->total_mileage()) - if (h->active()) - active_systems_clinched++; - else preview_systems_clinched++; + { if (h->active()) + active_systems_traveled++; + else preview_systems_traveled++; + if (t_system_overall == h->total_mileage()) + if (h->active()) + active_systems_clinched++; + else preview_systems_clinched++; - // stats by region covered by system, always in csmbr for - // the DB, but add to logs only if it's been traveled at - // all and it covers multiple regions - if (t_system_overall) - { if (h->mileage_by_region.size() > 1) + // stats by region covered by system, always in csmbr for + // the DB, but add to logs only if it's been traveled at + // all and it covers multiple regions + log << "System " << h->systemname << " (" << h->level_name() << ") overall: " + << format_clinched_mi(t_system_overall, h->total_mileage()) << '\n'; + if (h->mileage_by_region.size() > 1) log << "System " << h->systemname << " by region:\n"; std::list sysregions; for (std::pair &rm : h->mileage_by_region) @@ -74,12 +74,10 @@ void TravelerList::userlog if (h->mileage_by_region.size() > 1) log << " " << region->code << ": " << format_clinched_mi(system_region_mileage, h->mileage_by_region.at(region)) << '\n'; } - } - // stats by highway for the system, by connected route and - // by each segment crossing region boundaries if applicable - if (t_system_overall) - { std::unordered_map system_con_umap; + // stats by highway for the system, by connected route and + // by each segment crossing region boundaries if applicable + std::unordered_map system_con_umap; unsigned int num_con_rtes_clinched = 0; log << "System " << h->systemname << " by route (traveled routes only):\n"; for (ConnectedRoute &cr : h->con_route_list) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 0b5bad83..62a75b93 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -3362,24 +3362,22 @@ def run(self): t_system_overall = 0.0 if h.systemname in t.system_region_mileages: t_system_overall = math.fsum(list(t.system_region_mileages[h.systemname].values())) - t.log_entries.append("System " + h.systemname + " (" + h.level + - ") overall: " + - format_clinched_mi(t_system_overall, math.fsum(list(h.mileage_by_region.values())))) if t_system_overall > 0.0: if h.active(): t.active_systems_traveled += 1 else: t.preview_systems_traveled += 1 - if t_system_overall == math.fsum(list(h.mileage_by_region.values())): - if h.active(): - t.active_systems_clinched += 1 - else: - t.preview_systems_clinched += 1 + if t_system_overall == math.fsum(list(h.mileage_by_region.values())): + if h.active(): + t.active_systems_clinched += 1 + else: + t.preview_systems_clinched += 1 - # stats by region covered by system, always in csmbr for - # the DB, but add to logs only if it's been traveled at - # all and it covers multiple regions - if t_system_overall > 0.0: + # stats by region covered by system, always in csmbr for + # the DB, but add to logs only if it's been traveled at + # all and it covers multiple regions + t.log_entries.append("System " + h.systemname + " (" + h.level + ") overall: " + + format_clinched_mi(t_system_overall, math.fsum(list(h.mileage_by_region.values())))) if len(h.mileage_by_region) > 1: t.log_entries.append("System " + h.systemname + " by region:") for region in sorted(h.mileage_by_region.keys()): @@ -3393,9 +3391,8 @@ def run(self): t.log_entries.append(" " + region + ": " + \ format_clinched_mi(system_region_mileage, h.mileage_by_region[region])) - # stats by highway for the system, by connected route and - # by each segment crossing region boundaries if applicable - if t_system_overall > 0.0: + # stats by highway for the system, by connected route and + # by each segment crossing region boundaries if applicable system_con_dict = dict() t.con_routes_traveled[h.systemname] = system_con_dict con_routes_clinched = 0