Merge pull request #77 from Janekdererste/clean_up_network

Clean up network

Author: Janekdererste

src/simulation/controller.rs

@@ -6,7 +6,6 @@ use crate::simulation::io::proto_events::ProtoEventsWriter;
 use crate::simulation::io::vehicle_definitions::{IOVehicleDefinitions, VehicleDefinitions};
 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::network::Network;
 use crate::simulation::partition_info::PartitionInfo;
@@ -38,7 +37,7 @@ pub fn run(world: SystemCommunicator, config: Config) {
     let io_population = IOPopulation::from_file(config.population_file.as_ref());
     let id_mappings = MatsimIdMappings::from_io(&io_network, &io_population);
     let partition_info = PartitionInfo::from_io_network(&io_network, &id_mappings, size as usize);
-    let mut network: Network<Vehicle> = Network::from_io(
+    let mut network: Network = Network::from_io(
         &io_network,
         size as usize,
         config.sample_size,

src/simulation/io/network.rs

@@ -2,7 +2,6 @@ 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 flate2::Compression;
 use log::info;
 use quick_xml::se::to_writer;
@@ -154,9 +153,9 @@ impl IONetwork {
         info!("IONetwork: Finished writing network.");
     }
 
-    pub fn clone_with_internal_ids<V: NodeVehicle>(
+    pub fn clone_with_internal_ids(
         &self,
-        network: &Network<V>,
+        network: &Network,
         link_id_mapping: &MatsimIdMapping,
         node_id_mapping: &MatsimIdMapping,
     ) -> IONetwork {

src/simulation/messaging/messages.rs

@@ -1,3 +1,9 @@
+use std::cmp::Ordering;
+use std::collections::HashMap;
+use std::io::Cursor;
+
+use prost::Message;
+
 use crate::simulation::config::RoutingMode;
 use crate::simulation::id_mapping::{MatsimIdMapping, MatsimIdMappings};
 use crate::simulation::io::matsim_id::MatsimId;
@@ -11,10 +17,6 @@ use crate::simulation::messaging::messages::proto::{
 };
 use crate::simulation::network::node::NodeVehicle;
 use crate::simulation::time_queue::EndTime;
-use prost::Message;
-use std::cmp::Ordering;
-use std::collections::HashMap;
-use std::io::Cursor;
 
 // Include the `messages` module, which is generated from messages.proto.
 pub mod proto {
@@ -181,6 +183,14 @@ impl Agent {
         }
     }
 
+    pub fn new(id: u64, plan: Plan) -> Self {
+        Agent {
+            id,
+            curr_plan_elem: 0,
+            plan: Some(plan),
+        }
+    }
+
     pub fn id(&self) -> usize {
         self.id as usize
     }
@@ -368,7 +378,7 @@ impl EndTime for Agent {
 impl Plan {
     pub const DEFAULT_ROUTING_MODE: &'static str = "car";
 
-    fn new() -> Plan {
+    pub fn new() -> Plan {
         Plan {
             acts: Vec::new(),
             legs: Vec::new(),
@@ -492,6 +502,14 @@ impl Plan {
         result
     }
 
+    pub fn add_leg(&mut self, leg: Leg) {
+        self.legs.push(leg);
+    }
+
+    pub fn add_act(&mut self, activity: Activity) {
+        self.acts.push(activity);
+    }
+
     fn get_plan_type(io_plan: &IOPlan) -> PlanType {
         if let IOPlanElement::Activity(_) = io_plan.elements.get(1).unwrap() {
             return PlanType::ActivitiesOnly;
@@ -584,6 +602,26 @@ impl Activity {
         }
     }
 
+    pub fn new(
+        x: f32,
+        y: f32,
+        act_type: String,
+        link_id: u64,
+        start_time: Option<u32>,
+        end_time: Option<u32>,
+        max_dur: Option<u32>,
+    ) -> Self {
+        Activity {
+            x,
+            y,
+            act_type,
+            link_id,
+            start_time,
+            end_time,
+            max_dur,
+        }
+    }
+
     fn cmp_end_time(&self, now: u32) -> u32 {
         if let Some(end_time) = self.end_time {
             end_time
@@ -611,6 +649,15 @@ impl Leg {
         }
     }
 
+    pub fn new(route: Route, mode: &str, trav_time: Option<u32>, dep_time: Option<u32>) -> Self {
+        Self {
+            route: Some(route),
+            mode: String::from(mode),
+            trav_time,
+            dep_time,
+        }
+    }
+
     fn only_with_mode(mode: &str) -> Self {
         Self {
             mode: mode.to_string(),
@@ -686,6 +733,13 @@ impl NetworkRoute {
             vehicle_id: *veh_id as u64,
         }
     }
+
+    pub fn new(vehicle_id: u64, link_ids: Vec<u64>) -> Self {
+        Self {
+            vehicle_id,
+            route: link_ids,
+        }
+    }
 }
 
 fn parse_time_opt(value: &Option<String>) -> Option<u32> {