Merge pull request #613 in VECTO/vecto-sim from...

Merge pull request #613 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-662-updates-for-mission-profiles-urban-delivery-and-construction to develop

* commit 'b1c2b422':
  skip re-running a simulation run
  allow slipping clutch also in second gear (required in construction cycle with limited engine speed)
  debugging failed tests
  fix in cycle zip
  removing bogus entry
  new declaration cycles for construction and urban delivery
  fix in cycle-compressor

Tools/DeclarationCycleZip/Program.cs

@@ -64,8 +64,8 @@ namespace DeclarationCycleZip
 				}
 				var row = table.NewRow();
 				row["<s>"] = x.Distance.Value().ToString(CultureInfo.InvariantCulture);
-			    row["<v>"] = x.VehicleTargetSpeed.ConvertToKiloMeterPerHour().ToString(CultureInfo.InvariantCulture);
-                row["<grad>"] = x.RoadGradientPercent.Value().ToString(CultureInfo.InvariantCulture);
+				row["<v>"] = x.VehicleTargetSpeed.ConvertToKiloMeterPerHour().Value.ToString(CultureInfo.InvariantCulture);
+				row["<grad>"] = x.RoadGradientPercent.Value().ToString(CultureInfo.InvariantCulture);
 				row["<stop>"] = x.StoppingTime.Value().ToString(CultureInfo.InvariantCulture);
 				table.Rows.Add(row);
 				lastDistance = x.Distance;

VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs

@@ -101,6 +101,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 
 		public void Run()
 		{
+			if (Container.RunStatus != Status.Pending) {
+				return;
+			}
 			var debug = new DebugData();
 
 			Log.Info("VectoJob started running.");

VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs

@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			NewtonMeter torqueIn;
 			PerSecond angularVelocityIn;
 
-			var slippingClutchWhenDriving = (DataBus.Gear == 1 && DataBus.DriverBehavior != DrivingBehavior.Braking);
+			var slippingClutchWhenDriving = (DataBus.Gear <= 2 && DataBus.DriverBehavior != DrivingBehavior.Braking);
 			var slippingClutchDuringBraking = DataBus.Gear == 1 && DataBus.DriverBehavior == DrivingBehavior.Braking && outTorque > 0;
 			//var slippingClutchWhenDriving = (DataBus.Gear == 1 && outTorque > 0);
 			AddClutchLoss(outTorque, outAngularVelocity,

VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs

@@ -29,6 +29,7 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
+using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using TUGraz.VectoCommon.Models;
@@ -62,6 +63,13 @@ namespace TUGraz.VectoCore.Tests.Integration
 		const string EngineSpeedLimitJobDecl =
 			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_engineSpeedlimit\Class2_RigidTruck_DECL.vecto";
 
+		[OneTimeSetUp]
+		public void RunBeforeAnyTests()
+		{
+			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+		}
+
+
 		[TestCase()]
 		public void TestGearboxTorqueLimitsAbove90FLD()
 		{

VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs

@@ -109,7 +109,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 				AirdragData = airdragData,
 				AxleGearData = axleGearData,
 				GearboxData = gearboxData,
-				SimulationType = SimulationType.DistanceCycle
+				SimulationType = SimulationType.DistanceCycle,
+				Cycle = cycleData
 			};
 			container.RunData = runData;