diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
index 5afe4bac96f264b051fa113f371311a6bed0868a..6a0a18a778148722ada00fa18a9716e42a26be89 100644
--- a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
+++ b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
@@ -35,7 +35,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
public void TestGraph()
{
var imgV3 = @"TestData\Results\Integration\Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod";
- var imgv22 = @"TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod";
+ var imgv22 = @"TestData\Results\Integration\24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod";
GraphWriter.Write(imgV3, imgv22);
}
diff --git a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
index 256dbadcd005884e354107e33e22c799d620424e..c67cb6b7a50f261e4a861f29cba3db0ff9bf902d 100644
--- a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
+++ b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
@@ -153,9 +153,7 @@ namespace TUGraz.VectoCore.Tests.Integration
jobContainer.Execute();
jobContainer.WaitFinished();
- foreach (var run in jobContainer.Runs) {
- Assert.IsTrue(run.Run.FinishedWithoutErrors);
- }
+ Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Join("", jobContainer.Runs.Select(r => r.ExecException)));
}
[TestMethod, Ignore]
diff --git a/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs b/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
index 6add04a37cd6abc72c5c2a1b4a2d508298ea0c6d..8a57981ddd50348ee45f4ede4f56fe32064f5afb 100644
--- a/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
+++ b/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
@@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
{
AssertHelper.Exception<VectoException>(
() => EngineFullLoadCurve.ReadFromFile(@"TestData\Components\FullLoadCurve insufficient columns.vfld"),
- "ERROR while reading FullLoadCurve File: FullLoadCurve Data File must consist of at least 3 columns.");
+ "ERROR while reading FullLoadCurve File: Engine FullLoadCurve Data File must consist of at least 3 columns.");
}
/// <summary>
diff --git a/VectoCoreTest/TestData/Results/Integration/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod b/VectoCoreTest/TestData/Results/Integration/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod
new file mode 100644
index 0000000000000000000000000000000000000000..1305900eeae4f7e874daebe064d852179fb068f6
--- /dev/null
+++ b/VectoCoreTest/TestData/Results/Integration/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod
@@ -0,0 +1,82 @@
+time [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s²],grad [%],n [1/min],Tq_eng [Nm],Tq_clutch [Nm],Tq_full [Nm],Tq_drag [Nm],Pe_eng [kW],Pe_full [kW],Pe_drag [kW],Pe_clutch [kW],Pa Eng [kW],Paux [kW],Gear [-],Ploss GB [kW],Ploss Diff [kW],Ploss Retarder [kW],Pa GB [kW],Pa Veh [kW],Proll [kW],Pair [kW],Pgrad [kW],Pwheel [kW],Pbrake [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+1.5,13.8888893127441,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+2.5,27.7777786254883,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+3.5,41.6666679382324,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+4.5,55.5555572509766,50.0000015258789,50.0000015258789,0,-0.25,628.1187,309.5353,309.5353,1353.562,-148.1406,20.36013,89.03249,-9.744161,20.36013,0,0,8,0.9490871,4.111027,0,0,0,16.57838,5.19349,-6.471855,15.30002,0,4660.499,-,-
+5.5,69.4444465637207,50.0000015258789,50.0000015258789,0,-0.25,628.1187,309.5353,309.5353,1353.562,-148.1406,20.36013,89.03249,-9.744161,20.36013,0,0,8,0.9490871,4.111027,0,0,0,16.57838,5.19349,-6.471855,15.30002,0,4660.499,-,-
+6.5,83.3333358764648,50.0000015258789,50.0000015258789,0,-0.25,628.1187,309.5353,309.5353,1353.562,-148.1406,20.36013,89.03249,-9.744161,20.36013,0,0,8,0.9490871,4.111027,0,0,0,16.57838,5.19349,-6.471855,15.30002,0,4660.499,-,-
+7.5,97.222225189209,50.0000015258789,50.0000015258789,0,-0.25,628.1187,309.5353,309.5353,1353.562,-148.1406,20.36013,89.03249,-9.744161,20.36013,0,0,8,0.9490871,4.111027,0,0,0,16.57838,5.19349,-6.471855,15.30002,0,4660.499,-,-
+8.5,111.111114501953,50.0000015258789,50.0000015258789,0,-0.5,628.1187,209.1351,209.1351,1353.562,-148.1406,13.75616,89.03249,-9.744161,13.75616,0,0,8,0.817008,4.111027,0,0,0,16.57823,5.19349,-12.94359,8.828129,0,3586.217,-,-
+9.5,125.000003814697,50.0000015258789,50.0000015258789,0,-0.5,628.1187,209.1351,209.1351,1353.562,-148.1406,13.75616,89.03249,-9.744161,13.75616,0,0,8,0.817008,4.111027,0,0,0,16.57823,5.19349,-12.94359,8.828129,0,3586.217,-,-
+10.5,138.888893127441,50.0000015258789,50.0000015258789,0,-0.5,628.1187,209.1351,209.1351,1353.562,-148.1406,13.75616,89.03249,-9.744161,13.75616,0,0,8,0.817008,4.111027,0,0,0,16.57823,5.19349,-12.94359,8.828129,0,3586.217,-,-
+11.5,152.777782440186,50.0000015258789,50.0000015258789,0,-0.75,628.1187,108.7371,108.7371,1353.562,-148.1406,7.152338,89.03249,-9.744161,7.152338,0,0,8,0.6849316,4.111028,0,0,0,16.57797,5.19349,-19.41508,2.356379,0,2550.508,-,-
+12.5,166.66667175293,50.0000015258789,50.0000015258789,0,-0.75,628.1187,108.7371,108.7371,1353.562,-148.1406,7.152338,89.03249,-9.744161,7.152338,0,0,8,0.6849316,4.111028,0,0,0,16.57797,5.19349,-19.41508,2.356379,0,2550.508,-,-
+13.5,180.555561065674,50.0000015258789,50.0000015258789,0,-0.75,628.1187,108.7371,108.7371,1353.562,-148.1406,7.152338,89.03249,-9.744161,7.152338,0,0,8,0.6849316,4.111028,0,0,0,16.57797,5.19349,-19.41508,2.356379,0,2550.508,-,-
+14.5,194.444450378418,50.0000015258789,50.0000015258789,0,-0.75,628.1187,108.7371,108.7371,1353.562,-148.1406,7.152338,89.03249,-9.744161,7.152338,0,0,8,0.6849316,4.111028,0,0,0,16.57797,5.19349,-19.41508,2.356379,0,2550.508,-,-
+15.5,208.333339691162,50.0000015258789,50.0000015258789,0,-1,628.1187,9.580408,9.580408,1353.562,-148.1406,0.6301651,89.03249,-9.744161,0.6301651,0,0,8,0.6342478,4.111028,0,0,0,16.57761,5.19349,-25.88621,-4.11511,0,1609.015,-,-
+16.5,222.222229003906,50.0000015258789,50.0000015258789,0,-1,628.1187,9.580408,9.580408,1353.562,-148.1406,0.6301651,89.03249,-9.744161,0.6301651,0,0,8,0.6342478,4.111028,0,0,0,16.57761,5.19349,-25.88621,-4.11511,0,1609.015,-,-
+17.5,236.11111831665,50.0000015258789,50.0000015258789,0,-1,628.1187,9.580408,9.580408,1353.562,-148.1406,0.6301651,89.03249,-9.744161,0.6301651,0,0,8,0.6342478,4.111028,0,0,0,16.57761,5.19349,-25.88621,-4.11511,0,1609.015,-,-
+18.5,250.000007629395,50.0000015258789,50.0000015258789,0,-1.25,628.1187,-87.8259,-87.8259,1353.562,-148.1406,-5.776875,89.03249,-9.744161,-5.776875,0,0,8,0.6983179,4.111028,0,0,0,16.57714,5.19349,-32.35685,-10.58622,0,652.2521,-,-
+19.5,263.888896942139,50.0000015258789,50.0000015258789,0,-1.25,628.1187,-87.8259,-87.8259,1353.562,-148.1406,-5.776875,89.03249,-9.744161,-5.776875,0,0,8,0.6983179,4.111028,0,0,0,16.57714,5.19349,-32.35685,-10.58622,0,652.2521,-,-
+20.5,277.777786254883,50.0000015258789,50.0000015258789,0,-1.25,628.1187,-87.8259,-87.8259,1353.562,-148.1406,-5.776875,89.03249,-9.744161,-5.776875,0,0,8,0.6983179,4.111028,0,0,0,16.57714,5.19349,-32.35685,-10.58622,0,652.2521,-,-
+21.5,291.666675567627,50.0000015258789,50.0000015258789,0,-1.25,628.1187,-87.8259,-87.8259,1353.562,-148.1406,-5.776875,89.03249,-9.744161,-5.776875,0,0,8,0.6983179,4.111028,0,0,0,16.57714,5.19349,-32.35685,-10.58622,0,652.2521,-,-
+22.5,305.555564880371,50.0000015258789,50.0000015258789,0,-1.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57657,5.19349,-38.82689,-17.05682,-2.463644,0,-,-
+23.5,319.444454193115,50.0000015258789,50.0000015258789,0,-1.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57657,5.19349,-38.82689,-17.05682,-2.463644,0,-,-
+24.5,333.333343505859,50.0000015258789,50.0000015258789,0,-1.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57657,5.19349,-38.82689,-17.05682,-2.463644,0,-,-
+25.5,347.222232818604,50.0000015258789,50.0000015258789,0,-1.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57657,5.19349,-38.82689,-17.05682,-2.463644,0,-,-
+26.5,361.111122131348,50.0000015258789,50.0000015258789,0,-1.75,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.5759,5.19349,-45.29619,-23.52681,-8.933626,0,-,-
+27.5,375.000011444092,50.0000015258789,50.0000015258789,0,-1.75,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.5759,5.19349,-45.29619,-23.52681,-8.933626,0,-,-
+28.5,388.888900756836,50.0000015258789,50.0000015258789,0,-1.75,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.5759,5.19349,-45.29619,-23.52681,-8.933626,0,-,-
+29.5,402.77779006958,50.0000015258789,50.0000015258789,0,-2,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57512,5.19349,-51.76465,-29.99604,-15.40286,0,-,-
+30.5,416.666679382324,50.0000015258789,50.0000015258789,0,-2,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57512,5.19349,-51.76465,-29.99604,-15.40286,0,-,-
+31.5,430.555568695068,50.0000015258789,50.0000015258789,0,-2,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57512,5.19349,-51.76465,-29.99604,-15.40286,0,-,-
+32.5,444.444458007813,50.0000015258789,50.0000015258789,0,-2,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57512,5.19349,-51.76465,-29.99604,-15.40286,0,-,-
+33.5,458.333347320557,50.0000015258789,50.0000015258789,0,-2.25,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57424,5.19349,-58.23214,-36.46441,-21.87123,0,-,-
+34.5,472.222236633301,50.0000015258789,50.0000015258789,0,-2.25,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57424,5.19349,-58.23214,-36.46441,-21.87123,0,-,-
+35.5,486.111125946045,50.0000015258789,50.0000015258789,0,-2.25,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57424,5.19349,-58.23214,-36.46441,-21.87123,0,-,-
+36.5,500.000015258789,50.0000015258789,50.0000015258789,0,-2.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57326,5.19349,-64.69854,-42.93179,-28.33861,0,-,-
+37.5,513.888904571533,50.0000015258789,50.0000015258789,0,-2.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57326,5.19349,-64.69854,-42.93179,-28.33861,0,-,-
+38.5,527.777793884277,50.0000015258789,50.0000015258789,0,-2.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57326,5.19349,-64.69854,-42.93179,-28.33861,0,-,-
+39.5,541.666683197021,50.0000015258789,50.0000015258789,0,-2.5,628.1187,-148.1406,-148.1406,1353.562,-148.1406,-9.744161,89.03249,-9.744161,-9.744161,0,0,8,0.737991,4.111027,0,0,0,16.57326,5.19349,-64.69854,-42.93179,-28.33861,0,-,-
+40.5,555.555572509766,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+41.5,569.44446182251,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+42.5,583.333351135254,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+43.5,597.222240447998,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+44.5,611.111129760742,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+45.5,625.000019073486,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+46.5,638.88890838623,50.0000015258789,50.0000015258789,0,0,628.1187,409.9358,409.9358,1353.562,-148.1406,26.96412,89.03249,-9.744161,26.96412,0,0,8,1.081167,4.111027,0,0,0,16.57843,5.19349,0,21.77192,0,5841.438,-,-
+47.5,652.777797698975,50.0000015258789,50.0000015258789,0,0.25,628.1187,510.3347,510.3347,1353.562,-148.1406,33.568,89.03249,-9.744161,33.568,0,0,8,1.213244,4.111026,0,0,0,16.57838,5.19349,6.471855,28.24373,0,7148.13,-,-
+48.5,666.666687011719,50.0000015258789,50.0000015258789,0,0.25,628.1187,510.3347,510.3347,1353.562,-148.1406,33.568,89.03249,-9.744161,33.568,0,0,8,1.213244,4.111026,0,0,0,16.57838,5.19349,6.471855,28.24373,0,7148.13,-,-
+49.5,680.555576324463,50.0000015258789,50.0000015258789,0,0.25,628.1187,510.3347,510.3347,1353.562,-148.1406,33.568,89.03249,-9.744161,33.568,0,0,8,1.213244,4.111026,0,0,0,16.57838,5.19349,6.471855,28.24373,0,7148.13,-,-
+50.5,694.444465637207,50.0000015258789,50.0000015258789,0,0.25,628.1187,510.3347,510.3347,1353.562,-148.1406,33.568,89.03249,-9.744161,33.568,0,0,8,1.213244,4.111026,0,0,0,16.57838,5.19349,6.471855,28.24373,0,7148.13,-,-
+51.5,708.333354949951,50.0000015258789,50.0000015258789,0,0.5,628.1187,610.7301,610.7301,1353.562,-148.1406,40.17165,89.03249,-9.744161,40.17165,0,0,8,1.345319,4.111026,0,0,0,16.57823,5.19349,12.94359,34.71531,0,8478.916,-,-
+52.5,722.222244262695,50.0000015258789,50.0000015258789,0,0.5,628.1187,610.7301,610.7301,1353.562,-148.1406,40.17165,89.03249,-9.744161,40.17165,0,0,8,1.345319,4.111026,0,0,0,16.57823,5.19349,12.94359,34.71531,0,8478.916,-,-
+53.5,736.111133575439,50.0000015258789,50.0000015258789,0,0.5,628.1187,610.7301,610.7301,1353.562,-148.1406,40.17165,89.03249,-9.744161,40.17165,0,0,8,1.345319,4.111026,0,0,0,16.57823,5.19349,12.94359,34.71531,0,8478.916,-,-
+54.5,750.000022888184,50.0000015258789,50.0000015258789,0,0.75,628.1187,711.5981,711.5981,1353.562,-148.1406,46.80639,89.03249,-9.744161,46.80639,0,0,8,1.478012,4.141843,0,0,0,16.57797,5.19349,19.41508,41.18654,0,9443.719,-,-
+55.5,763.888912200928,50.0000015258789,50.0000015258789,0,0.75,628.1187,711.5981,711.5981,1353.562,-148.1406,46.80639,89.03249,-9.744161,46.80639,0,0,8,1.478012,4.141843,0,0,0,16.57797,5.19349,19.41508,41.18654,0,9443.719,-,-
+56.5,777.777801513672,50.0000015258789,50.0000015258789,0,0.75,628.1187,711.5981,711.5981,1353.562,-148.1406,46.80639,89.03249,-9.744161,46.80639,0,0,8,1.478012,4.141843,0,0,0,16.57797,5.19349,19.41508,41.18654,0,9443.719,-,-
+57.5,791.666690826416,50.0000015258789,50.0000015258789,0,0.75,628.1187,711.5981,711.5981,1353.562,-148.1406,46.80639,89.03249,-9.744161,46.80639,0,0,8,1.478012,4.141843,0,0,0,16.57797,5.19349,19.41508,41.18654,0,9443.719,-,-
+58.5,805.55558013916,50.0000015258789,50.0000015258789,0,1,628.1187,813.5096,813.5096,1353.562,-148.1406,53.50977,89.03249,-9.744161,53.50977,0,0,8,1.61208,4.240383,0,0,0,16.57761,5.19349,25.88621,47.6573,0,10584.85,-,-
+59.5,819.444469451904,50.0000015258789,50.0000015258789,0,1,628.1187,813.5096,813.5096,1353.562,-148.1406,53.50977,89.03249,-9.744161,53.50977,0,0,8,1.61208,4.240383,0,0,0,16.57761,5.19349,25.88621,47.6573,0,10584.85,-,-
+60.5,833.333358764648,50.0000015258789,50.0000015258789,0,1,628.1187,813.5096,813.5096,1353.562,-148.1406,53.50977,89.03249,-9.744161,53.50977,0,0,8,1.61208,4.240383,0,0,0,16.57761,5.19349,25.88621,47.6573,0,10584.85,-,-
+61.5,847.222248077393,50.0000015258789,50.0000015258789,0,1,628.1187,813.5096,813.5096,1353.562,-148.1406,53.50977,89.03249,-9.744161,53.50977,0,0,8,1.61208,4.240383,0,0,0,16.57761,5.19349,25.88621,47.6573,0,10584.85,-,-
+62.5,861.111137390137,50.0000015258789,50.0000015258789,0,1.25,628.1187,915.4118,915.4118,1353.562,-148.1406,60.21253,89.03249,-9.744161,60.21253,0,0,8,1.746136,4.338914,0,0,0,16.57714,5.19349,32.35685,54.12748,0,11632.91,-,-
+63.5,875.000026702881,50.0000015258789,50.0000015258789,0,1.25,628.1187,915.4118,915.4118,1353.562,-148.1406,60.21253,89.03249,-9.744161,60.21253,0,0,8,1.746136,4.338914,0,0,0,16.57714,5.19349,32.35685,54.12748,0,11632.91,-,-
+64.5,888.888916015625,50.0000015258789,50.0000015258789,0,1.25,628.1187,915.4118,915.4118,1353.562,-148.1406,60.21253,89.03249,-9.744161,60.21253,0,0,8,1.746136,4.338914,0,0,0,16.57714,5.19349,32.35685,54.12748,0,11632.91,-,-
+65.5,902.665977478027,49.5974212646484,50.0000015258789,-0.2236557,1.5,628.1187,0,0,1353.562,-148.1406,0,89.03249,-9.744161,0,0,0,0,0,0,0,0,-60.02645,16.4431,5.06905,38.51426,-4.196167E-05,-4.196167E-05,1518.049,-,-
+66.5,916.44303894043,49.5974212646484,50.0000015258789,0.2236557,1.5,1106.754,1263.845,1114.649,2300,-170.1416,146.4783,266.5677,-19.71924,129.1867,17.29164,0,6,3.81923,5.314555,0,0,60.02645,16.4431,5.06905,38.51426,120.0529,0,27184.21,-,-
+67.5,930.220100402832,49.5974212646484,50.0000015258789,-0.2236557,1.5,1106.754,0,0,2300,-170.1416,0,266.5677,-19.71924,0,0,0,0,0,0,0,0,-60.02645,16.4431,5.06905,38.51426,-4.196167E-05,-4.196167E-05,3100.926,-,-
+68.5,943.954230308533,49.4428676605225,50.0000015258789,0.1377926,1.5,621.1198,1333.981,1602.628,1335.75,-148.1056,86.76684,86.88187,-9.633309,104.2405,-17.47371,0,8,2.618356,4.947673,0,0,36.8666,16.39186,5.021809,38.39425,96.67452,0,16708.57,-,-
+69.5,957.633608818054,49.2457626342773,50.0000015258789,-0.2472954,1.75,621.1198,0,0,1335.75,-148.1056,0,86.88187,-9.633309,0,0,0,0,0,0,0,0,-65.90047,16.32585,4.96199,44.61291,0.0002822876,0,1503.352,-,-
+70.5,971.355918884277,49.4003162384033,50.0000015258789,0.3331585,1.75,1102.355,1583.927,1434.312,2300,-169.7238,182.846,265.5083,-19.59264,165.5746,17.27138,0,6,4.539515,5.835921,0,0,89.06031,16.37709,5.008855,44.75292,155.1992,0,33653.75,-,-
+71.5,985.121044158936,49.5544509887695,50.0000015258789,-0.2475281,1.75,1102.355,0,0,2300,-169.7238,0,265.5083,-19.59264,0,0,0,0,0,0,0,0,-66.37595,16.42819,5.055886,44.89256,0.0006752014,0,3091.206,-,-
+72.5,998.818431854248,49.310595703125,50.0000015258789,0.112052,1.75,619.4581,1327.472,1594.382,1331.521,-148.0973,86.11244,86.37511,-9.606997,103.4268,-17.31431,0,8,2.600109,4.926584,0,0,29.89946,16.34735,4.981613,44.67164,95.90005,0,16554.71,-,-
+73.5,1012.43632888794,49.0244293212891,50.0000015258789,-0.2710323,2,619.4581,0,0,1331.521,-148.0973,0,86.37511,-9.606997,0,0,0,0,0,0,0,0,-71.90138,16.25171,4.895386,50.75465,0.0003662109,0,1499.862,-,-
+74.5,1026.12196350098,49.2682846069336,50.0000015258789,0.4065084,2,1099.409,1816.58,1667.364,2300,-169.4439,209.1426,264.7987,-19.50805,191.9634,17.17922,0,6,5.062288,6.214759,0,0,108.3779,16.33255,4.968801,51.00711,180.6863,0,38730.44,-,-
+75.5,1039.87515163422,49.5114772796631,50.0000015258789,-0.2714024,2,1099.409,0,0,2300,-169.4439,0,264.7987,-19.50805,0,0,0,0,0,0,0,0,-72.71485,16.41317,5.042744,51.25888,-4.959106E-05,-4.959106E-05,3084.694,-,-
+76.5,1053.52424430847,49.1367336273193,50.0000015258789,0.06321144,2.25,617.274,1322.761,1589.396,1325.962,-148.0864,85.50432,85.71125,-9.572419,102.7398,-17.23547,0,8,2.583779,4.904479,0,0,16.80759,16.28808,4.929105,57.22674,95.25153,0,16421.37,-,-
+77.5,1067.05759048462,48.7200462341309,50.0000015258789,-0.2947044,2.25,617.274,0,0,1325.962,-148.0864,0,85.71125,-9.572419,0,0,0,0,0,0,0,0,-77.69588,16.14995,4.804767,56.74145,0.000289917,0,1495.276,-,-
+78.5,1080.69503211975,49.0947898864746,50.0000015258789,0.5028954,2.25,1095.538,2104.283,1955.592,2300,-169.0761,241.4128,263.8662,-19.39716,224.3542,17.05851,0,6,5.703559,6.678999,0,0,133.6031,16.27418,4.916493,57.17789,211.9717,0,45450.88,-,-
+79.5,1094.43628787994,49.4685207366943,50.0000015258789,-0.2952671,2.25,1095.538,0,0,2300,-169.0761,0,263.8662,-19.39716,0,0,0,0,0,0,0,0,-79.04012,16.39806,5.02963,57.61315,0.0007286072,0,3076.138,-,-
+80.5,1108.16505241394,49.4235523223877,50.0000015258789,0.2702847,2.5,816.9436,1829.998,1959.69,1834.121,-149.9319,156.5566,156.9093,-12.82669,167.6518,-11.09515,0,7,4.139561,5.874685,0,0,72.28679,16.38218,5.015926,63.95263,157.6375,0,30312.1,-,-
+81.5,1122.04145050049,49.9550331115723,50.0000015258789,0.02498245,2.5,825.7287,1170.094,1166.619,1856.479,-150.4151,101.1781,160.53,-13.00641,100.8776,0.3005118,0,7,2.816381,4.929723,0,0,6.753329,16.55835,5.17949,64.64035,93.13152,0,19252.06,-,-
diff --git a/VectoCoreTest/VectoCoreTest.csproj b/VectoCoreTest/VectoCoreTest.csproj
index aed0bdc87a8e4697b1db5156a1474fae6355f0a5..f9713f4be74b66b83156d80c185e5d45dc050f50 100644
--- a/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCoreTest/VectoCoreTest.csproj
@@ -928,6 +928,9 @@
<None Include="TestData\Results\EngineOnlyCycles\24tCoach_EngineOnlyPaux.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Results\Integration\24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Results\Integration\Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>