Merge pull request #14 from NREL/release/1.0.4

bump version; add new hybrids

nrel/routee/powertrain/resources/default_models/external_model_links.json

@@ -1,46 +1,46 @@
 {
-    "2012_Ford_Focus": "https://app.box.com/shared/static/owvvx6jjsu30mfe3ji5mnzdugjvy05z8.json",
-    "2012_Ford_Fusion": "https://app.box.com/shared/static/zcatjj5pxf4wlg5ql5w7czhjwyjrcqtr.json",
-    "2016_AUDI_A3_4cyl_2WD": "https://app.box.com/shared/static/msdkke3xtdpknmu6a26j08ol8vxiw0hu.json",
-    "2016_BMW_328d_4cyl_2WD": "https://app.box.com/shared/static/1710cj655y0t5rtclh1ogo0eqt8subr7.json",
-    "2016_BMW_i3_REx_PHEV_Charge_Depleting": "https://app.box.com/shared/static/oe6tbw2mlx35ak3m39ms6anxaeulheph.json",
-    "2016_BMW_i3_REx_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/tzhyb99ch98s3wofwld6vhu4ylbfuq8j.json",
-    "2016_CHEVROLET_Malibu_4cyl_2WD": "https://app.box.com/shared/static/hi0k3dsnliru8bf3ho4tygnz7o2bbc39.json",
-    "2016_CHEVROLET_Spark_EV": "https://app.box.com/shared/static/p3w6sifsaf924hm4xr0fcnyvq5f735sb.json",
-    "2016_CHEVROLET_Volt_Charge_Depleting": "https://app.box.com/shared/static/refg47ekep5anyq41cvd5e347w5bglv4.json",
-    "2016_CHEVROLET_Volt_Charge_Sustaining": "https://app.box.com/shared/static/v90zippsq2gbenzevk6tktjh20skm5rb.json",
-    "2016_FORD_C-MAX_(PHEV)_Charge_Depleting": "https://app.box.com/shared/static/8xzw1joi4z75146wosob55z0v4t56s0t.json",
-    "2016_FORD_C-MAX_(PHEV)_Charge_Sustaining": "https://app.box.com/shared/static/ejgyl2ye0j0d88p99t8tjs7xqpmfute9.json",
-    "2016_FORD_C-MAX_HEV": "https://app.box.com/shared/static/1g0ut3e8dux98wupucrqnlhcrqb4pg2q.json",
-    "2016_FORD_Escape_4cyl_2WD": "https://app.box.com/shared/static/co9prrqzfqk4lj8860zwpah1n6lmethz.json",
-    "2016_FORD_Explorer_4cyl_2WD": "https://app.box.com/shared/static/odlr0di4avsyk09sgt98oifuekemkluw.json",
-    "2016_HYUNDAI_Elantra_4cyl_2WD": "https://app.box.com/shared/static/gou1vtt6ii5npr65o834iz1xsn1wxx1h.json",
-    "2016_HYUNDAI_Sonata_PHEV_Charge_Depleting": "https://app.box.com/shared/static/s802i81gce7zgue9bqksx7qhupbuq30i.json",
-    "2016_HYUNDAI_Sonata_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/m7cskbeppcug6ekwx0dpt7btvza01d8m.json",
-    "2016_KIA_Optima_Hybrid": "https://app.box.com/shared/static/iavjn7x93umljvtmuwtbplsbxd1nrjbm.json",
-    "2016_Leaf_24_kWh": "https://app.box.com/shared/static/gl7ap1czp6cihsil29wwaktindqyfzk4.json",
-    "2016_MITSUBISHI_i-MiEV": "https://app.box.com/shared/static/93khsx238l3b3emq36ui8yj0rnmf737w.json",
-    "2016_Nissan_Leaf_30_kWh": "https://app.box.com/shared/static/rccvjpzv99hcy9zny4e5ek3uwzjm15vm.json",
-    "2016_TESLA_Model_S60_2WD": "https://app.box.com/shared/static/95whdqdbu7ru8im83k3jf87ookmx8b43.json",
-    "2016_TOYOTA_Camry_4cyl_2WD": "https://app.box.com/shared/static/018ph17du8ui8e0vh0765g7jj3oycrb7.json",
-    "2016_TOYOTA_Corolla_4cyl_2WD": "https://app.box.com/shared/static/sxt8p4sd9j4lkvbd2ho8ipgdyg30qwiw.json",
-    "2016_TOYOTA_Highlander_Hybrid": "https://app.box.com/shared/static/63ogjqz45vgmrdl7cps464izb2xq10g5.json",
-    "2016_Toyota_Prius_Two_FWD": "https://app.box.com/shared/static/hxms407m8z0p4x95vzhzzi52aw0dzs3a.json",
-    "2017_CHEVROLET_Bolt": "https://app.box.com/shared/static/6yg9ed4gixrp7q5irze2w4ud5h3nthme.json",
-    "2017_Maruti_Dzire_VDI": "https://app.box.com/shared/static/luyzs74knk7yowjbuer5zb88getfstjx.json",
-    "2017_Prius_Prime_Charge_Depleting": "https://app.box.com/shared/static/5m6mnxtg0bpb8to19570nikcxa7mryn3.json",
-    "2017_Prius_Prime_Charge_Sustaining": "https://app.box.com/shared/static/cxtts7pj9hi2n8om2xcx2d1i0rpsa6pw.json",
-    "2017_Toyota_Highlander_3": "https://app.box.com/shared/static/ihmhqsy2myfceh25xhhld8jhv995np2d.json",
-    "2020_Chevrolet_Colorado_2WD_Diesel": "https://app.box.com/shared/static/i969w1bc6p1uvvubtxtiugvnh56ib1dq.json",
-    "2020_VW_Golf_1": "https://app.box.com/shared/static/u3ya0kc5ehol7qcv7ecov6992839cn9g.json",
-    "2020_VW_Golf_2": "https://app.box.com/shared/static/vatnapacgkcbq2r0ou9htfq8ukyj6wcr.json",
-    "2021_Fiat_Panda_Mild_Hybrid": "https://app.box.com/shared/static/ps2j29s2rzvlxada8iolho9653tlcn06.json",
-    "2021_Peugot_3008": "https://app.box.com/shared/static/a3qzdgxe6k6d9otg61zf0sen30te0clp.json",
-    "2022_Ford_F-150_Lightning_4WD": "https://app.box.com/shared/static/oqi9zbpq6f0c5zlsu5lwwmr0y3cag9q9.json",
-    "2022_Renault_Zoe_ZE50_R135": "https://app.box.com/shared/static/5zfs47kw8a1cnuqxls1r9ux3967uzej6.json",
-    "2022_Tesla_Model_3_RWD": "https://app.box.com/shared/static/3jv4jk7x3ary992i8ogcxybd0cj2vde9.json",
-    "2022_Tesla_Model_Y_RWD": "https://app.box.com/shared/static/s3lga73oqtpfjm7lyoywvce80u7hfuoz.json",
-    "2022_Toyota_Yaris_Hybrid_Mid": "https://app.box.com/shared/static/kwku461137ctty5cii74hn9xip7yuulp.json",
-    "2022_Volvo_XC40_Recharge_twin": "https://app.box.com/shared/static/povpp7km9dbf5c1i019dqpajmtiam07y.json",
-    "2023_Mitsubishi_Pajero_Sport": "https://app.box.com/shared/static/rare4o655qn27tgr7wmfndgvm4dk0zvp.json"
+    "2012_Ford_Focus": "https://app.box.com/shared/static/oll9h6vyji52ikf3nf9avq3lyr1wzirz.json",
+    "2012_Ford_Fusion": "https://app.box.com/shared/static/v2ygkxzinjlvjjz4qu41arnvtkjuyfpp.json",
+    "2016_AUDI_A3_4cyl_2WD": "https://app.box.com/shared/static/idhvv08yc7emssvcjdcct77d8n2sxcoz.json",
+    "2016_BMW_328d_4cyl_2WD": "https://app.box.com/shared/static/avod5ul1zugk45iqdcb7di7qhpksrywe.json",
+    "2016_BMW_i3_REx_PHEV_Charge_Depleting": "https://app.box.com/shared/static/fxhwtxpb5qj8rvcyp1ukgf39k1qhucwx.json",
+    "2016_BMW_i3_REx_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/htbt6ncjl3awsd7t6gmgwd9s26qg7pf0.json",
+    "2016_CHEVROLET_Malibu_4cyl_2WD": "https://app.box.com/shared/static/mqqmzaozq5pibry2izk3yqvyrvylihmb.json",
+    "2016_CHEVROLET_Spark_EV": "https://app.box.com/shared/static/1rbf6nokk4jimfmuisp83p81ypjh5b4a.json",
+    "2016_CHEVROLET_Volt_Charge_Depleting": "https://app.box.com/shared/static/lsa2bwzmiy3ds708azblwsoqgymnx40y.json",
+    "2016_CHEVROLET_Volt_Charge_Sustaining": "https://app.box.com/shared/static/cqj992k5mgvkap55foted4qgfh8arlxu.json",
+    "2016_FORD_C-MAX_(PHEV)_Charge_Depleting": "https://app.box.com/shared/static/t3cs34skjrteq4ni1zy833esk8133eie.json",
+    "2016_FORD_C-MAX_(PHEV)_Charge_Sustaining": "https://app.box.com/shared/static/szpoq88x93l1ooi1mpt0ugbzdd2ascxt.json",
+    "2016_FORD_C-MAX_HEV": "https://app.box.com/shared/static/2ns0j4b2qqve3yqb288f4kdmwk1t1axf.json",
+    "2016_FORD_Escape_4cyl_2WD": "https://app.box.com/shared/static/3yzzfxjbrrsi9yvampu0t6b8y3ti75na.json",
+    "2016_FORD_Explorer_4cyl_2WD": "https://app.box.com/shared/static/jskb2udgddoc2q47ogifsd45coe1y8lx.json",
+    "2016_HYUNDAI_Elantra_4cyl_2WD": "https://app.box.com/shared/static/dwnsovrw0dniouch3q4ebmguv6bke7dj.json",
+    "2016_HYUNDAI_Sonata_PHEV_Charge_Depleting": "https://app.box.com/shared/static/0vemdkxit575b4g8modsllek4s1aw979.json",
+    "2016_HYUNDAI_Sonata_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/qbvz2uh789evovmc44d1vglm3l8s196q.json",
+    "2016_KIA_Optima_Hybrid": "https://app.box.com/shared/static/uvveezcbk1xxgsrtll2dsfu396wgnxkn.json",
+    "2016_Leaf_24_kWh": "https://app.box.com/shared/static/5613bpep10crxnolx19ytpo3c3umf69g.json",
+    "2016_MITSUBISHI_i-MiEV": "https://app.box.com/shared/static/5wz4jmcdv9a2d3ksmt5bosg7du54rolu.json",
+    "2016_Nissan_Leaf_30_kWh": "https://app.box.com/shared/static/16n9www7a6fdqmk7t3mo8q9lf61g6x7g.json",
+    "2016_TESLA_Model_S60_2WD": "https://app.box.com/shared/static/nc0arjulee1vugzaisb24o8g5800nmc7.json",
+    "2016_TOYOTA_Camry_4cyl_2WD": "https://app.box.com/shared/static/egajl8ffapflmh4hjtzxs9nzf7sz4u9c.json",
+    "2016_TOYOTA_Corolla_4cyl_2WD": "https://app.box.com/shared/static/10x44ninyl0l9lfetvrndu8gs0iaw9wz.json",
+    "2016_TOYOTA_Highlander_Hybrid": "https://app.box.com/shared/static/cvdlr89225frf6kb1wws8e37itdxddc9.json",
+    "2016_Toyota_Prius_Two_FWD": "https://app.box.com/shared/static/nicahg28ick7p2ubq5ne6zzqi0xmfjsm.json",
+    "2017_CHEVROLET_Bolt": "https://app.box.com/shared/static/i53nrlhquw6h1lp2pvto5ud9ydi2egei.json",
+    "2017_Maruti_Dzire_VDI": "https://app.box.com/shared/static/jgrim7jczwjgg3p473sc5m3h3apzv8yh.json",
+    "2017_Prius_Prime_Charge_Depleting": "https://app.box.com/shared/static/w14m2woa4w4nh1koyafejor3ik0na5bs.json",
+    "2017_Prius_Prime_Charge_Sustaining": "https://app.box.com/shared/static/66yg9uhtcw6aq3yke7gzpc850tadwps2.json",
+    "2017_Toyota_Highlander_3": "https://app.box.com/shared/static/5qvm0vv9mkf6q2tgpbobw7mrix30rvaj.json",
+    "2020_Chevrolet_Colorado_2WD_Diesel": "https://app.box.com/shared/static/dmmi0aywcu75ndxd9uu64bfdijnszpew.json",
+    "2020_VW_Golf_1": "https://app.box.com/shared/static/acqz48ijvghdqdmi6gcmdrbp7fi5ebdz.json",
+    "2020_VW_Golf_2": "https://app.box.com/shared/static/cb9nmha1gtuq81skzasylhudu7zql4sv.json",
+    "2021_Fiat_Panda_Mild_Hybrid": "https://app.box.com/shared/static/0jt98j6a8zm35gdrpcn5lzlq89lu0pyw.json",
+    "2021_Peugot_3008": "https://app.box.com/shared/static/uf7xpa100zs74kyhh3mabj4owj0pago1.json",
+    "2022_Ford_F-150_Lightning_4WD": "https://app.box.com/shared/static/bws0l7gfy2ujdrm6uattw8rxt1q83g83.json",
+    "2022_Renault_Zoe_ZE50_R135": "https://app.box.com/shared/static/avbolew1q450ayr2bhfde3haw1xy9nx2.json",
+    "2022_Tesla_Model_3_RWD": "https://app.box.com/shared/static/p5w7jg550jxd8esx39570m163dmplgvc.json",
+    "2022_Tesla_Model_Y_RWD": "https://app.box.com/shared/static/tjrjl8vt9ckqzjs6fog8ayahqflhia57.json",
+    "2022_Toyota_Yaris_Hybrid_Mid": "https://app.box.com/shared/static/ysqn9px3ivogpg7xlvh5txdczxkx5t7k.json",
+    "2022_Volvo_XC40_Recharge_twin": "https://app.box.com/shared/static/uvh1mal9gqkgyiq5lbkato2xsdbv6ge0.json",
+    "2023_Mitsubishi_Pajero_Sport": "https://app.box.com/shared/static/jvlhjedjvw89ijhvh25wij5diyfcyxup.json"
 }

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nrel.routee.powertrain"
-version = "1.0.3"
+version = "1.0.4"
 description = "RouteE-Powertrain is a tool for predicting energy usage over a set of road links."
 readme = "README.md"
 authors = [{ name = "National Renewable Energy Laboratory" }]

rust/src/random_forest.rs

@@ -9,6 +9,7 @@ use pyo3::prelude::*;
 use anyhow::Result;
 
 #[pyclass]
+#[derive(Default)]
 pub struct RustRandomForest {
     pub rf: Option<RandomForestRegressor<f64, f64, DenseMatrix<f64>, Vec<f64>>>,
 }
@@ -17,7 +18,7 @@ pub struct RustRandomForest {
 impl RustRandomForest {
     #[new]
     pub fn new() -> RustRandomForest {
-        RustRandomForest { rf: None }
+        RustRandomForest::default()
     }
     pub fn train(&mut self, train_data: Vec<Vec<f64>>, target: Vec<f64>) {
         let x = DenseMatrix::from_2d_vec(&train_data);
@@ -73,5 +74,4 @@ impl RustRandomForest {
             bincode::deserialize(&bincode)?;
         Ok(RustRandomForest { rf: Some(rf) })
     }
-
 }