Skip to content

Commit

Permalink
more defaults for unit tests #21
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Feb 5, 2024
1 parent 8e5d312 commit 5096213
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/microsim/MSGlobals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bool MSGlobals::gEmergencyInsert;

SUMOTime MSGlobals::gLaneChangeDuration;

double MSGlobals::gLateralResolution;
double MSGlobals::gLateralResolution(-1.); // default for unitTest

bool MSGlobals::gStateLoaded;
bool MSGlobals::gUseMesoSim;
Expand All @@ -59,13 +59,13 @@ bool MSGlobals::gOverheadWireSolver;
bool MSGlobals::gOverheadWireRecuperation;
bool MSGlobals::gOverheadWireCurrentLimits;

bool MSGlobals::gSemiImplicitEulerUpdate;
bool MSGlobals::gSemiImplicitEulerUpdate(true); // default for unitTest

SUMOTime MSGlobals::gWaitingTimeMemory;

SUMOTime MSGlobals::gActionStepLength;

double MSGlobals::gDefaultEmergencyDecel(-1); // default for unitTest
double MSGlobals::gDefaultEmergencyDecel(-1.); // default for unitTest

bool MSGlobals::gUseStopEnded(false);
bool MSGlobals::gUseStopStarted(false);
Expand Down
1 change: 0 additions & 1 deletion unittest/src/microsim/MSCFModelTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ protected :
tau = 1;
type = new MSVehicleType(SUMOVTypeParameter("0"));
m = new MSCFModel_Krauss(type);
MSGlobals::gSemiImplicitEulerUpdate = true;
}

virtual void TearDown() {
Expand Down
1 change: 0 additions & 1 deletion unittest/src/microsim/MSCFModel_IDMTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ protected :
veh = new MSVehicleMock(defs, route, type, 1);
veh->setTentativeLaneAndPosition(dummyLane, 0);
veh->initDevices();
MSGlobals::gSemiImplicitEulerUpdate = true;
}

virtual void TearDown() {
Expand Down

0 comments on commit 5096213

Please sign in to comment.