making function accessible. refs #12

eclipse-sumo · Feb 28, 2024 · 5e605c8 · 5e605c8
1 parent fce8692
commit 5e605c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/microsim/devices/MSDevice_Transportable.cpp b/src/microsim/devices/MSDevice_Transportable.cpp
@@ -135,7 +135,7 @@ MSDevice_Transportable::transferAtSplitOrJoin(MSBaseVehicle* otherVeh) {
 
 
 bool
-MSDevice_Transportable::willTransferAtJoin(const MSTransportable* t, const MSBaseVehicle* joinVeh) const {
+MSDevice_Transportable::willTransferAtJoin(const MSTransportable* t, const MSBaseVehicle* joinVeh) {
     if (joinVeh && t->getNumRemainingStages() > 1) {
         MSStageDriving* const stage2 = dynamic_cast<MSStageDriving*>(t->getNextStage(1));
         return stage2->isWaitingFor(joinVeh);

diff --git a/src/microsim/devices/MSDevice_Transportable.h b/src/microsim/devices/MSDevice_Transportable.h
@@ -149,6 +149,9 @@ class MSDevice_Transportable : public MSVehicleDevice {
         return myTransportables;
     }
 
+    /// @brief check if boardingDuration should be applied
+    static bool willTransferAtJoin(const MSTransportable* t, const MSBaseVehicle* joinVeh);
+
 protected:
     /** @brief Internal notification about the vehicle moves, see MSMoveReminder::notifyMoveInternal()
      *
@@ -162,10 +165,6 @@ class MSDevice_Transportable : public MSVehicleDevice {
                             const double travelledDistanceVehicleOnLane,
                             const double meanLengthOnLane);
 
-    /// @brief check if boardingDuration should be applied
-    bool willTransferAtJoin(const MSTransportable* t, const MSBaseVehicle* joinVeh) const;
-
-
 private:
     /** @brief Constructor
      *

diff --git a/tests/sumo/cf_model/rail/accel/custom_curves/input_routes.rou.xml b/tests/sumo/cf_model/rail/accel/custom_curves/input_routes.rou.xml
@@ -3,7 +3,7 @@
   options: 
 -->
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vType id="0" vClass="rail" carFollowModel="Rail" trainType="custom" max="114e3" maxPower="2350" maxTraction="150"
-        resCoef_quadratic="0.28" resCoef_linear="0.03" resCoef_constant="1670"/>
+    <vType id="0" vClass="rail" carFollowModel="Rail" trainType="custom" maxPower="2350" maxTraction="150"
+        resCoef_quadratic="0.00028" resCoef_linear="0.00003" resCoef_constant="1.670"/>
     <trip id="r0" depart="0.00" departLane="best" from="e0" to="e2" type="0"/>
 </routes>