simulate trip

Chapter05/src/physics.rs

@@ -1,3 +1,7 @@
+use buildings::{Building};
+use trip_planning::{RequestQueue};
+use motion_controllers::{MotionController};
+use data_recorders::{DataRecorder};
 
 #[derive(Clone,Debug,Serialize,Deserialize)]
 pub struct ElevatorState {
@@ -11,3 +15,8 @@ pub struct ElevatorState {
 pub const MAX_JERK: f64 = 0.2;
 pub const MAX_ACCELERATION: f64 = 2.0;
 pub const MAX_VELOCITY: f64 = 5.0;
+
+pub fn simulate_elevator(esp: Box<Building>, est: ElevatorState, floor_requests: &mut Box<RequestQueue>,
+                         mc: &mut Box<MotionController>, dr: &mut Box<DataRecorder>)
+{
+}

Chapter05/src/simulate_trip.rs

@@ -3,9 +3,9 @@ extern crate floating_duration;
 
 use elevator::buildings::{Building, Building1, Building2, Building3};
 use elevator::trip_planning::{FloorRequests, RequestQueue};
-use elevator::physics::{ElevatorState};
-use elevator::motion_controllers::{SmoothMotionController};
-use elevator::data_recorders::{newSimpleDataRecorder};
+use elevator::physics::{ElevatorState, simulate_elevator};
+use elevator::motion_controllers::{SmoothMotionController, MotionController};
+use elevator::data_recorders::{newSimpleDataRecorder, DataRecorder};
 
 use std::time::Instant;
 use std::env;
@@ -29,9 +29,9 @@ pub fn run_simulation()
 
    //3. Store input building description and floor requests
    let mut esp: Box<Building> = Box::new(Building1);
-   let mut floor_requests = FloorRequests {
+   let mut floor_requests: Box<RequestQueue> = Box::new(FloorRequests {
       requests: Vec::new()
-   };
+   });
 
    //4. Parse input and store as building description and floor requests
    match env::args().nth(1) {
@@ -108,16 +108,15 @@ pub fn run_simulation()
       }
    }
 
-   let mut dr = newSimpleDataRecorder(esp.clone());
-   let mut mc = SmoothMotionController {
+   let mut dr: Box<DataRecorder> = newSimpleDataRecorder(esp.clone());
+   let mut mc: Box<MotionController> = Box::new(SmoothMotionController {
       timestamp: 0.0,
       esp: esp.clone()
-   };
+   });
 
-   /*
-   simulate_elevator(esp, est, floor_requests, &mut mc, &mut dr);
+   simulate_elevator(esp, est, &mut floor_requests, &mut mc, &mut dr);
    dr.summary();
-   */
+
 }
 
 fn main()