Merging in latest from upstream (VECTO/vecto-sim:refs/heads/develop)

* commit '25cd6aaf':
  updating release notes
  updating version number
  make testcases compile and run
  introduce declaration contants for gearbox shifting parameters
  removed ExecutionMode.EngineOnly (Vecto 3)
  corrected: writing mod data (Vecto 2.2, Engine Only mode)

VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs

@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Kilogram massExtra, Kilogram loading, bool overspeed = false, GearboxType gbxType = GearboxType.AMT)
 		{
 			var fileWriter = new FileOutputWriter(modFileName);
-			var modData = new ModalDataContainer(Path.GetFileName(modFileName), fileWriter, ExecutionMode.Engineering);
+			var modData = new ModalDataContainer(Path.GetFileName(modFileName), fileWriter);
 			var container = new VehicleContainer(ExecutionMode.Engineering, modData) {
 				RunData = new VectoRunData { JobName = modFileName, Cycle = cycleData }
 			};
@@ -152,9 +152,9 @@ namespace TUGraz.VectoCore.Tests.Integration
 				StartTorqueReserve = 0.2,
 				SkipGears = true,
 				EarlyShiftUp = true,
-				UpshiftAfterDownshiftDelay = 10.SI<Second>(),
-				DownshiftAfterUpshiftDelay = 10.SI<Second>(),
-				UpshiftMinAcceleration = 0.1.SI<MeterPerSquareSecond>()
+				DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay,
+				UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay,
+				UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration
 			};
 		}
 

VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs

@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 
 		{
 			var fileWriter = new FileOutputWriter("AuxWriteModFileSumFile");
-			var modData = new ModalDataContainer("AuxWriteModFileSumFile", fileWriter, ExecutionMode.Engineering);
+			var modData = new ModalDataContainer("AuxWriteModFileSumFile", fileWriter);
 			modData.AddAuxiliary("FAN");
 			modData.AddAuxiliary("PS");
 			modData.AddAuxiliary("STP");

VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs

@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		public void TestEngineOnly()
 		{
 			var dataWriter = new MockModalDataContainer();
-			var container = new VehicleContainer(ExecutionMode.EngineOnly, dataWriter);
+			var container = new VehicleContainer(ExecutionMode.Engineering, dataWriter);
 
 			var cycleData = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach Engine Only.vdri", CycleType.EngineOnly,
 				false);
@@ -82,7 +82,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		[TestMethod]
 		public void TestEngineOnlyWithTimestamps()
 		{
-			var container = new VehicleContainer(ExecutionMode.EngineOnly);
+			var container = new VehicleContainer(ExecutionMode.Engineering);
 
 			var cycleData = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach Engine Only Paux_var-dt.vdri",
 				CycleType.EngineOnly, false);

VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs

@@ -98,7 +98,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			var sumWriter = new SummaryDataContainer(fileWriter);
 
 			var inputData = JSONInputDataFactory.ReadJsonJob(EngineOnlyJob);
-			var factory = new SimulatorFactory(ExecutionMode.EngineOnly, inputData, fileWriter) {
+			var factory = new SimulatorFactory(ExecutionMode.Engineering, inputData, fileWriter) {
 				SumData = sumWriter
 			};
 
@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			var jobContainer = new JobContainer(sumWriter);
 
 			var inputData = JSONInputDataFactory.ReadJsonJob(jobFile);
-			var runsFactory = new SimulatorFactory(ExecutionMode.EngineOnly,
+			var runsFactory = new SimulatorFactory(ExecutionMode.Engineering,
 				inputData, fileWriter);
 
 			jobContainer.AddRuns(runsFactory);

VectoCore/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs

@@ -45,7 +45,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		[TestMethod]
 		public void VechicleContainerHasEngine()
 		{
-			var vehicle = new VehicleContainer(ExecutionMode.EngineOnly);
+			var vehicle = new VehicleContainer(ExecutionMode.Engineering);
 			var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(EngineFile);
 			var engine = new CombustionEngine(vehicle, engineData);
 

VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

@@ -63,7 +63,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		[TestCase]
 		public void TestEngineHasOutPort()
 		{
-			var vehicle = new VehicleContainer(ExecutionMode.EngineOnly);
+			var vehicle = new VehicleContainer(ExecutionMode.Engineering);
 			var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(CoachEngine);
 			var engine = new CombustionEngine(vehicle, engineData);
 
@@ -74,7 +74,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		[TestCase]
 		public void TestOutPortRequestNotFailing()
 		{
-			var vehicle = new VehicleContainer(ExecutionMode.EngineOnly);
+			var vehicle = new VehicleContainer(ExecutionMode.Engineering);
 			var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(CoachEngine);
 			var engine = new CombustionEngine(vehicle, engineData);
 

VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs

@@ -69,7 +69,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var driverData = CreateDriverData();
 
 			var fileWriter = new FileOutputWriter("Coach_MinimalPowertrain_Coasting");
-			var modData = new ModalDataContainer("Coach_MinimalPowertrain_Coasting", fileWriter, ExecutionMode.Engineering);
+			var modData = new ModalDataContainer("Coach_MinimalPowertrain_Coasting", fileWriter);
 			var vehicleContainer = new VehicleContainer(ExecutionMode.Engineering, modData);
 			var mockCycle = new MockDrivingCycle(vehicleContainer, null);
 
@@ -125,7 +125,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var driverData = CreateDriverData();
 
 			var fileWriter = new FileOutputWriter("Coach_MinimalPowertrain_Coasting");
-			var modData = new ModalDataContainer("Coach_MinimalPowertrain_Coasting", fileWriter, ExecutionMode.Engineering);
+			var modData = new ModalDataContainer("Coach_MinimalPowertrain_Coasting", fileWriter);
 			var vehicleContainer = new VehicleContainer(ExecutionMode.Engineering, modData);
 			var mockCycle = new MockDrivingCycle(vehicleContainer, null);
 
@@ -184,7 +184,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var driverData = CreateDriverData();
 
 			var fileWriter = new FileOutputWriter("Coach_MinimalPowertrain");
-			var modData = new ModalDataContainer("Coach_MinimalPowertrain", fileWriter, ExecutionMode.Engineering);
+			var modData = new ModalDataContainer("Coach_MinimalPowertrain", fileWriter);
 			var vehicleContainer = new VehicleContainer(ExecutionMode.Engineering, modData);
 
 			var cycle = new MockDrivingCycle(vehicleContainer, null);

VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs

@@ -38,6 +38,7 @@ using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.InputData.Reader;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+using TUGraz.VectoCore.Models.Declaration;
 using TUGraz.VectoCore.Models.Simulation.DataBus;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
@@ -92,6 +93,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				ShiftTime = 2.SI<Second>(),
 				Inertia = 0.SI<KilogramSquareMeter>(),
 				TractionInterruption = 1.SI<Second>(),
+				DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay,
+				UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay,
+				UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration
 			};
 		}
 

VectoCore/VectoCoreTest/Reports/SumWriterTest.cs

@@ -49,7 +49,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 			var writer = new FileOutputWriter("testsumcalc_fixed");
 			var sumWriter = new SummaryDataContainer(writer);
 
-			var modData = new ModalDataContainer("testsumcalc_fixed", writer, ExecutionMode.Engineering);
+			var modData = new ModalDataContainer("testsumcalc_fixed", writer);
+			
 			modData.AddAuxiliary("FAN");
 
 			for (var i = 0; i < 500; i++) {
@@ -99,7 +100,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 			var writer = new FileOutputWriter("testsumcalc_var");
 			var sumWriter = new SummaryDataContainer(writer);
 
-			var modData = new ModalDataContainer("testsumcalc_var", writer, ExecutionMode.Engineering);
+			var modData = new ModalDataContainer("testsumcalc_var", writer);
 			modData.AddAuxiliary("FAN");
 
 			var timeSteps = new[]