diff --git a/docs/config.md b/docs/config.md index 59003320..daed4650 100644 --- a/docs/config.md +++ b/docs/config.md @@ -47,7 +47,7 @@ name = "2012_Ford_Focus" type = "single_fuel" # the file for the routee-powertrain model model_input_file = "models/2012_Ford_Focus.bin" -# what underlying machine learn framework to use [smartcore | onnx] +# what underlying machine learn framework to use [smartcore | interpolate | onnx] model_type = "smartcore" # the units of what the routee-powertrain model expects speed to be in speed_unit = "miles_per_hour" @@ -158,7 +158,7 @@ name = "2012_Ford_Focus" type = "single_fuel" # the file for the routee-powertrain model model_input_file = "models/2012_Ford_Focus.bin" -# what underlying machine learn framework to use [smartcore | onnx] +# what underlying machine learn framework to use [smartcore | interpolate | onnx] model_type = "smartcore" # the units of what the routee-powertrain model expects speed to be in speed_unit = "miles_per_hour" diff --git a/pyproject.toml b/pyproject.toml index 64b89c3c..ba4b899c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "nrel.routee.compass" -version = "0.6.0" +version = "0.6.1" description = "An eco-routing tool build upon RouteE-Powertrain" readme = "README.md" documentation = "nrel.github.io/routee-compass" diff --git a/rust/routee-compass-core/Cargo.toml b/rust/routee-compass-core/Cargo.toml index 18f496d8..069da6bc 100644 --- a/rust/routee-compass-core/Cargo.toml +++ b/rust/routee-compass-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "routee-compass-core" -version = "0.6.0" +version = "0.6.1" edition = "2021" exclude = ["test/"] readme = "README.md" diff --git a/rust/routee-compass-powertrain/Cargo.toml b/rust/routee-compass-powertrain/Cargo.toml index 08481d38..54f3d9e3 100644 --- a/rust/routee-compass-powertrain/Cargo.toml +++ b/rust/routee-compass-powertrain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "routee-compass-powertrain" -version = "0.6.0" +version = "0.6.1" edition = "2021" readme = "README.md" license = "BSD-3-Clause" @@ -11,7 +11,7 @@ documentation = "https://docs.rs/routee-compass" [dependencies] -routee-compass-core = { path = "../routee-compass-core", version = "0.6.0" } +routee-compass-core = { path = "../routee-compass-core", version = "0.6.1" } smartcore = { version = "0.3.1", features = ["serde"] } # random forest thiserror = { workspace = true } log = { workspace = true } @@ -27,5 +27,5 @@ ort = { version = "2.0.0-alpha.4", optional = true } rayon = { workspace = true } [features] -default = ["onnx"] +default = [] onnx = ["ort"] diff --git a/rust/routee-compass-powertrain/README.md b/rust/routee-compass-powertrain/README.md index ca86490b..63dba5fa 100644 --- a/rust/routee-compass-powertrain/README.md +++ b/rust/routee-compass-powertrain/README.md @@ -12,7 +12,7 @@ To install as a library in Rust, add routee-compass-powertrain to your Cargo.tom ```toml [dependencies] -routee-compass-powertrain = { version = "0.6.0" } +routee-compass-powertrain = { version = "0.6.1" } ``` Please see the [documentation](https://docs.rs/routee-compass-powertrain/latest/routee_compass_powertrain/) for usage. diff --git a/rust/routee-compass-py/Cargo.toml b/rust/routee-compass-py/Cargo.toml index 63c44219..f885451e 100644 --- a/rust/routee-compass-py/Cargo.toml +++ b/rust/routee-compass-py/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "routee-compass-py" -version = "0.6.0" +version = "0.6.1" edition = "2021" readme = "README.md" license = "BSD-3-Clause" @@ -10,8 +10,8 @@ repository = "https://github.com/NREL/routee-compass" documentation = "https://docs.rs/routee-compass" [dependencies] -routee-compass = { path = "../routee-compass", version = "0.6.0" } -routee-compass-core = { path = "../routee-compass-core", version = "0.6.0" } +routee-compass = { path = "../routee-compass", version = "0.6.1" } +routee-compass-core = { path = "../routee-compass-core", version = "0.6.1" } pyo3 = { version = "0.20.0", features = ["extension-module"] } serde_json = { workspace = true } config = { workspace = true } diff --git a/rust/routee-compass/Cargo.toml b/rust/routee-compass/Cargo.toml index 404acd45..b41351d5 100644 --- a/rust/routee-compass/Cargo.toml +++ b/rust/routee-compass/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "routee-compass" -version = "0.6.0" +version = "0.6.1" edition = "2021" readme = "README.md" license = "BSD-3-Clause" @@ -18,8 +18,8 @@ keywords = [ categories = ["science", "science::geo"] [dependencies] -routee-compass-core = { path = "../routee-compass-core", version = "0.6.0" } -routee-compass-powertrain = { path = "../routee-compass-powertrain", version = "0.6.0", features=["onnx"]} +routee-compass-core = { path = "../routee-compass-core", version = "0.6.1" } +routee-compass-powertrain = { path = "../routee-compass-powertrain", version = "0.6.1"} thiserror = { workspace = true } flate2 = { workspace = true } serde = { workspace = true, features = ["derive"] }