From c385738372d8701fd96d81b25cee1af3274336ce Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 5 Dec 2019 08:22:03 +0100
Subject: [PATCH] remove default parameter in driver strategy constructor for
vehicle container
---
.../SimulationComponent/Impl/DefaultDriverStrategy.cs | 4 ++--
VectoCore/VectoCore/OutputData/ModalDataContainer.cs | 2 +-
VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs | 2 +-
.../Integration/CoachAdvancedAuxPowertrain.cs | 2 +-
VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs | 2 +-
.../Integration/SimulationRuns/FullPowertrain.cs | 6 +++---
.../Integration/SimulationRuns/MinimalPowertrain.cs | 6 +++---
.../VectoCoreTest/Integration/Truck40tPowerTrain.cs | 2 +-
.../Models/SimulationComponent/DriverTest.cs | 10 +++++-----
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index e3d8255956..2f73460085 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected bool ATEcoRollReleaseLockupClutch;
- public DefaultDriverStrategy(IVehicleContainer container = null)
+ public DefaultDriverStrategy(IVehicleContainer container)
{
DrivingModes.Add(DrivingMode.DrivingModeDrive, new DriverModeDrive() { DriverStrategy = this });
DrivingModes.Add(DrivingMode.DrivingModeBrake, new DriverModeBrake() { DriverStrategy = this });
@@ -95,7 +95,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
EngineStopStart = false,
PredictiveCruiseControl = PredictiveCruiseControlType.None,
};
- ATEcoRollReleaseLockupClutch = data.GearboxData.ATEcoRollReleaseLockupClutch;
+ ATEcoRollReleaseLockupClutch = data?.GearboxData?.ATEcoRollReleaseLockupClutch ?? false;
EcoRollState = new EcoRoll() {
State = Impl.EcoRollStates.EcoRollOff,
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index 98c7743972..d37db93e49 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -244,7 +244,7 @@ namespace TUGraz.VectoCore.OutputData
.Concat(
new[] {
ModalResultField.P_WHR_el_map, ModalResultField.P_WHR_el_corr, ModalResultField.P_WHR_mech_map, ModalResultField.P_WHR_mech_corr, ModalResultField.P_aux_ice_off,
- ModalResultField.P_ice_start
+ ModalResultField.P_ice_start//, ModalResultField.altitude
}.Select(x => x.GetName()))
.Concat(FuelColumns.SelectMany(kv => kv.Value.Select(kv2 => kv2.Value.ColumnName)));
diff --git a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
index f56a1d316a..624f093d78 100644
--- a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.Tests.Integration
};
var cycle = new DistanceBasedDrivingCycle(container, cycleData);
var engine = new CombustionEngine(container, engineData);
- var tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ var tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, airdragData))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index d683aa3ece..946ceed8f4 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -103,7 +103,7 @@ namespace TUGraz.VectoCore.Tests.Integration
Cycle = cycleData
};
container.RunData = runData;
- cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, airdragData))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 8049d86d1f..e85ef0b764 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -106,7 +106,7 @@ namespace TUGraz.VectoCore.Tests.Integration
};
container.RunData = runData;
- var tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ var tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, airDragData))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index b5317286e5..94baf905f4 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -101,7 +101,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
AirdragData = airDragData
};
- cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, airDragData))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
@@ -168,7 +168,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
};
var cyclePort = cycle.OutPort();
- cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, airDragData))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
@@ -247,7 +247,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
var cycle = new DistanceBasedDrivingCycle(container, cycleData);
var cyclePort = cycle.OutPort();
- cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, airDragData))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index 708a3b8295..1d7b6bc912 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -85,7 +85,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
var modData = new ModalDataContainer("Coach_MinimalPowertrainOverload", new[] { FuelData.Diesel }, fileWriter);
var container = new VehicleContainer(ExecutionMode.Engineering, modData);
- var driver = new Driver(container, driverData, new DefaultDriverStrategy());
+ var driver = new Driver(container, driverData, new DefaultDriverStrategy(container));
var engine = new CombustionEngine(container, engineData);
driver.AddComponent(new Vehicle(container, vehicleData, CreateAirdragData()))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
var cycle = new DistanceBasedDrivingCycle(container, cycleData);
- cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, CreateAirdragData()))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
@@ -205,7 +205,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
container.RunData = new VectoRunData() { SimulationType = SimulationType.DistanceCycle };
var cycle = new DistanceBasedDrivingCycle(container, cycleData);
- cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, CreateAirdragData()))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index 7af6e22d17..fba63e1241 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -126,7 +126,7 @@ namespace TUGraz.VectoCore.Tests.Integration
throw new ArgumentOutOfRangeException("gbxType", gbxType, null);
}
- dynamic tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
+ dynamic tmp = cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy(container)))
.AddComponent(new Vehicle(container, vehicleData, airdragData))
.AddComponent(new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index c9357eb17a..652f5bd43d 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -85,7 +85,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var vehicleContainer = new VehicleContainer(ExecutionMode.Engineering, modData);
var mockCycle = new MockDrivingCycle(vehicleContainer, null);
- var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy());
+ var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));
var engine = new CombustionEngine(vehicleContainer, engineData);
var clutch = new Clutch(vehicleContainer, engineData);
dynamic tmp = AddComponent(driver, new Vehicle(vehicleContainer, vehicleData, airdragData));
@@ -143,7 +143,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var vehicleContainer = new VehicleContainer(ExecutionMode.Engineering, modData);
var mockCycle = new MockDrivingCycle(vehicleContainer, null);
- var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy());
+ var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));
var engine = new CombustionEngine(vehicleContainer, engineData);
var clutch = new Clutch(vehicleContainer, engineData);
@@ -207,7 +207,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var cycle = new MockDrivingCycle(vehicleContainer, null);
var brakes = new Brakes(vehicleContainer);
- var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy());
+ var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));
dynamic tmp = AddComponent(driver, new Vehicle(vehicleContainer, vehicleData, airdragData));
tmp = AddComponent(tmp, new Wheels(vehicleContainer, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia));
@@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var vehicle = new MockVehicle(vehicleContainer);
var driverData = MockSimulationDataFactory.CreateDriverDataFromFile(JobFile);
- var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy());
+ var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));
new MockEngine(vehicleContainer);
@@ -323,7 +323,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
new MockEngine(vehicleContainer);
var driverData = MockSimulationDataFactory.CreateDriverDataFromFile(JobFile);
- var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy());
+ var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));
var cycle = new MockDrivingCycle(vehicleContainer, null);
var brakes = new Brakes(vehicleContainer);
--
GitLab