all tests pass

python/altrios/altrios_pyo3.pyi

@@ -16,7 +16,7 @@ class SerdeAPI(object):
     @classmethod
     def from_yaml(cls) -> Self: ...
     @classmethod
-    def from_file(cls, skip_init=false) -> Self: ...
+    def from_file(cls, skip_init=False) -> Self: ...
     def to_file(self): ...
     def to_bincode(self) -> bytes: ...
     def to_json(self) -> str: ...

python/altrios/demos/sim_manager_demo.py

@@ -23,7 +23,7 @@
 t0_import = time.perf_counter()
 t0_total = time.perf_counter()
 
-rail_vehicles=[alt.RailVehicle.from_file(vehicle_file, skip_init=false) 
+rail_vehicles=[alt.RailVehicle.from_file(vehicle_file, skip_init=False) 
                for vehicle_file in Path(alt.resources_root() / "rolling_stock/").glob('*.yaml')]
 
 location_map = alt.import_locations(alt.resources_root() / "networks/default_locations.csv")

python/altrios/demos/version_migration_demo.py

@@ -13,8 +13,8 @@ def migrate_network() -> Tuple[alt.Network, alt.Network]:
     old_network_path = alt.resources_root() / "networks/Taconite_v0.1.6.yaml"
     new_network_path = alt.resources_root() / "networks/Taconite.yaml"
 
-    network_from_old = alt.Network.from_file(old_network_path, skip_init=false)
-    network_from_new = alt.Network.from_file(new_network_path, skip_init=false)
+    network_from_old = alt.Network.from_file(old_network_path, skip_init=False)
+    network_from_new = alt.Network.from_file(new_network_path, skip_init=False)
 
     # `network_from_old` could be used to overwrite the file in the new format with 
     # ```

python/altrios/rollout.py

@@ -59,13 +59,13 @@ def simulate_prescribed_rollout(
         else:
             demand_paths.append(demand_file)
 
-    rail_vehicles=[alt.RailVehicle.from_file(vehicle_file, skip_init=false) 
+    rail_vehicles=[alt.RailVehicle.from_file(vehicle_file, skip_init=False) 
                 for vehicle_file in Path(alt.resources_root() / "rolling_stock/").glob('*.yaml')]
 
     location_map = alt.import_locations(
         str(alt.resources_root() / "networks/default_locations.csv")
     )
-    network = alt.Network.from_file(network_filename_path, skip_init=false)
+    network = alt.Network.from_file(network_filename_path, skip_init=False)
     sim_days = defaults.SIMULATION_DAYS
     scenarios = []
     for idx, scenario_year in enumerate(years):

python/altrios/tests/test_serde.py

@@ -117,6 +117,9 @@ def test_pydict():
     print(f"Elapsed time for json: {t_json:.3e} ns ")
     print(f"JSON time per MessagePack time: {(t_json / t_msg):.3e} ")
 
-    # `to_yaml` is probably needed because of NAN variables
-    assert ts_msg == ts
-    assert ts_yaml == ts
+    # `to_pydict` is necessary because of some funkiness with direct equality comparison
+    assert ts_msg.to_pydict() == ts.to_pydict()
+    assert ts_yaml.to_pydict() == ts.to_pydict()
+
+if __name__ == "__main__":
+    test_pydict()

python/altrios/train_planner.py

@@ -1129,7 +1129,7 @@ def run_train_planner(
 
 if __name__ == "__main__":
 
-    rail_vehicles=[alt.RailVehicle.from_file(vehicle_file, skip_init=false) 
+    rail_vehicles=[alt.RailVehicle.from_file(vehicle_file, skip_init=False) 
                 for vehicle_file in Path(alt.resources_root() / "rolling_stock/").glob('*.yaml')]
 
     location_map = alt.import_locations(

rust/altrios-core/src/consist/consist_model.rs

@@ -58,7 +58,7 @@ use super::*;
         );
     }
 
-    fn get_hct(&self) -> String {
+    fn get_pdct(&self) -> String {
         // make a `describe` function
         match &self.pdct {
             PowerDistributionControlType::RESGreedy(val) => format!("{val:?}"),

rust/altrios-core/src/consist/consist_utils.rs

@@ -267,6 +267,7 @@ impl SolvePower for FrontAndBack {
         todo!() // not needed urgently
     }
 }
+
 /// Variants of this enum are used to determine what control strategy gets used for distributing
 /// power required from or delivered to during negative tractive power each locomotive.
 #[derive(PartialEq, Clone, Deserialize, Serialize, Debug, SerdeAPI)]

rust/altrios-core/src/track/link/speed/speed_set.rs

@@ -5,7 +5,7 @@ use std::collections::HashMap;
 
 #[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, SerdeAPI, Hash)]
 #[repr(u8)]
-#[cfg_attr(feature = "pyo3", pyclass(eq, eq_int))]
+#[cfg_attr(feature = "pyo3", pyclass(eq))]
 /// Enum with variants representing train types
 pub enum TrainType {
     #[default]