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

Fix simdrivelabel discrepancy for EVs #77

Draft
wants to merge 4 commits into
base: fastsim-2
Choose a base branch
from
Draft

Fix simdrivelabel discrepancy for EVs #77

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95fb1ac
fix simdrivelabel discrepancy for EVs
Dec 6, 2023
70f630c
working on fixing test that should have caught discrepancy
calbaker Dec 6, 2023
158b116
Merge branch 'fastsim-2' into fix/simdrivelabel-discrepancy
Dec 7, 2023
796ae94
Merge branch 'fastsim-2' into fix/simdrivelabel-discrepancy
Jan 24, 2024
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
37 changes: 24 additions & 13 deletions python/fastsim/tests/test_vs_excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
from math import isclose
import importlib
import unittest
from typing import Dict
import re

import fastsim as fsim
from fastsim import simdrive, vehicle, cycle, simdrivelabel
importlib.reload(simdrivelabel) # useful for debugging


RUN_PYTHON = False
RUN_RUST = True
Expand All @@ -36,7 +36,7 @@
xw_success = False


def run(vehicles=np.arange(1, 27), verbose=True, use_rust=False):
def run(vehicles=np.arange(1, 27), verbose=True, use_rust=False) -> Dict[str, float]:
"""
Runs python fastsim through 26 vehicles and returns list of dictionaries
containing scenario descriptions.
Expand All @@ -53,7 +53,7 @@ def run(vehicles=np.arange(1, 27), verbose=True, use_rust=False):
print('Running vehicle sweep.')
print()

res_python = {}
res = {}
def to_rust(obj):
if use_rust:
return obj.to_rust()
Expand All @@ -63,13 +63,21 @@ def to_rust(obj):
veh = to_rust(vehicle.Vehicle.from_vehdb(vehno))
if verbose:
print('Running ' + veh.scenario_name)
res_python[veh.scenario_name] = simdrivelabel.get_label_fe(veh, verbose=False, use_rust=use_rust)
if use_rust:
res_rust = fsim.fsr.get_label_fe(
veh, verbose=False)[0]
for rk in RES_SNAKE_KEYS:
res[veh.scenario_name][rk] = getattr(res_rust, rk)

else:
res[veh.scenario_name] = simdrivelabel.get_label_fe(
veh, verbose=False, use_rust=use_rust)

t1 = time.time()
print()
print('Elapsed time: ', round(t1 - t0, 2), 's')

return res_python
return res


PREV_RES_PATH = Path(__file__).resolve().parents[1] / 'resources' / 'res_excel.json'
Expand Down Expand Up @@ -161,6 +169,15 @@ def run_excel(vehicles=np.arange(1, 28), prev_res_path=PREV_RES_PATH, rerun_exce
# vehicles for which fairly large discrepancies in efficiencies are expected
KNOWN_ERROR_LIST = ['Regional Delivery Class 8 Truck']

RES_KEYS = ['labUddsMpgge', 'labHwyMpgge', 'labCombMpgge',
'labUddsKwhPerMile', 'labHwyKwhPerMile', 'labCombKwhPerMile',
'adjUddsMpgge', 'adjHwyMpgge', 'adjCombMpgge',
'adjUddsKwhPerMile', 'adjHwyKwhPerMile', 'adjCombKwhPerMile',
'netAccel', ]

RES_SNAKE_KEYS = [
re.sub("([A-Z])", r"_\1", rk).lower() for rk in RES_KEYS
]

def compare(res_python, res_excel, err_tol=0.001, verbose=True):
"""
Expand All @@ -181,12 +198,6 @@ def compare(res_python, res_excel, err_tol=0.001, verbose=True):

common_names = set(res_python.keys()) & set(res_excel.keys())

res_keys = ['labUddsMpgge', 'labHwyMpgge', 'labCombMpgge',
'labUddsKwhPerMile', 'labHwyKwhPerMile', 'labCombKwhPerMile',
'adjUddsMpgge', 'adjHwyMpgge', 'adjCombMpgge',
'adjUddsKwhPerMile', 'adjHwyKwhPerMile', 'adjCombKwhPerMile',
'netAccel', ]

res_comps = {}
for vehname in common_names:
if verbose:
Expand All @@ -199,7 +210,7 @@ def compare(res_python, res_excel, err_tol=0.001, verbose=True):
print("Discrepancy in model year between Excel and Python")
print("is probably the root cause of efficiency errors below.")

for res_key in res_keys:
for res_key in RES_KEYS:
if (type(res_python[vehname][res_key]) != np.ndarray) and not(
isclose(res_python[vehname][res_key],
res_excel[vehname][res_key],
Expand Down
Loading