Merge pull request #53 from NREL/feature/speed-set-stuff

improved speed_set and speed_sets validation

python/altrios/altrios_pyo3.pyi

@@ -1042,6 +1042,7 @@ class Network(SerdeAPI):
     def __getitem__(self, index) -> Any: ...
     def __len__(self) -> Any: ...
     def __setitem__(self, index, object) -> Any: ...
+    def set_speed_set_for_train_type(self, train_type: TrainType): ...
 
 
 @dataclass

python/altrios/demos/set_speed_train_sim_demo.py

@@ -17,7 +17,7 @@
     cars_empty=50,
     cars_loaded=50,
     rail_vehicle_type="Manifest",
-    train_type=alt.TrainType.Freight,
+    train_type=None,
     train_length_meters=None,
     train_mass_kilograms=None,
 )
@@ -66,6 +66,7 @@
 
 network = alt.Network.from_file(
     alt.resources_root() / "networks/Taconite.yaml")
+network.set_speed_set_for_train_type(alt.TrainType.Freight)
 link_path = alt.LinkPath.from_csv_file(
     alt.resources_root() / "demo_data/link_points_idx.csv"
 )

rust/altrios-core/Cargo.toml

@@ -47,6 +47,7 @@ serde-this-or-that = "0.4.2"
 project-root = "0.2.2"
 eng_fmt = { workspace = true }
 directories = "5.0.1"
+tempfile = "3.10.1"
 
 [features]
 pyo3 = ["dep:pyo3"]

rust/altrios-core/src/meet_pass/dispatch.rs

@@ -301,10 +301,10 @@ mod test_dispatch {
 
     #[test]
     fn test_simple_dispatch() {
-        let mut network_file_path = project_root::get_project_root().unwrap();
-        network_file_path.push("../python/altrios/resources/networks/Taconite.yaml");
-        let network = Network::from_file(network_file_path.as_os_str().to_str().unwrap()).unwrap();
-        network.validate().unwrap();
+        let network_file_path = project_root::get_project_root()
+            .unwrap()
+            .join("../python/altrios/resources/networks/Taconite.yaml");
+        let network = Network::from_file(network_file_path).unwrap();
 
         let train_sims = vec![
             crate::train::speed_limit_train_sim_fwd(),

rust/altrios-core/src/meet_pass/train_disp/mod.rs

@@ -220,10 +220,10 @@ mod test_train_disp {
 
     #[test]
     fn test_make_train_fwd() {
-        let mut network_file_path = project_root::get_project_root().unwrap();
-        network_file_path.push("../python/altrios/resources/networks/Taconite.yaml");
-        let network = Network::from_file(network_file_path.as_os_str().to_str().unwrap()).unwrap();
-        network.validate().unwrap();
+        let network_file_path = project_root::get_project_root()
+            .unwrap()
+            .join("../python/altrios/resources/networks/Taconite.yaml");
+        let network = Network::from_file(network_file_path).unwrap();
 
         let speed_limit_train_sim = crate::train::speed_limit_train_sim_fwd();
         let est_times = make_est_times(&speed_limit_train_sim, &network).unwrap().0;
@@ -243,11 +243,11 @@ mod test_train_disp {
     #[test]
     fn test_make_train_rev() {
         // TODO: Make this test depend on a better file
-        let mut network_file_path = project_root::get_project_root().unwrap();
-        network_file_path.push("../python/altrios/resources/networks/Taconite.yaml");
-        let network = Network::from_file(network_file_path.as_os_str().to_str().unwrap()).unwrap();
+        let network_file_path = project_root::get_project_root()
+            .unwrap()
+            .join("../python/altrios/resources/networks/Taconite.yaml");
+        let network = Network::from_file(network_file_path).unwrap();
 
-        network.validate().unwrap();
         let speed_limit_train_sim = crate::train::speed_limit_train_sim_rev();
         let est_times = make_est_times(&speed_limit_train_sim, &network).unwrap().0;
         TrainDisp::new(