fix(simple_planning_simulator): fix duplicateBranch warnings (#7574)

veqcc · pre-commit-ci[bot] · web-flow · commit f4f892e94e05 · 2024-06-19T11:28:31.000+09:00
* fix(simple_planning_simulator): fix duplicateBranch warnings

Signed-off-by: Ryuta Kambe &lt;ryuta.kambe@tier4.jp&gt;

* style(pre-commit): autofix

---------

Signed-off-by: Ryuta Kambe &lt;ryuta.kambe@tier4.jp&gt;
Co-authored-by: pre-commit-ci[bot] &lt;66853113+pre-commit-ci[bot]@users.noreply.github.com&gt;
diff --git a/simulator/simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_delay_steer_acc_geared.cpp b/simulator/simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_delay_steer_acc_geared.cpp
@@ -177,9 +177,7 @@ void SimModelDelaySteerAccGeared::updateStateWithGear(
     if (state(IDX::VX) > 0.0) {
       setStopState();
     }
-  } else if (gear == GearCommand::PARK) {
-    setStopState();
-  } else {
+  } else {  // including 'gear == GearCommand::PARK'
     setStopState();
   }
 }
diff --git a/simulator/simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_delay_steer_map_acc_geared.cpp b/simulator/simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_delay_steer_map_acc_geared.cpp
@@ -159,13 +159,7 @@ void SimModelDelaySteerMapAccGeared::updateStateWithGear(
       state(IDX::YAW) = prev_state(IDX::YAW);
       state(IDX::ACCX) = (state(IDX::VX) - prev_state(IDX::VX)) / std::max(dt, 1.0e-5);
     }
-  } else if (gear == GearCommand::PARK) {
-    state(IDX::VX) = 0.0;
-    state(IDX::X) = prev_state(IDX::X);
-    state(IDX::Y) = prev_state(IDX::Y);
-    state(IDX::YAW) = prev_state(IDX::YAW);
-    state(IDX::ACCX) = (state(IDX::VX) - prev_state(IDX::VX)) / std::max(dt, 1.0e-5);
-  } else {
+  } else {  // including 'gear == GearCommand::PARK'
     state(IDX::VX) = 0.0;
     state(IDX::X) = prev_state(IDX::X);
     state(IDX::Y) = prev_state(IDX::Y);
diff --git a/simulator/simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_ideal_steer_acc_geared.cpp b/simulator/simple_planning_simulator/src/simple_planning_simulator/vehicle_model/sim_model_ideal_steer_acc_geared.cpp
@@ -109,9 +109,7 @@ void SimModelIdealSteerAccGeared::updateStateWithGear(
     if (state(IDX::VX) > 0.0) {
       setStopState();
     }
-  } else if (gear == GearCommand::PARK) {
-    setStopState();
-  } else {
+  } else {  // including 'gear == GearCommand::PARK'
     setStopState();
   }
   // calculate acc from velocity diff

Original file line number	Diff line number	Diff line change
`@@ -177,9 +177,7 @@ void SimModelDelaySteerAccGeared::updateStateWithGear(`
`177`	`177`	`if (state(IDX::VX) > 0.0) {`
`178`	`178`	`setStopState();`
`179`	`179`	`}`
`180`		`- } else if (gear == GearCommand::PARK) {`
`181`		`- setStopState();`
`182`		`- } else {`
	`180`	`+ } else { // including 'gear == GearCommand::PARK'`
`183`	`181`	`setStopState();`
`184`	`182`	`}`
`185`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,7 @@ void SimModelIdealSteerAccGeared::updateStateWithGear(`
`109`	`109`	`if (state(IDX::VX) > 0.0) {`
`110`	`110`	`setStopState();`
`111`	`111`	`}`
`112`		`- } else if (gear == GearCommand::PARK) {`
`113`		`- setStopState();`
`114`		`- } else {`
	`112`	`+ } else { // including 'gear == GearCommand::PARK'`
`115`	`113`	`setStopState();`
`116`	`114`	`}`
`117`	`115`	`// calculate acc from velocity diff`