Merge pull request #74 from Janekdererste/small_enhancements

Small enhancements

Author: paulheinr

Cargo.lock

@@ -16,7 +16,7 @@ flexi_logger = { version = "0.22", features = ["async"] }
 log = "0.4"
 clap = { version = "4.0.29", features = ["derive"] }
 fast_paths = "0.2.0"
-rust_road_router = { git = "https://github.com/kit-algo/rust_road_router" }
+rust_road_router = { git = "https://github.com/paulheinr/rust_road_router", branch = "clean_log" }
 mpi = "0.6"
 geo = "0.23.1"
 # dependencies for serialization with protobuf

Cargo.toml

@@ -8,7 +8,7 @@ use crate::simulation::messaging::events::EventsPublisher;
 use crate::simulation::messaging::message_broker::MpiMessageBroker;
 use crate::simulation::messaging::messages::proto::Vehicle;
 use crate::simulation::messaging::travel_time_collector::TravelTimeCollector;
-use crate::simulation::network::partitioned_network::Network;
+use crate::simulation::network::network::Network;
 use crate::simulation::partition_info::PartitionInfo;
 use crate::simulation::population::Population;
 use crate::simulation::routing::router::Router;

src/simulation/controller.rs

@@ -1,8 +1,8 @@
 use crate::simulation::id_mapping::MatsimIdMapping;
 use crate::simulation::io::matsim_id::MatsimId;
 use crate::simulation::io::xml_reader;
+use crate::simulation::network::network::Network;
 use crate::simulation::network::node::NodeVehicle;
-use crate::simulation::network::partitioned_network::Network;
 use flate2::Compression;
 use log::info;
 use quick_xml::se::to_writer;

src/simulation/io/network.rs

@@ -2,6 +2,6 @@ mod flow_cap;
 pub mod link;
 pub mod network_partition;
 pub mod node;
-pub mod partitioned_network;
+pub mod network;
 pub mod routing_kit_network;
 mod vehicles;

src/simulation/network/mod.rs

@@ -9,8 +9,8 @@ pub struct RoutingKitNetwork {
     pub(crate) head: Vec<NodeId>,
     pub(crate) travel_time: Vec<Weight>,
     pub(crate) link_ids: Vec<u64>,
-    pub(crate) latitude: Vec<f32>,
-    pub(crate) longitude: Vec<f32>,
+    pub(crate) x: Vec<f32>,
+    pub(crate) y: Vec<f32>,
 }
 
 impl RoutingKitNetwork {
@@ -20,8 +20,8 @@ impl RoutingKitNetwork {
             head: Vec::new(),
             travel_time: Vec::new(),
             link_ids: Vec::new(),
-            latitude: Vec::new(),
-            longitude: Vec::new(),
+            x: Vec::new(),
+            y: Vec::new(),
         }
     }
 

…imulation/network/partitioned_network.rs src/simulation/network/network.rssrc/simulation/network/partitioned_network.rs renamed to src/simulation/network/network.rs src/simulation/network/partitioned_network.rs renamed to src/simulation/network/network.rs

@@ -2,8 +2,8 @@ use crate::simulation::config::RoutingMode;
 use crate::simulation::id_mapping::{MatsimIdMapping, MatsimIdMappings};
 use crate::simulation::io::population::{IOPerson, IOPlanElement, IOPopulation};
 use crate::simulation::messaging::messages::proto::Agent;
+use crate::simulation::network::network::Network;
 use crate::simulation::network::node::NodeVehicle;
-use crate::simulation::network::partitioned_network::Network;
 use std::collections::btree_map::BTreeMap;
 
 #[derive(Debug)]

src/simulation/network/routing_kit_network.rs

@@ -4,7 +4,7 @@ use std::fmt::Display;
 use std::fs::{create_dir_all, remove_dir_all, remove_file, File};
 use std::io::{BufRead, BufReader, Write};
 use std::path::PathBuf;
-use std::process::Command;
+use std::process::{Command, Stdio};
 
 pub struct InertialFlowCutterAdapter {
     pub inertial_flow_cutter_path: PathBuf,
@@ -95,6 +95,7 @@ impl InertialFlowCutterAdapter {
                     .to_owned()
                     + "_bin",
             )
+            .stdout(Stdio::null())
             .status()
             .expect("Failed to compute ordering");
     }
@@ -157,12 +158,15 @@ impl InertialFlowCutterAdapter {
             &routing_kit_network.travel_time,
             self.temp_output_path().join("travel_time"),
         );
+
+        // the InertialFlowCutter script expects these file names but interprets them as Euclidean coordinates
+        // (https://github.com/Janekdererste/rust_q_sim/issues/10)
         InertialFlowCutterAdapter::serialize_vector(
-            &routing_kit_network.latitude,
+            &routing_kit_network.x,
             self.temp_output_path().join("latitude"),
         );
         InertialFlowCutterAdapter::serialize_vector(
-            &routing_kit_network.longitude,
+            &routing_kit_network.y,
             self.temp_output_path().join("longitude"),
         );
     }

src/simulation/population.rs

@@ -56,8 +56,8 @@ impl NetworkConverter {
         let mut head = Vec::new();
         let mut travel_time = Vec::new();
         let mut link_ids = Vec::new();
-        let mut latitude = Vec::new();
-        let mut longitude = Vec::new();
+        let mut x = Vec::new();
+        let mut y = Vec::new();
 
         Self::check_network_valid(&matsim_network);
 
@@ -74,8 +74,8 @@ impl NetworkConverter {
 
         for node in matsim_network.nodes() {
             //TODO: make sure, that the coordinate system is correct
-            longitude.push(node.x);
-            latitude.push(node.y);
+            y.push(node.x);
+            x.push(node.y);
 
             first_out.push((links_before) as EdgeId);
 
@@ -117,8 +117,8 @@ impl NetworkConverter {
             head,
             travel_time,
             link_ids,
-            latitude,
-            longitude,
+            x,
+            y,
         }
     }
 
@@ -158,7 +158,7 @@ mod test {
         assert_eq!(network.head, vec![2, 3, 2, 3, 1, 2]);
         assert_eq!(network.travel_time, vec![1, 2, 1, 4, 2, 5]);
         assert_eq!(network.link_ids, Vec::<u64>::new());
-        // we don't check latitude and longitude so far
+        // we don't check y and y so far
     }
 
     #[test]