Skip to content

Upgrade ninterp to 0.2.0 #278

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

Closed
wants to merge 1 commit into from
Closed

Upgrade ninterp to 0.2.0 #278

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion rust/routee-compass-powertrain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ndarray = "0.16.1"
ort = { version = "2.0.0-alpha.4", optional = true }
rayon = { workspace = true }
itertools = { workspace = true }
ninterp = { version = "0.1.0", features = ["serde"] }
ninterp = { version = "0.2.0", features = ["serde"] }

[features]
default = []
Expand Down
88 changes: 42 additions & 46 deletions ...-compass-powertrain/src/model/prediction/interpolation/interpolation_speed_grade_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use super::utils::linspace;
use crate::model::prediction::{
load_prediction_model, model_type::ModelType, prediction_model::PredictionModel,
};
use ninterp::*;
use routee_compass_core::{
model::traversal::TraversalModelError,
model::unit::{
Expand All @@ -11,7 +12,7 @@ use routee_compass_core::{
use std::path::Path;

pub struct InterpolationSpeedGradeModel {
interpolator: ninterp::Interpolator,
interpolator: Interpolator,
speed_unit: SpeedUnit,
grade_unit: GradeUnit,
energy_rate_unit: EnergyRateUnit,
Expand All @@ -28,37 +29,34 @@ impl PredictionModel for InterpolationSpeedGradeModel {
let speed_value = speed_unit.convert(&speed, &self.speed_unit).as_f64();
let grade_value = grade_unit.convert(&grade, &self.grade_unit).as_f64();

// Only `Interpolator::Interp2D` is currently supported
if !matches!(self.interpolator, Interpolator::Interp2D(..)) {
return Err(TraversalModelError::TraversalModelFailure(
"Only 2-D interpolators are currently supported".to_string(),
));
}
// snap incoming speed and grade to the grid
let (min_speed, max_speed, min_grade, max_grade) = match &self.interpolator {
ninterp::Interpolator::Interp2D(interp) => (
*interp.x().first().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get first x-value from powertrain interpolation result; are x-values empty?".to_string(),
)
})?,
*interp.x().last().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get last x-value from powertrain interpolation result; are x-values empty?".to_string(),
)
})?,
*interp.y().first().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get first y-value from powertrain interpolation result; are y-values empty?".to_string(),
)
})?,
*interp.y().last().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get last y-value from powertrain interpolation result; are y-values empty?".to_string(),
)
})?,

),
_ => {
return Err(TraversalModelError::TraversalModelFailure(
"Only 2-D interpolators are currently supported".to_string(),
))
}
};
// NOTE: `x().unwrap()` and `y().unwrap()` are okay, because they never fail for `Interpolator::Interp2D`
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nreinicke @robfitzgerald Make sure to take note of this. Of course we could remove the unwrap, but these methods never fail for 2D interpolators, so it would just be adding unnecessary handling.

let min_speed = *self.interpolator.x().unwrap().first().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get first x-value from powertrain interpolation result; are x-values empty?".to_string(),
)
})?;
let max_speed = *self.interpolator.x().unwrap().last().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get last x-value from powertrain interpolation result; are x-values empty?".to_string(),
)
})?;
let min_grade = *self.interpolator.y().unwrap().first().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get first y-value from powertrain interpolation result; are y-values empty?".to_string(),
)
})?;
let max_grade = *self.interpolator.y().unwrap().last().ok_or_else(|| {
TraversalModelError::TraversalModelFailure(
"Could not get last y-value from powertrain interpolation result; are y-values empty?".to_string(),
)
})?;

let speed_value = speed_value.max(min_speed).min(max_speed);
let grade_value = grade_value.max(min_grade).min(max_grade);
Expand Down Expand Up @@ -129,21 +127,19 @@ impl InterpolationSpeedGradeModel {
values.push(row);
}

let interpolator = ninterp::Interpolator::Interp2D(
ninterp::Interp2D::new(
speed_values,
grade_values,
values,
ninterp::Strategy::Linear,
ninterp::Extrapolate::Error,
)
.map_err(|e| {
TraversalModelError::TraversalModelFailure(format!(
"Failed to validate interpolation model: {}",
e
))
})?,
);
let interpolator = Interpolator::new_2d(
speed_values,
grade_values,
values,
Strategy::Linear,
Extrapolate::Error,
)
.map_err(|e| {
TraversalModelError::TraversalModelFailure(format!(
"Failed to validate interpolation model: {}",
e
))
})?;

Ok(InterpolationSpeedGradeModel {
interpolator,
Expand Down
Loading