Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added Option<...> to RustCycleElement and serde defaults to RustCycle #44

Merged
merged 1 commit into from
Aug 17, 2023
Merged

added Option<...> to RustCycleElement and serde defaults to RustCycle #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions rust/fastsim-core/src/cycle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,10 +369,10 @@ pub struct RustCycleElement {
pub mps: f64,
/// grade [rise/run]
#[serde(alias = "cycGrade")]
pub grade: f64,
pub grade: Option<f64>,
/// max possible charge rate from roadway
#[serde(alias = "cycRoadType")]
pub road_type: f64,
pub road_type: Option<f64>,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default)]
Expand Down Expand Up @@ -603,9 +603,11 @@ pub struct RustCycle {
pub mps: Array1<f64>,
/// array of grade [rise/run]
#[serde(alias = "cycGrade")]
#[serde(default)]
pub grade: Array1<f64>,
/// array of max possible charge rate from roadway
#[serde(alias = "cycRoadType")]
#[serde(default)]
pub road_type: Array1<f64>,
pub name: String,
#[serde(skip)]
Expand Down Expand Up @@ -661,12 +663,14 @@ impl RustCycle {
self.mps
.append(Axis(0), array![cyc_elem.mps].view())
.unwrap();
self.grade
.append(Axis(0), array![cyc_elem.grade].view())
.unwrap();
self.road_type
.append(Axis(0), array![cyc_elem.road_type].view())
.unwrap();
if let Some(grade) = cyc_elem.grade {
self.grade.append(Axis(0), array![grade].view()).unwrap();
}
if let Some(road_type) = cyc_elem.road_type {
self.road_type
.append(Axis(0), array![road_type].view())
.unwrap();
}
}

#[allow(clippy::len_without_is_empty)]
Expand Down
Loading