Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit afe8d312 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

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

Merge pull request #732 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-883-traction-interruption-may-be-too-long to develop

* commit '0b0b06a9':
  adapt testcase: allow few traction interruptions to be longer than specified in model data (i.e. due to gearshift right before a speed change (simulation interval can't be changed))
  allow reduction of traction interruption interval by 10%
  correct testdata
  updated testcases with expected fuel consumption (slight changes due to shorter effective traction interruption)
  allow tolerance of 0.1*tractioninterruption for engaging geear
  adding testcase for traction interruption
parents 91963872 0b0b06a9
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 695 additions and 22 deletions
VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+ 8
− 1
View file @ afe8d312
......@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override bool ClutchClosed(Second absTime)
{
return _engageTime.IsSmallerOrEqual(absTime);
return _engageTime.IsSmallerOrEqual(absTime, ModelData.TractionInterruption / 20);
}
public Gearbox(IVehicleContainer container, IShiftStrategy strategy, VectoRunData runData) : base(container, runData)
......@@ -274,6 +274,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
};
}
var remainingTime = _engageTime - (absTime + dt);
var withinTractionInterruption = absTime.IsSmaller(_engageTime) && (absTime + dt).IsSmaller(_engageTime);
if (withinTractionInterruption && remainingTime.IsSmaller(Constants.SimulationSettings.LowerBoundTimeInterval) && remainingTime.IsSmaller(ModelData.TractionInterruption * 0.1)) {
// interval has already been prolonged, but has been overruled. if remaining time is less than 10%, reduce traction interruption time
_engageTime = absTime + dt;
}
if ((inTorque * avgInAngularVelocity).IsGreater(0.SI<Watt>(), Constants.SimulationSettings.LineSearchTolerance)) {
return new ResponseOverload {
Source = this,
......
VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
+ 4
− 4
View file @ afe8d312
......@@ -58,10 +58,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
[TestCase(null, 1.0, 45.5317321, TestName = "Engine CF - NONE"),
TestCase("CFRegPer", 1.2, 45.5317321 * 1.2, TestName = "Engine CF - CFRegPer"),
TestCase("BFColdHot", 1.2, 45.5317321 * 1.2, TestName = "Engine CF - BFColdHod"),
TestCase("CFNCV", 1.2, 45.5317321, TestName = "Engine CF - CFNCV") // has no influence - only for documentation purpose
[TestCase(null, 1.0, 45.542369, TestName = "Engine CF - NONE"),
TestCase("CFRegPer", 1.2, 45.542369 * 1.2, TestName = "Engine CF - CFRegPer"),
TestCase("BFColdHot", 1.2, 45.542369 * 1.2, TestName = "Engine CF - BFColdHod"),
TestCase("CFNCV", 1.2, 45.542369, TestName = "Engine CF - CFNCV") // has no influence - only for documentation purpose
]
public void TestEngineCorrectionFactors(string correctionFactor, double value, double expectedFc)
{
......
VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+ 4
− 4
View file @ afe8d312
......@@ -63,10 +63,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
[
TestCase(Class5NG, 2, TankSystem.Liquefied, 253.7, 702.8, TestName = "Class5 LNG 2"),
TestCase(Class5NG, 2, TankSystem.Compressed, 259.5, 698.1, TestName = "Class5 CNG 2"),
TestCase(Class5NG, 6, TankSystem.Liquefied, 252.9, 700.6, TestName = "Class5 LNG 6"),
TestCase(Class5NG, 6, TankSystem.Compressed, 258.7, 696.0, TestName = "Class5 CNG 6"),
TestCase(Class5NG, 2, TankSystem.Liquefied, 253.8, 703.0, TestName = "Class5 LNG 2"),
TestCase(Class5NG, 2, TankSystem.Compressed, 259.6, 698.3, TestName = "Class5 CNG 2"),
TestCase(Class5NG, 6, TankSystem.Liquefied, 253.0, 700.7, TestName = "Class5 LNG 6"),
TestCase(Class5NG, 6, TankSystem.Compressed, 258.8, 696.1, TestName = "Class5 CNG 6"),
]
public void NaturalGasTankSystemTest(string filename, int runIdx, TankSystem tankSystem, double expectedFc, double expectedCo2)
{
......
VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
+ 9
− 9
View file @ afe8d312
......@@ -59,40 +59,40 @@ namespace TUGraz.VectoCore.Tests.Integration
[Category("Integration")]
[TestCase(FuelType.DieselCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
0.000219917746665248, 0.000219917746665248, 26.305950558044, 0.000688342547062226, 9390.48778260609,
0.000219921110821829, 0.000219921110821829, 26.3063529691184, 0.000688353076872326, 9390.63143209212,
TestName = "Diesel LH Low"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
0.000219917746665248, 0.000222515200366018, 27.1360000446364, 0.000402752512662493, 5651.88608929686,
0.000219921110821829, 0.000222518604256733, 27.1364151532601, 0.000402758673704687, 5651.97254812102,
TestName = "Ethanol/CI LH Low"),
TestCase(FuelType.DieselCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
0.000254729908208703, 0.000254729908208703, 30.4700847139597, 0.000797304612693239, 10876.9670805116,
0.000254735249582656, 0.000254735249582656, 30.4707236342891, 0.000797321331193715, 10877.1951571794,
TestName = "Diesel LH Ref"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
0.000254729908208703, 0.000257738529171796, 31.43152794778, 0.000466506737800951, 6546.55864096363,
0.000254735249582656, 0.000257743933632844, 31.4321870283957, 0.000466516519875449, 6546.69591427425,
TestName = "Ethanol/CI LH Ref"),
TestCase(FuelType.EthanolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
0.000254729908208703, 0.000252991137504206, 32.1871676214003, 0.000531281388758833, 7412.64032887325,
0.000254735249582656, 0.00025299644241827, 32.1878425468536, 0.000531292529078366, 7412.7957628553,
TestName = "Ethanol/PI LH Ref"),
TestCase(FuelType.PetrolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
0.000254729908208703, 0.000254729908208703, 34.0548005626608, 0.000774378920954456, 10571.2911906612,
0.000254735249582656, 0.000254735249582656, 34.0555146500878, 0.000774395158731276, 10571.5128576802,
TestName = "Petrol/PI LH Ref"),
TestCase(FuelType.LPGPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
0.000254729908208703, 0.000254729908208703, null, 0.000769284322790282, 11717.5757776003,
0.000254735249582656, 0.000254735249582656, null, 0.000769300453739622, 11717.8214808022,
TestName = "LPG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Liquefied,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
0.000254729908208703, 0.000233977980859725, null, 0.000648119006981438, 11488.3188602125,
0.000254735249582656, 0.000233982887091198, null, 0.000648132597242618, 11488.5597561778,
TestName = "LNG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Compressed,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
0.000254729908208703, 0.000239339976254428, null, 0.000643824536124411, 11488.3188602125,
0.000254735249582656, 0.000239344994920373, null, 0.000643838036335802, 11488.5597561779,
TestName = "CNG/PI LH Ref"),
]
public void TestFuelTypesCO2(FuelType fuelType, TankSystem? tankSystem, string jobName, int runIdx,
......
VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+ 4
− 4
View file @ afe8d312
......@@ -257,10 +257,10 @@ namespace TUGraz.VectoCore.Tests.Integration
Console.WriteLine(string.Join("; ", view.AsEnumerable().Select(x => x[SummaryDataContainer.FCMAP_KM].ToString().ToDouble())));
Assert.AreEqual(201.39195, view.Rows[0][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(239.28546, view.Rows[1][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(170.15249, view.Rows[2][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(183.03570, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(224.26897, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(254.53251, view.Rows[5][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(170.16912, view.Rows[2][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(183.03651, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(224.25062, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(254.50948, view.Rows[5][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
}
[TestCase(EngineSpeedLimitJobATDecl)]
......
VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+ 82
− 0
View file @ afe8d312
......@@ -48,7 +48,9 @@ using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.Tests.Integration;
using TUGraz.VectoCore.Tests.Utils;
using System.IO;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Tests.Models.Simulation;
namespace TUGraz.VectoCore.Tests.Reports
{
......@@ -145,6 +147,86 @@ namespace TUGraz.VectoCore.Tests.Reports
RunSimulation(jobName, ExecutionMode.Engineering);
}
[TestCase(@"TestData\XML\XMLReaderDeclaration\Tractor_4x2_vehicle-class-5_5_t_0.xml", 1, 1.0),
TestCase(@"TestData\XML\XMLReaderDeclaration\Tractor_4x2_vehicle-class-5_5_t_0.xml", 7, 1.0)
]
public void TractionInterruptionTest(string filename, int idx, double expectedTractionInterruption)
{
var writer = new FileOutputWriter(filename);
var inputData = new XMLDeclarationInputDataProvider(filename, true);
var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
WriteModalResults = true,
};
var jobContainer = new JobContainer(new MockSumWriter());
jobContainer.AddRuns(factory);
var run = jobContainer.Runs[idx];
var modData = ((ModalDataContainer)run.Run.GetContainer().ModalData).Data;
run.Run.Run();
//Assert.IsTrue(run.Done);
//Assert.IsTrue(run.Success);
Assert.IsTrue(modData.Rows.Count > 0);
var tractionInterruptionTimes = ExtractTractionInterruptionTimes(modData);
var min = tractionInterruptionTimes.Values.Min();
//var max = tractionInterruptionTimes.Values.Max();
Console.WriteLine("number of traction interruption intervals: {0}", tractionInterruptionTimes.Count);
var exceedingHigh = tractionInterruptionTimes.Where(x => x.Value.IsGreater(expectedTractionInterruption, 0.1)).ToList();
var exceedingLow = tractionInterruptionTimes.Where(x => x.Value.IsSmaller(expectedTractionInterruption, 0.1)).ToList();
Console.WriteLine("number of traction interruption times exceeding specified interval: {0}", exceedingHigh.Count());
if (exceedingHigh.Count > 0) {
foreach (var e in exceedingHigh) {
Console.WriteLine("{0} : {1}", e.Key, e.Value);
}
}
if (exceedingLow.Count > 0) {
foreach (var e in exceedingLow) {
Console.WriteLine("{0} : {1}", e.Key, e.Value);
}
}
Assert.IsTrue(exceedingHigh.Count < 5);
var max2 = tractionInterruptionTimes.Values.OrderBy(x => x.Value()).Reverse().Skip(5).Max();
Assert.IsTrue(min.IsEqual(expectedTractionInterruption, 0.1), "minimum traction interruption time: {0}", min);
Assert.IsTrue(max2.IsEqual(expectedTractionInterruption, 0.1), "maximum traction interruption time: {0}", max2);
}
private Dictionary<Second, Second> ExtractTractionInterruptionTimes(ModalResults modData)
{
var retVal = new Dictionary<Second, Second>();
Second tracStart = null;
foreach (DataRow row in modData.Rows) {
var velocity = (MeterPerSecond)row[(int)ModalResultField.v_act];
if (velocity.IsEqual(0)) {
tracStart = null;
continue;
}
var gear = (uint)row[(int)ModalResultField.Gear];
var absTime = (Second)row[(int)ModalResultField.time];
var dt = (Second)row[(int)ModalResultField.simulationInterval];
if (gear == 0 && tracStart == null) {
tracStart = absTime - dt / 2.0;
}
if (gear != 0 && tracStart != null) {
var tracEnd = absTime - dt / 2.0;
retVal[absTime] =(tracEnd - tracStart);
tracStart = null;
}
}
return retVal;
}
[Category("LongRunning")]
[TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle.vecto")]
......
VectoCore/VectoCoreTest/VectoCoreTest.csproj
+ 3
− 0
View file @ afe8d312
......@@ -2820,6 +2820,9 @@
<Content Include="TestData\Jobs\Tractor_4x2_vehicle-class-5_Generic vehicle.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\XML\XMLReaderDeclaration\Tractor_4x2_vehicle-class-5_5_t_0.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_engine-input_sample.xml" />
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_engine-sample.xml" />
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_gearbox-sample.xml" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about