Skip to content

Commit

Permalink
style: replace kinetic with kinematic
Browse files Browse the repository at this point in the history
Signed-off-by: Hayato Mizushima <hayato-m126@users.noreply.github.com>
  • Loading branch information
hayato-m126 committed Aug 9, 2024
1 parent 403207d commit 8262c1b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions log_evaluator/log_evaluator/planning_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class Metrics(EvaluationItem):
def __post_init__(self) -> None:
self.condition: PlanningControlCondition
self.use_lane_condition = self.condition.lane_condition is not None
self.use_kinetic_condition = self.condition.kinematic_condition is not None
self.use_kinematic_condition = self.condition.kinematic_condition is not None

def set_frame(self, msg: DiagnosticArray) -> dict | None: # noqa
if len(msg.status) <= 1:
Expand All @@ -176,17 +176,17 @@ def set_frame(self, msg: DiagnosticArray) -> dict | None: # noqa
return None

lane_info_tuple = None
kinetic_state_tuple = None
kinematic_state_tuple = None

# get additional condition
for _, status in enumerate(msg.status, 1):
status: DiagnosticStatus
if status.name == "ego_lane_info":
lane_info_tuple = LaneCondition.diag_lane_info(status)
if status.name == "kinematic_state":
kinetic_state_tuple = KinematicCondition.diag_kinematic_state(status)
kinematic_state_tuple = KinematicCondition.diag_kinematic_state(status)

if lane_info_tuple is None or kinetic_state_tuple is None:
if lane_info_tuple is None or kinematic_state_tuple is None:
return None

if self.use_lane_condition:
Expand All @@ -197,7 +197,7 @@ def set_frame(self, msg: DiagnosticArray) -> dict | None: # noqa
return {
"Error": {
"LaneInfo": lane_info_tuple,
"KinematicState": kinetic_state_tuple,
"KinematicState": kinematic_state_tuple,
"started": started,
"ended": ended,
},
Expand All @@ -207,10 +207,10 @@ def set_frame(self, msg: DiagnosticArray) -> dict | None: # noqa

self.total += 1
frame_success = "Fail"
# OK if decision matches and kinetic_state satisfies the condition
# OK if decision matches and kinematic_state satisfies the condition
if self.condition.decision == status0.values[0].value:
if self.use_kinetic_condition:
if self.condition.kinematic_condition.match_condition(kinetic_state_tuple):
if self.use_kinematic_condition:
if self.condition.kinematic_condition.match_condition(kinematic_state_tuple):
frame_success = "Success"
self.passed += 1
else:
Expand All @@ -228,7 +228,7 @@ def set_frame(self, msg: DiagnosticArray) -> dict | None: # noqa
"TotalPassed": self.passed,
"Decision": status0.values[0].value,
"LaneInfo": lane_info_tuple,
"KinematicState": kinetic_state_tuple,
"KinematicState": kinematic_state_tuple,
},
}

Expand Down

0 comments on commit 8262c1b

Please sign in to comment.