Merge pull request #347 from physycom/refactorOutputs

Author: Grufoony

src/dsf/binding.cpp

@@ -410,6 +410,9 @@ PYBIND11_MODULE(dsf_cpp, m) {
       .def("time_step",
            &dsf::FirstOrderDynamics::time_step,
            dsf::g_docstrings.at("dsf::Dynamics::time_step").c_str())
+      .def("datetime",
+           &dsf::FirstOrderDynamics::strDateTime,
+           dsf::g_docstrings.at("dsf::Dynamics::strDateTime").c_str())
       .def("meanTravelTime",
            &dsf::FirstOrderDynamics::meanTravelTime,
            pybind11::arg("clearData") = false,

src/dsf/dsf.hpp

@@ -5,8 +5,8 @@
 #include <format>
 
 static constexpr uint8_t DSF_VERSION_MAJOR = 3;
-static constexpr uint8_t DSF_VERSION_MINOR = 12;
-static constexpr uint8_t DSF_VERSION_PATCH = 1;
+static constexpr uint8_t DSF_VERSION_MINOR = 13;
+static constexpr uint8_t DSF_VERSION_PATCH = 0;
 
 static auto const DSF_VERSION =
     std::format("{}.{}.{}", DSF_VERSION_MAJOR, DSF_VERSION_MINOR, DSF_VERSION_PATCH);

src/dsf/headers/Dynamics.hpp

@@ -13,6 +13,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <chrono>
 #include <concepts>
 #include <vector>
 #include <random>
@@ -28,7 +29,6 @@
 #include <filesystem>
 #include <functional>
 #include <iomanip>
-#include <sstream>
 
 #include <tbb/tbb.h>
 
@@ -96,14 +96,10 @@ namespace dsf {
     inline std::time_t time_step() const { return m_timeStep; }
     /// @brief Get the current simulation time as formatted string (YYYY-MM-DD HH:MM:SS)
     /// @return std::string, The current simulation time as formatted string
-    inline auto strTime() const {
-      if (m_timeInit == 0) {
-        return std::to_string(m_timeStep);
-      }
-      std::time_t const t = time();
-      std::ostringstream oss;
-      oss << std::put_time(std::localtime(&t), "%Y-%m-%d %H:%M:%S");
-      return oss.str();
+    inline auto strDateTime() const {
+      return std::format(
+          "{:%Y-%m-%d %H:%M:%S}", std::chrono::floor<std::chrono::seconds>(std::chrono::current_zone()->to_local(
+                                      std::chrono::system_clock::from_time_t(time()))));
     }
   };
 

src/dsf/headers/RoadDynamics.hpp

@@ -2170,13 +2170,13 @@ namespace dsf {
       throw std::runtime_error("Error opening file \"" + filename + "\" for writing.");
     }
     if (bEmptyFile) {
-      file << "time";
+      file << "datetime" << separator << "time_step";
       for (auto const& [streetId, pStreet] : this->graph().edges()) {
         file << separator << streetId;
       }
       file << std::endl;
     }
-    file << this->strTime();
+    file << this->strDateTime() << separator << this->time_step();
     for (auto const& [streetId, pStreet] : this->graph().edges()) {
       // keep 2 decimal digits;
       file << separator << std::scientific << std::setprecision(2)
@@ -2200,7 +2200,7 @@ namespace dsf {
       throw std::runtime_error("Error opening file \"" + filename + "\" for writing.");
     }
     if (bEmptyFile) {
-      file << "time";
+      file << "datetime" << separator << "time_step";
       for (auto const& [streetId, pStreet] : this->graph().edges()) {
         if (!pStreet->isSpire()) {
           continue;
@@ -2213,7 +2213,7 @@ namespace dsf {
       }
       file << std::endl;
     }
-    file << this->strTime();
+    file << this->strDateTime() << separator << this->time_step();
     for (auto const& [streetId, pStreet] : this->graph().edges()) {
       int value{0};
       if (pStreet->isSpire()) {
@@ -2243,7 +2243,7 @@ namespace dsf {
       throw std::runtime_error("Error opening file \"" + filename + "\" for writing.");
     }
     if (bEmptyFile) {
-      file << "time";
+      file << "datetime" << separator << "time_step";
       for (auto const& [streetId, pStreet] : this->graph().edges()) {
         if (!pStreet->isSpire()) {
           continue;
@@ -2256,7 +2256,7 @@ namespace dsf {
       }
       file << std::endl;
     }
-    file << this->strTime();
+    file << this->strDateTime() << separator << this->time_step();
     for (auto const& [streetId, pStreet] : this->graph().edges()) {
       int value{0};
       if (pStreet->isSpire()) {
@@ -2284,7 +2284,7 @@ namespace dsf {
       throw std::runtime_error("Error opening file \"" + filename + "\" for writing.");
     }
     if (bEmptyFile) {
-      file << "time;distances;times;speeds" << std::endl;
+      file << "datetime;time_step;distances;times;speeds" << std::endl;
     }
 
     // Construct strings efficiently with proper formatting
@@ -2318,8 +2318,8 @@ namespace dsf {
     }
 
     // Write all data at once
-    file << this->strTime() << ';' << strTravelDistances << ';' << strTravelTimes << ';'
-         << strTravelSpeeds << std::endl;
+    file << this->strDateTime() << ';' << this->time_step() << ';' << strTravelDistances
+         << ';' << strTravelTimes << ';' << strTravelSpeeds << std::endl;
 
     file.close();
     if (reset) {
@@ -2340,10 +2340,10 @@ namespace dsf {
       throw std::runtime_error("Error opening file \"" + filename + "\" for writing.");
     }
     if (bEmptyFile) {
-      file << "time;n_ghost_agents;n_agents;mean_speed;mean_speed_std;mean_density;mean_"
-              "density_std;mean_flow;mean_flow_std;mean_traveltime;mean_traveltime_std;"
-              "mean_traveldistance;mean_traveldistance_"
-              "err;mean_travelspeed;mean_travelspeed_std\n";
+      file << "datetime;time_step;n_ghost_agents;n_agents;mean_speed_kph;std_speed_kph;"
+              "mean_density_vpk;std_density_vpk;mean_flow_vph;std_flow_vph;mean_"
+              "traveltime_m;std_traveltime_m;mean_traveldistance_km;std_traveldistance_"
+              "km;mean_travelspeed_kph;std_travelspeed_kph\n";
     }
     double mean_speed{0.}, mean_density{0.}, mean_flow{0.}, mean_travel_distance{0.},
         mean_travel_time{0.}, mean_travel_speed{0.};
@@ -2390,7 +2390,8 @@ namespace dsf {
     std_travel_speed =
         std::sqrt(std_travel_speed / nData - mean_travel_speed * mean_travel_speed);
 
-    file << this->strTime() << separator;
+    file << this->strDateTime() << separator;
+    file << this->time_step() << separator;
     file << m_agents.size() << separator;
     file << this->nAgents() << separator;
     file << std::scientific << std::setprecision(2);

src/dsf/python/cartography.py

@@ -129,6 +129,10 @@ def get_cartography(
             else:
                 G[u][v][k][key] = value
 
+    # Add id to edges
+    for i, (u, v, k) in enumerate(G.edges(keys=True)):
+        G[u][v][k]["id"] = i
+
     # Standardize node attributes in the graph
     nodes_to_update = []
     for node, data in G.nodes(data=True):
@@ -188,9 +192,8 @@ def get_cartography(
         # Convert back to MultiDiGraph temporarily for ox.graph_to_gdfs compatibility
         gdf_nodes, gdf_edges = ox.graph_to_gdfs(G)
 
-        # Reset index and add edge id
+        # Reset index and rename columns (id already exists from graph)
         gdf_edges.reset_index(inplace=True)
-        gdf_edges["id"] = gdf_edges.index
         gdf_edges.rename(columns={"u": "source", "v": "target"}, inplace=True)
         gdf_edges.drop(columns=["key"], inplace=True, errors="ignore")
 

test/Test_dynamics.cpp

@@ -225,7 +225,11 @@ TEST_CASE("FirstOrderDynamics") {
       graph.importMatrix("./data/matrix.dat", false);
       // graph.adjustNodeCapacities();
       FirstOrderDynamics dynamics{graph, false, 69, 0., dsf::PathWeight::LENGTH};
-      CHECK_EQ(dynamics.strTime(), "0");
+      CHECK_EQ(dynamics.strDateTime(),
+               std::format("{:%Y-%m-%d %H:%M:%S}",
+                           std::chrono::floor<std::chrono::seconds>(
+                               std::chrono::current_zone()->to_local(
+                                   std::chrono::system_clock::from_time_t(0)))));
       auto const epochStart{
           std::chrono::system_clock::to_time_t(std::chrono::system_clock::now())};
       dynamics.setInitTime(epochStart);
@@ -240,10 +244,13 @@ TEST_CASE("FirstOrderDynamics") {
           CHECK(dynamics.nAgents() < n);
           CHECK_EQ(dynamics.time_step(), 40);
           CHECK_EQ(dynamics.time() - epochStart, 40);
-          std::ostringstream oss;
-          auto currentTime = epochStart + 40;
-          oss << std::put_time(std::localtime(&currentTime), "%Y-%m-%d %H:%M:%S");
-          CHECK_EQ(dynamics.strTime(), oss.str());
+          CHECK_EQ(
+              dynamics.strDateTime(),
+              std::format(
+                  "{:%Y-%m-%d %H:%M:%S}",
+                  std::chrono::floor<std::chrono::seconds>(
+                      std::chrono::current_zone()->to_local(
+                          std::chrono::system_clock::from_time_t(dynamics.time())))));
         }
       }
     }