Remove old vehicle definition

Remove NodeVehicle trait

Author: Janekdererste

src/simulation/messaging/message_broker.rs

@@ -1,5 +1,4 @@
 use crate::simulation::messaging::messages::proto::{Vehicle, VehicleMessage};
-use crate::simulation::network::node::NodeVehicle;
 
 use mpi::topology::SystemCommunicator;
 use mpi::traits::{Communicator, Destination, Source};

src/simulation/messaging/messages.rs

@@ -15,7 +15,6 @@ use crate::simulation::messaging::messages::proto::{
     Activity, Agent, ExperimentalMessage, GenericRoute, Leg, NetworkRoute, Plan,
     TravelTimesMessage, Vehicle, VehicleMessage, VehicleType,
 };
-use crate::simulation::network::node::NodeVehicle;
 use crate::simulation::time_queue::EndTime;
 
 // Include the `messages` module, which is generated from messages.proto.
@@ -125,18 +124,16 @@ impl Vehicle {
     fn agent(&self) -> &Agent {
         self.agent.as_ref().unwrap()
     }
-}
 
-impl NodeVehicle for Vehicle {
-    fn id(&self) -> usize {
+    pub fn id(&self) -> usize {
         self.id as usize
     }
 
-    fn advance_route_index(&mut self) {
+    pub fn advance_route_index(&mut self) {
         self.curr_route_elem += 1;
     }
 
-    fn curr_link_id(&self) -> Option<usize> {
+    pub fn curr_link_id(&self) -> Option<usize> {
         let leg = self.agent().curr_leg();
         let route = leg.route.as_ref().unwrap();
         match route {
@@ -148,7 +145,7 @@ impl NodeVehicle for Vehicle {
         }
     }
 
-    fn is_current_link_last(&self) -> bool {
+    pub fn is_current_link_last(&self) -> bool {
         let leg = self.agent().curr_leg();
         let route = leg.route.as_ref().unwrap();
         match route {
@@ -157,7 +154,7 @@ impl NodeVehicle for Vehicle {
         }
     }
 
-    fn mode(&self) -> &str {
+    pub fn mode(&self) -> &str {
         self.mode.as_str()
     }
 }

src/simulation/network/link.rs

@@ -7,7 +7,6 @@ use crate::simulation::io::network::IOLink;
 use crate::simulation::io::vehicle_definitions::VehicleDefinitions;
 use crate::simulation::messaging::messages::proto::Vehicle;
 use crate::simulation::network::flow_cap::Flowcap;
-use crate::simulation::network::node::NodeVehicle;
 
 #[derive(Debug, Clone)]
 pub enum Link {

src/simulation/network/mod.rs

@@ -1,7 +1,6 @@
 mod flow_cap;
 pub mod link;
+pub mod network;
 pub mod network_partition;
 pub mod node;
-pub mod network;
 pub mod routing_kit_network;
-mod vehicles;

src/simulation/network/node.rs

@@ -8,14 +8,6 @@ use crate::simulation::messaging::messages::proto::Vehicle;
 use crate::simulation::network::link::Link;
 use crate::simulation::network::node::Node::{LocalNode, NeighbourNode};
 
-pub trait NodeVehicle: Debug {
-    fn id(&self) -> usize;
-    fn advance_route_index(&mut self);
-    fn curr_link_id(&self) -> Option<usize>;
-    fn is_current_link_last(&self) -> bool;
-    fn mode(&self) -> &str;
-}
-
 #[derive(Debug, Clone)]
 pub enum Node {
     LocalNode(NodeImpl),

src/simulation/network/vehicles.rs

@@ -10,7 +10,7 @@ use crate::simulation::messaging::messages::proto::{
 };
 use crate::simulation::network::link::Link;
 use crate::simulation::network::network_partition::NetworkPartition;
-use crate::simulation::network::node::{ExitReason, NodeVehicle};
+use crate::simulation::network::node::ExitReason;
 use crate::simulation::population::Population;
 use crate::simulation::routing::router::Router;
 use crate::simulation::routing::walk_leg_updater::WalkLegUpdater;