fix rebase conflicts

Author: paulheinr

src/simulation/engines/activity_replanning_strategy.rs

@@ -10,11 +10,11 @@ struct DrtPassengerReplanning {
 }
 
 impl ActivityReplanningStrategy for DrtPassengerReplanning {
-    fn is_responsible(&self, agent: &Person) -> bool {
+    fn is_responsible(&self, _agent: &Person) -> bool {
         todo!()
     }
 
-    fn replan(&mut self, agent: &Person) {
+    fn replan(&mut self, _agent: &Person) {
         todo!()
     }
 }
@@ -24,11 +24,11 @@ struct DrtDriverReplanning {
 }
 
 impl ActivityReplanningStrategy for DrtDriverReplanning {
-    fn is_responsible(&self, agent: &Person) -> bool {
+    fn is_responsible(&self, _agent: &Person) -> bool {
         todo!()
     }
 
-    fn replan(&mut self, agent: &Person) {
+    fn replan(&mut self, _agent: &Person) {
         todo!()
     }
 }

src/simulation/messaging/communication/communicators.rs

@@ -387,7 +387,7 @@ where
 
 impl<'a, 'b, 'send_buffer> MpiSimCommunicator<'a, 'b, 'send_buffer> {
     pub(crate) fn new(
-        mpi_communicator: SystemCommunicator,
+        mpi_communicator: SimpleCommunicator,
         scope: &'a LocalScope<'b>,
         requests: &'a mut RequestCollection<'b, Vec<u8>>,
         send_buffer: &'send_buffer Vec<OnceCell<Vec<u8>>>,

src/simulation/messaging/communication/message_broker.rs

@@ -13,7 +13,7 @@ where
     C: SimCommunicator,
 {
     communicator: Rc<C>,
-    server_rank: u32,
+    _server_rank: u32,
 }
 
 impl<C> DrtClientMessageBroker<C>
@@ -23,15 +23,15 @@ where
     pub fn new(communicator: Rc<C>, server_rank: u32) -> Self {
         DrtClientMessageBroker {
             communicator,
-            server_rank,
+            _server_rank: server_rank,
         }
     }
 
     pub fn rank(&self) -> u32 {
         self.communicator.rank()
     }
 
-    pub fn send_recv(&self, now: u32) -> Vec<SyncMessage> {
+    pub fn send_recv(&self, _now: u32) -> Vec<SyncMessage> {
         todo!()
     }
 }

src/simulation/vehicles/mod.rs

@@ -1,3 +1,2 @@
 pub mod garage;
-pub mod io;
-mod vehicles;
+pub mod io;

tests/test_simulation.rs

@@ -12,7 +12,7 @@ use std::{fs, thread};
 use tracing::info;
 
 use rust_q_sim::simulation::config::{CommandLineArgs, Config, PartitionMethod};
-use rust_q_sim::simulation::controller::{get_numbered_output_filename, partition_input};
+use rust_q_sim::simulation::controller::{create_output_filename, get_numbered_output_filename, partition_input};
 use rust_q_sim::simulation::id;
 use rust_q_sim::simulation::io::xml_events::XmlEventsWriter;
 use rust_q_sim::simulation::messaging::communication::communicators::{