From bfa6a27c46c35ec50d4fdf780e6828232de8cbe2 Mon Sep 17 00:00:00 2001 From: Kyle Carow Date: Fri, 4 Aug 2023 16:30:21 -0600 Subject: [PATCH] add defaults to regen_a and regen_b for serde --- rust/fastsim-core/src/vehicle.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rust/fastsim-core/src/vehicle.rs b/rust/fastsim-core/src/vehicle.rs index 21b6c8c7..2ddaa84d 100644 --- a/rust/fastsim-core/src/vehicle.rs +++ b/rust/fastsim-core/src/vehicle.rs @@ -358,10 +358,10 @@ pub struct RustVehicle { #[serde(skip)] pub fc_perc_out_array: Vec, #[doc(hidden)] - #[serde(skip)] + #[serde(default = "RustVehicle::default_regen_a")] pub regen_a: f64, #[doc(hidden)] - #[serde(skip)] + #[serde(default = "RustVehicle::default_regen_b")] pub regen_b: f64, #[doc(hidden)] #[serde(skip)] @@ -549,6 +549,13 @@ impl RustVehicle { * self.props.a_grav_mps2; } + const fn default_regen_a() -> f64 { + 500.0 + } + const fn default_regen_b() -> f64 { + 0.99 + } + pub fn max_regen_kwh(&self) -> f64 { 0.5 * self.veh_kg * (27.0 * 27.0) / (3_600.0 * 1_000.0) }