Merge remote-tracking branch 'vecto/develop' into feature/VECTO-167-additional-vmod-in-1hz

VectoCommon/VectoCommon/VectoCommon.csproj

@@ -25,7 +25,8 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -265,7 +265,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-
 		private void WarnDeclarationMode(string inputData)
 		{
 			Log.Warn("{0} not in Declaration Mode!", inputData);
@@ -276,7 +275,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return SetCommonRetarderData(retarder, vehicle);
 		}
 
-
 		public static List<CrossWindCorrectionCurveReader.CrossWindCorrectionEntry> GetDeclarationAirResistanceCurve(
 			VehicleCategory vehicleCategory, SquareMeter aerodynamicDragAera)
 		{

VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs

@@ -453,7 +453,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				response = DoHandleRequest(absTime, ds, Driver.DataBus.VehicleSpeed, gradient);
 				return response;
 			}
-
 			Log.Debug("Exceeding next ActionDistance at {0}. Reducing max Distance from {2} to {1}",
 				DriverStrategy.NextDrivingAction.ActionDistance, newds, ds);
 			return new ResponseDrivingCycleDistanceExceeded() {
@@ -494,15 +493,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
 				}
 				response.Switch().
-					Case<ResponseGearShift>(() => {
-						response = Driver.DrivingActionRoll(absTime, ds, velocity, gradient);
-						response.Switch().
-							Case<ResponseUnderload>(() => {
-								// overload may happen if driver limits acceleration when rolling downhill
-								response = Driver.DrivingActionBrake(absTime, ds, velocity, gradient);
-							}).
-							Case<ResponseSpeedLimitExceeded>(() => { response = Driver.DrivingActionBrake(absTime, ds, velocity, gradient); });
-					}).
 					Case<ResponseUnderload>(r => {
 						if (DriverStrategy.OverspeedAllowed(gradient, targetVelocity)) {
 							response = Driver.DrivingActionCoast(absTime, ds, velocity, gradient);
@@ -513,6 +503,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 							response = Driver.DrivingActionBrake(absTime, ds, velocity, gradient);
 						}
 					});
+
+				response.Switch().
+					Case<ResponseGearShift>(r => {
+						response = Driver.DrivingActionRoll(absTime, ds, velocity, gradient);
+						response.Switch().
+							Case<ResponseUnderload>(() => {
+								// overload may happen if driver limits acceleration when rolling downhill
+								response = Driver.DrivingActionBrake(absTime, ds, velocity, gradient);
+							}).
+							Case<ResponseSpeedLimitExceeded>(() => { response = Driver.DrivingActionBrake(absTime, ds, velocity, gradient); });
+					});
 			} else {
 				if (DataBus.VehicleSpeed.IsSmallerOrEqual(0.SI<MeterPerSecond>())) {
 					// the clutch is disengaged, and the vehicle stopped - we can't perform a roll action. wait for the clutch to be engaged