Skip to content

Update trip_parser.py #1146

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

Open
pinkycz wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update trip_parser.py #1146

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20c8ef6
Update trip_parser.py
pinkycz Nov 14, 2025
806feb1
Update trip_parser.py
pinkycz Nov 14, 2025
11b978d
Update trip_parser.py
pinkycz Nov 17, 2025
33460ac
Update trip_parser.py
Nov 18, 2025
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
16 changes: 15 additions & 1 deletion psa_car_controller/psacc/application/trip_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ def get_thermal_consumption(start, end):

@staticmethod
def get_elec_consumption(start, end):
return [start[LEVEL] - end[LEVEL], 0]
try:
start_level = start[LEVEL]
end_level = end[LEVEL]
if start_level is None or end_level is None:
return [0, 0]
return [start_level - end_level, 0]
except (KeyError, IndexError):
return [0, 0]

@staticmethod
def get_hybrid_consumption(start, end):
Expand Down Expand Up @@ -60,6 +67,13 @@ def __is_refuel(self, start, end, distance):
return False

def __is_recharging(self, start, end, distance):
try:
start_level = start[LEVEL]
end_level = end[LEVEL]
if start_level is None or end_level is None:
return False
except (KeyError, IndexError):
return False
decharge = self.get_level_consumption(start, end)[0]
return TripParser.is_recharging(decharge, distance)

Expand Down