From 92e752b3a89c25e566335c1b919f962337a0bfd6 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 2 Dec 2019 15:10:36 +0100
Subject: [PATCH] make vecto compile and run
---
VECTO/GUI/MainForm.resx | 3 ---
VECTO/GUI/MainForm.vb | 3 ---
VECTO/GUI/VectoJobForm.Designer.vb | 6 +++++-
VECTO/GUI/VectoJobForm.vb | 3 +--
VECTO/Input Files/Gearbox.vb | 4 ++--
.../DataObjectAdapter/DeclarationDataAdapter.cs | 6 +++---
.../DataObjectAdapter/EngineeringDataAdapter.cs | 6 +++---
.../Impl/DeclarationModeVectoRunDataFactory.cs | 2 +-
.../Impl/DeclarationVTPModeVectoRunDataFactory.cs | 2 +-
.../Impl/EngineeringModeVectoRunDataFactory.cs | 2 +-
.../VectoCore/Models/Declaration/DeclarationData.cs | 4 ++--
.../Models/SimulationComponent/Impl/ATGearbox.cs | 2 +-
VectoCore/VectoCore/OutputData/ModalDataContainer.cs | 2 +-
VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs | 12 ++++++------
.../Integration/ShiftStrategy/ShiftStrategyTest.cs | 4 ++--
.../VectoCoreTest/Utils/MockSimulationDataFactory.cs | 4 ++--
16 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/VECTO/GUI/MainForm.resx b/VECTO/GUI/MainForm.resx
index df927555f4..b00fb45de6 100644
--- a/VECTO/GUI/MainForm.resx
+++ b/VECTO/GUI/MainForm.resx
@@ -223,9 +223,6 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>732, 12</value>
</metadata>
- <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>850, 12</value>
- </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 9f2f734bcc..923723bf2f 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -953,9 +953,6 @@ Imports TUGraz.VectoCore.Utils
Physics.AirDensity = Cfg.AirDensity.SI (Of KilogramPerCubicMeter)()
End If
- DeclarationData.Trailer.RollResistanceCoefficient = tbTrailerRRC.Text.ToDouble(0.0055)
- DeclarationData.CycleSpeedLimit = _tbCycleSpeedLimit.Text.ToDouble(200).KMPHtoMeterPerSecond()
-
'dictionary of run-identifiers to fileWriters (used for output directory of modfile)
Dim fileWriters As Dictionary(Of Integer, FileOutputWriter) = New Dictionary(Of Integer, FileOutputWriter)
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 61c943835f..0a69fa0a30 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -205,7 +205,6 @@ Partial Class VectoJobForm
Me.GrLAC.SuspendLayout
Me.pnLookAheadCoasting.SuspendLayout
Me.GroupBox1.SuspendLayout
- Me.GroupBox2.SuspendLayout
Me.PnEcoRoll.SuspendLayout
Me.StatusStrip1.SuspendLayout
Me.ToolStrip1.SuspendLayout
@@ -1859,4 +1858,9 @@ End Sub
Friend WithEvents Label44 As Label
Friend WithEvents Label45 As Label
Friend WithEvents tbEcoRollMaxAcc As TextBox
+ Friend WithEvents TbShiftStrategyParams As TextBox
+ Friend WithEvents BtnShiftParamsForm As Button
+ Friend WithEvents BtnShiftStrategyParams As Button
+ Friend WithEvents GroupBox3 As GroupBox
+ Friend WithEvents cbGearshiftStrategy As ComboBox
End Class
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index f7a704ef45..a8a39b6ddd 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -1583,8 +1583,7 @@ lbDlog:
End If
End Sub
- End Sub
-
+
Private Sub Label44_Click(sender As Object, e As EventArgs) Handles Label44.Click
End Sub
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 8853067617..8d85923a18 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -220,7 +220,7 @@ Public Class Gearbox
End Try
axlegearData = doa.CreateAxleGearData(gearbox)
- gearboxData = doa.CreateGearboxData(gearbox, engine, axlegearData.AxleGear.Ratio, rdyn, vehiclecategory, gearbox, Nothing, false)
+ gearboxData = doa.CreateGearboxData(gearbox, engine, axlegearData.AxleGear.Ratio, rdyn, vehiclecategory, gearbox, Nothing, Nothing)
Else
Dim doa As EngineeringDataAdapter = New EngineeringDataAdapter()
Try
@@ -230,7 +230,7 @@ Public Class Gearbox
End Try
axlegearData = doa.CreateAxleGearData(gearbox)
- gearboxData = doa.CreateGearboxData(gearbox, engine, gearbox, axlegearData.AxleGear.Ratio, rdyn, vehiclecategory, gearbox, Nothing, false)
+ gearboxData = doa.CreateGearboxData(gearbox, engine, gearbox, axlegearData.AxleGear.Ratio, rdyn, vehiclecategory, gearbox, Nothing, Nothing)
End If
Dim result As IList(Of ValidationResult) =
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 35cefc8eae..46a77f711f 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -300,17 +300,17 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
internal GearboxData CreateGearboxData(
IGearboxDeclarationInputData gearbox, CombustionEngineData engine, double axlegearRatio, Meter dynamicTyreRadius,
- VehicleCategory vehicleCategory, ITorqueConverterDeclarationInputData torqueConverter, IShiftStrategy shiftStrategy, bool? atEcoRollReleaseLockupClutch)
+ VehicleCategory vehicleCategory, ITorqueConverterDeclarationInputData torqueConverter, IShiftStrategy shiftStrategy, IAdvancedDriverAssistantSystemDeclarationInputData adas)
{
if (!gearbox.SavedInDeclarationMode) {
WarnDeclarationMode("GearboxData");
}
var retVal = SetCommonGearboxData(gearbox);
- if (retVal.Type.AutomaticTransmission() && !atEcoRollReleaseLockupClutch.HasValue) {
+ if (adas != null && retVal.Type.AutomaticTransmission() && adas.EcoRoll != EcoRollType.None && !adas.ATEcoRollReleaseLockupClutch.HasValue) {
throw new VectoException("Input parameter ATEcoRollReleaseLockupClutch required for AT transmission");
}
- retVal.ATEcoRollReleaseLockupClutch = retVal.Type.AutomaticTransmission() ? atEcoRollReleaseLockupClutch.Value : false;
+ retVal.ATEcoRollReleaseLockupClutch = adas != null && adas.EcoRoll != EcoRollType.None && retVal.Type.AutomaticTransmission() ? adas.ATEcoRollReleaseLockupClutch.Value : false;
if (!SupportedGearboxTypes.Contains(gearbox.Type)) {
throw new VectoSimulationException("Unsupported gearbox type: {0}!", retVal.Type);
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 65b3630244..fbf094ff1f 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -263,7 +263,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
internal GearboxData CreateGearboxData(
IGearboxEngineeringInputData gearbox, CombustionEngineData engineData, IGearshiftEngineeringInputData gearshiftData,
double axlegearRatio, Meter dynamicTyreRadius, VehicleCategory vehicleCategory,
- ITorqueConverterEngineeringInputData torqueConverter, IShiftStrategy shiftStrategy, bool? atEcoRollReleaseLockupClutch)
+ ITorqueConverterEngineeringInputData torqueConverter, IShiftStrategy shiftStrategy, IAdvancedDriverAssistantSystemsEngineering adas)
{
if (gearbox.SavedInDeclarationMode) {
WarnEngineeringMode("GearboxData");
@@ -271,10 +271,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var retVal = SetCommonGearboxData(gearbox);
- if (retVal.Type.AutomaticTransmission() && !atEcoRollReleaseLockupClutch.HasValue) {
+ if (adas != null && adas.EcoRoll != EcoRollType.None && retVal.Type.AutomaticTransmission() && !adas.ATEcoRollReleaseLockupClutch.HasValue) {
throw new VectoException("Parameter ATEcoRollReleaseLockupClutch required for AT gearbox");
}
- retVal.ATEcoRollReleaseLockupClutch = retVal.Type.AutomaticTransmission() ? atEcoRollReleaseLockupClutch.Value : false;
+ retVal.ATEcoRollReleaseLockupClutch = adas != null && adas.EcoRoll != EcoRollType.None && retVal.Type.AutomaticTransmission() ? adas.ATEcoRollReleaseLockupClutch.Value : false;
//var gears = gearbox.Gears;
if (gearbox.Gears.Count < 2) {
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index 9346e64afb..3ecadcdc1f 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -124,7 +124,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
vehicle, vehicle.Components.EngineInputData.EngineModes[0], _segment.Missions.First());
_gearboxData = _dao.CreateGearboxData(vehicle.Components.GearboxInputData, tmpEngine,
_axlegearData.AxleGear.Ratio,
- tempVehicle.DynamicTyreRadius, tempVehicle.VehicleCategory, vehicle.Components.TorqueConverterInputData, tmpStrategy, vehicle.ADAS.ATEcoRollReleaseLockupClutch);
+ tempVehicle.DynamicTyreRadius, tempVehicle.VehicleCategory, vehicle.Components.TorqueConverterInputData, tmpStrategy, vehicle.ADAS);
_retarderData = _dao.CreateRetarderData(vehicle.Components.RetarderInputData);
_ptoTransmissionData = _dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData);
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
index bf34c6e153..9cb08d1355 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
@@ -138,7 +138,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
GearboxData = Dao.CreateGearboxData(
vehicle.Components.GearboxInputData, EngineData,
AxlegearData.AxleGear.Ratio,
- tempVehicle.DynamicTyreRadius, tempVehicle.VehicleCategory, vehicle.Components.TorqueConverterInputData, null, vehicle.ADAS.ATEcoRollReleaseLockupClutch);
+ tempVehicle.DynamicTyreRadius, tempVehicle.VehicleCategory, vehicle.Components.TorqueConverterInputData, null, vehicle.ADAS);
RetarderData = Dao.CreateRetarderData(vehicle.Components.RetarderInputData);
PTOTransmissionData =
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index 16a12f1d6f..a75287a171 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
};
var tmpStrategy = PowertrainBuilder.GetShiftStrategy(tmpRunData, new SimplePowertrainContainer(tmpRunData));
var gearboxData = dao.CreateGearboxData(vehicle.Components.GearboxInputData, engineData, InputDataProvider.DriverInputData.GearshiftInputData, axlegearData.AxleGear.Ratio,
- tempVehicle.DynamicTyreRadius,tempVehicle.VehicleCategory, vehicle.Components.TorqueConverterInputData, tmpStrategy, vehicle.ADAS.ATEcoRollReleaseLockupClutch);
+ tempVehicle.DynamicTyreRadius,tempVehicle.VehicleCategory, vehicle.Components.TorqueConverterInputData, tmpStrategy, vehicle.ADAS);
var crossWindRequired = vehicle.Components.AirdragInputData.CrossWindCorrectionMode ==
CrossWindCorrectionMode.VAirBetaLookupTable;
var angledriveData = dao.CreateAngledriveData(vehicle.Components.AngledriveInputData);
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 1e9dd76219..3220957383 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public static readonly StandardBodies StandardBodies = new StandardBodies();
public static readonly Payloads Payloads = new Payloads();
public static readonly PTOTransmission PTOTransmission = new PTOTransmission();
- public static MeterPerSecond CycleSpeedLimit;
+ //public static MeterPerSecond CycleSpeedLimit;
public const double LossMapExtrapolationFactor = 6;
public static readonly ADASCombinations ADASCombinations = new ADASCombinations();
@@ -172,7 +172,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public static class Trailer
{
- public static double RollResistanceCoefficient = 0.0055;
+ public static readonly double RollResistanceCoefficient = 0.0055;
public const double TyreTestLoad = 37500;
public const bool TwinTyres = false;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
index b07db985b2..116fbfbadf 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
@@ -128,7 +128,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity)
{
- if (_strategy!= null && CurrentState.Disengaged) {
+ if (CurrentState.Disengaged) {
Gear = _strategy?.InitGear(0.SI<Second>(), Constants.SimulationSettings.TargetTimeInterval, outTorque,
outAngularVelocity) ?? 1;
}
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index b936e65a07..6006dc804e 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.OutputData
//#if TRACE
strCols = strCols.Concat(_additionalColumns);
strCols = strCols.Concat(new[] { ModalResultField.ICEOn }.Select(x => x.GetName()));
- dataColumns.Add(ModalResultField.altitude);
+ //dataColumns.Add(ModalResultField.altitude);
//#endif
if (WriteModalResults) {
var filteredData = Data;
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index faf34b3d44..8ad6c02435 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -174,7 +174,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(inputProvider,
MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
(IGearshiftEngineeringInputData)inputProvider, 2.1,
- 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, false);
+ 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
// interpreted as gearbox with first and second gear using TC (due to gear ratios)
@@ -199,7 +199,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(inputProvider,
MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
(IGearshiftEngineeringInputData)inputProvider, 2.1,
- 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, false);
+ 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
Assert.IsTrue(gbxData.Gears[1].HasLockedGear);
@@ -226,7 +226,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(inputProvider,
MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
(IGearshiftEngineeringInputData)inputProvider, 2.1,
- 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, false);
+ 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
Assert.IsTrue(gbxData.Gears[1].HasLockedGear);
@@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(inputProvider,
MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
(IGearshiftEngineeringInputData)inputProvider, 2.1,
- 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null,false);
+ 0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
Assert.IsFalse(gbxData.Gears[1].HasLockedGear);
@@ -280,7 +280,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(inputProvider,
MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
(IGearshiftEngineeringInputData)inputProvider, 2.1,
- 0.5.SI<Meter>(), VehicleCategory.InterurbanBus, (ITorqueConverterEngineeringInputData)inputProvider, null, false);
+ 0.5.SI<Meter>(), VehicleCategory.InterurbanBus, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
Assert.IsTrue(gbxData.Gears[1].HasLockedGear);
@@ -308,7 +308,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(inputProvider,
MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
(IGearshiftEngineeringInputData)inputProvider, 2.1,
- 0.5.SI<Meter>(), VehicleCategory.InterurbanBus, (ITorqueConverterEngineeringInputData)inputProvider, null, false);
+ 0.5.SI<Meter>(), VehicleCategory.InterurbanBus, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
Assert.IsFalse(gbxData.Gears[1].HasLockedGear);
diff --git a/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs b/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
index d4d2b6b2b5..ffbdf120fb 100644
--- a/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
@@ -154,11 +154,11 @@ namespace TUGraz.VectoCore.Tests.Integration.ShiftStrategy
var r = tuple.Item2;
var s = tuple.Item3;
var fc = r.EngineSpeed != null
- ? container.RunData.EngineData.ConsumptionMap.GetFuelConsumption(r.EngineTorqueDemandTotal, r.EngineSpeed).Value
+ ? container.RunData.EngineData.Fuels.First().ConsumptionMap.GetFuelConsumption(r.EngineTorqueDemandTotal, r.EngineSpeed).Value
.ConvertToGrammPerHour().Value
: 0;
var fc2 = s?.EngineSpeed != null
- ? container.RunData.EngineData.ConsumptionMap.GetFuelConsumption(s.EngineTorqueDemandTotal, s.EngineSpeed).Value
+ ? container.RunData.EngineData.Fuels.First().ConsumptionMap.GetFuelConsumption(s.EngineTorqueDemandTotal, s.EngineSpeed).Value
.ConvertToGrammPerHour().Value
: 0;
Console.WriteLine(
diff --git a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
index b68d71a96b..1479765a45 100644
--- a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
@@ -67,7 +67,7 @@ namespace TUGraz.VectoCore.Tests.Utils
};
var engineData = dao.CreateEngineData(vehicleInput, engineInput.EngineModes.First(), mission);//(engineInput, null, gearboxInput, new List<ITorqueLimitInputData>());
return dao.CreateGearboxData(gearboxInput, engineData, ((IAxleGearInputData)gearboxInput).Ratio, 0.5.SI<Meter>(),
- VehicleCategory.RigidTruck, (ITorqueConverterDeclarationInputData)gearboxInput, null, false);
+ VehicleCategory.RigidTruck, (ITorqueConverterDeclarationInputData)gearboxInput, null, null);
} else {
var dao = new EngineeringDataAdapter();
var runData = new MockEngineeringVehicleInputData() {
@@ -78,7 +78,7 @@ namespace TUGraz.VectoCore.Tests.Utils
var engineData = dao.CreateEngineData(runData, engineInput.EngineModes.First());
return dao.CreateGearboxData(gearboxInput, engineData, (IGearshiftEngineeringInputData)gearboxInput,
((IAxleGearInputData)gearboxInput).Ratio, 0.5.SI<Meter>(),
- VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)gearboxInput, null, false);
+ VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)gearboxInput, null, null);
}
}
--
GitLab