From 53ca19de5505531fb0f32aec78983cbe7b4d74e9 Mon Sep 17 00:00:00 2001 From: eric bryant Date: Sun, 15 Nov 2020 01:16:21 -0500 Subject: [PATCH 1/2] con_total_miles cleanup --- .../cplusplus/classes/TravelerList/userlog.cpp | 13 +++---------- siteupdate/cplusplus/siteupdate.cpp | 8 +++----- siteupdate/python-teresco/siteupdate.py | 12 ++++-------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/siteupdate/cplusplus/classes/TravelerList/userlog.cpp b/siteupdate/cplusplus/classes/TravelerList/userlog.cpp index 5e35dfa3..aa42d40e 100644 --- a/siteupdate/cplusplus/classes/TravelerList/userlog.cpp +++ b/siteupdate/cplusplus/classes/TravelerList/userlog.cpp @@ -83,8 +83,7 @@ void TravelerList::userlog unsigned int num_con_rtes_clinched = 0; log << "System " << h->systemname << " by route (traveled routes only):\n"; for (ConnectedRoute &cr : h->con_route_list) - { double con_total_miles = 0; - double con_clinched_miles = 0; + { double con_clinched_miles = 0; std::string to_write = ""; for (Route *r : cr.roots) { // find traveled mileage on this by this user @@ -99,16 +98,11 @@ void TravelerList::userlog con_clinched_miles += miles; to_write += " " + r->readable_name() + ": " + format_clinched_mi(miles,r->mileage) + "\n"; } - con_total_miles += r->mileage; } if (con_clinched_miles) { system_con_umap[&cr] = con_clinched_miles; char clinched = '0'; - /*yDEBUG - if (traveler_name == "oscar" && cr.system->systemname == "usaus" && cr.route == "US85") - printf("\nOscar on US85:\ncon_clinched_miles = %.17f\n con_total_miles = %.17f\n", - con_clinched_miles, con_total_miles);//*/ - if (con_clinched_miles == con_total_miles) + if (con_clinched_miles == cr.mileage) { num_con_rtes_clinched++; clinched = '1'; } @@ -116,7 +110,7 @@ void TravelerList::userlog if (!strchr(fstr, '.')) strcat(fstr, ".0"); clin_db_val->add_ccr("('" + cr.roots[0]->root + "','" + traveler_name + "','" + std::string(fstr) + "','" + clinched + "')"); - log << cr.readable_name() << ": " << format_clinched_mi(con_clinched_miles, con_total_miles) << '\n'; + log << cr.readable_name() << ": " << format_clinched_mi(con_clinched_miles, cr.mileage) << '\n'; if (cr.roots.size() == 1) log << " (" << cr.roots[0]->readable_name() << " only)\n"; else log << to_write << '\n'; @@ -128,7 +122,6 @@ void TravelerList::userlog num_con_rtes_clinched, (int)h->con_route_list.size(), 100*(double)num_con_rtes_clinched/h->con_route_list.size()); log << "System " << h->systemname << fstr << '\n'; con_routes_traveled[h] = system_con_umap; - //#include "debug/oscars_usaus_ConRtes.cpp" } } diff --git a/siteupdate/cplusplus/siteupdate.cpp b/siteupdate/cplusplus/siteupdate.cpp index 87d81443..76758643 100644 --- a/siteupdate/cplusplus/siteupdate.cpp +++ b/siteupdate/cplusplus/siteupdate.cpp @@ -765,15 +765,13 @@ int main(int argc, char *argv[]) } hdstatsfile << "System " << h->systemname << " by route:\n"; for (ConnectedRoute& cr : h->con_route_list) - { double con_total_miles = 0; - string to_write = ""; + { string to_write = ""; for (Route *r : cr.roots) { sprintf(fstr, ": %.2f mi\n", r->mileage); to_write += " " + r->readable_name() + fstr; - con_total_miles += r->mileage; + cr.mileage += r->mileage; } - cr.mileage = con_total_miles; //FIXME? - sprintf(fstr, ": %.2f mi", con_total_miles); + sprintf(fstr, ": %.2f mi", cr.mileage); hdstatsfile << cr.readable_name() << fstr; if (cr.roots.size() == 1) hdstatsfile << " (" << cr.roots[0]->readable_name() << " only)\n"; diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 45f914e0..019fe52d 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -3294,13 +3294,11 @@ def run(self): hdstatsfile.write(region + ": " + "{0:.2f}".format(h.mileage_by_region[region]) + " mi\n") hdstatsfile.write("System " + h.systemname + " by route:\n") for cr in h.con_route_list: - con_total_miles = 0.0 to_write = "" for r in cr.roots: to_write += " " + r.readable_name() + ": " + "{0:.2f}".format(r.mileage) + " mi\n" - con_total_miles += r.mileage - cr.mileage = con_total_miles - hdstatsfile.write(cr.readable_name() + ": " + "{0:.2f}".format(con_total_miles) + " mi") + cr.mileage += r.mileage + hdstatsfile.write(cr.readable_name() + ": " + "{0:.2f}".format(cr.mileage) + " mi") if len(cr.roots) == 1: hdstatsfile.write(" (" + cr.roots[0].readable_name() + " only)\n") else: @@ -3403,7 +3401,6 @@ def run(self): con_routes_clinched = 0 t.log_entries.append("System " + h.systemname + " by route (traveled routes only):") for cr in h.con_route_list: - con_total_miles = 0.0 con_clinched_miles = 0.0 to_write = "" for r in cr.roots: @@ -3420,18 +3417,17 @@ def run(self): con_clinched_miles += miles to_write += " " + r.readable_name() + ": " + \ format_clinched_mi(miles,r.mileage) + "\n" - con_total_miles += r.mileage if con_clinched_miles > 0: system_con_dict[cr] = con_clinched_miles clinched = '0' - if con_clinched_miles == con_total_miles: + if con_clinched_miles == cr.mileage: con_routes_clinched += 1 clinched = '1' ccr_values.append("('" + cr.roots[0].root + "','" + t.traveler_name + "','" + str(con_clinched_miles) + "','" + clinched + "')") t.log_entries.append(cr.readable_name() + ": " + \ - format_clinched_mi(con_clinched_miles,con_total_miles)) + format_clinched_mi(con_clinched_miles,cr.mileage)) if len(cr.roots) == 1: t.log_entries.append(" (" + cr.roots[0].readable_name() + " only)") else: From bb1a391a969ce9d2aaa123e26a8dbfd106742125 Mon Sep 17 00:00:00 2001 From: eric bryant Date: Sun, 15 Nov 2020 01:54:53 -0500 Subject: [PATCH 2/2] C++ nmp_merged progress indication --- siteupdate/cplusplus/siteupdate.cpp | 10 +++++++--- siteupdate/cplusplus/threads/NmpMergedThread.cpp | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/siteupdate/cplusplus/siteupdate.cpp b/siteupdate/cplusplus/siteupdate.cpp index 76758643..5e0aebe7 100644 --- a/siteupdate/cplusplus/siteupdate.cpp +++ b/siteupdate/cplusplus/siteupdate.cpp @@ -365,7 +365,7 @@ int main(int argc, char *argv[]) // if requested, rewrite data with near-miss points merged in if (args.nmpmergepath != "" && !args.errorcheck) - { cout << et.et() << "Writing near-miss point merged wpt files." << endl; //FIXME output dots to indicate progress + { cout << et.et() << "Writing near-miss point merged wpt files." << endl; #ifdef threading_enabled // set up for threaded nmp_merged file writes hs_it = highway_systems.begin(); @@ -377,9 +377,13 @@ int main(int argc, char *argv[]) delete thr[t];//*/ #else for (HighwaySystem *h : highway_systems) - for (Route &r : h->route_list) - r.write_nmp_merged(args.nmpmergepath + "/" + r.rg_str); + { std::cout << h->systemname << std::flush; + for (Route &r : h->route_list) + r.write_nmp_merged(args.nmpmergepath + "/" + r.rg_str); + std::cout << '.' << std::flush; + } #endif + cout << endl; } #include "functions/concurrency_detection.cpp" diff --git a/siteupdate/cplusplus/threads/NmpMergedThread.cpp b/siteupdate/cplusplus/threads/NmpMergedThread.cpp index 2599e7a6..1ddeaf67 100644 --- a/siteupdate/cplusplus/threads/NmpMergedThread.cpp +++ b/siteupdate/cplusplus/threads/NmpMergedThread.cpp @@ -11,6 +11,7 @@ void NmpMergedThread(unsigned int id, std::list *hs_list, std::l (*it)++; //printf("NmpMergedThread %02i (*it)++\n", id); fflush(stdout); mtx->unlock(); + std::cout << h->systemname << '.' << std::flush; for (Route &r : h->route_list) r.write_nmp_merged(*nmpmergepath + "/" + r.rg_str); }