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

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

Merge branch 'develop' of... 

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-121-driver-strategy-allow-overspeed

Conflicts:
	VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
parents ff308a9b 313bc422
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
+ 94
− 93
View file @ a2e8d2a0
......@@ -13,10 +13,11 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
public void DisableLogging()
{
LogManager.DisableLogging();
GraphWriter.Disable();
}
[TestMethod]
public void Accelerate_20_60_level()
public void Coach_Accelerate_20_60_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_Level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_level.vmod").Run();
......@@ -26,7 +27,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_uphill_5()
public void Coach_Accelerate_20_60_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphilll_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_uphill_5.vmod").Run();
......@@ -37,7 +38,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_60_downhill_5()
public void Coach_Accelerate_20_60_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_downhill_5.vmod").Run();
......@@ -48,7 +49,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod, Ignore]
public void Accelerate_20_60_uphill_25()
public void Coach_Accelerate_20_60_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_uphill_25.vmod").Run();
......@@ -58,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_downhill_25()
public void Coach_Accelerate_20_60_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_downhill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_downhill_25.vmod").Run();
......@@ -68,7 +69,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_uphill_15()
public void Coach_Accelerate_20_60_uphill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_uphill_15.vmod").Run();
......@@ -78,7 +79,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_downhill_15()
public void Coach_Accelerate_20_60_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_downhill_15.vmod").Run();
......@@ -88,7 +89,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_level()
public void Coach_Accelerate_0_85_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_level.vmod").Run();
......@@ -98,7 +99,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_1()
public void Coach_Accelerate_0_85_uphill_1()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_1);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_uphill_1.vmod").Run();
......@@ -108,7 +109,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_2()
public void Coach_Accelerate_0_85_uphill_2()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_2);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_uphill_2.vmod").Run();
......@@ -118,7 +119,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_5()
public void Coach_Accelerate_0_85_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_uphill_5.vmod").Run();
......@@ -128,7 +129,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_downhill_5()
public void Coach_Accelerate_0_85_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_downhill_5.vmod").Run();
......@@ -138,7 +139,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_25()
public void Coach_Accelerate_0_85_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_uphill_25.vmod").Run();
......@@ -148,7 +149,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_downhill_25()
public void Coach_Accelerate_0_85_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_downhill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_downhill_25.vmod").Run();
......@@ -158,7 +159,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_10()
public void Coach_Accelerate_0_85_uphill_10()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_10);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_uphill_10.vmod").Run();
......@@ -168,7 +169,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_downhill_15()
public void Coach_Accelerate_0_85_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_downhill_15.vmod").Run();
......@@ -178,7 +179,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_stop_0_85_level()
public void Coach_Accelerate_stop_0_85_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_stop_0_85_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_stop_0_85_level.vmod").Run();
......@@ -189,7 +190,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_22_uphill_5()
public void Coach_Accelerate_20_22_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_22_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_22_uphill_5.vmod").Run();
......@@ -203,7 +204,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Decelerate
[TestMethod]
public void Decelerate_22_20_downhill_5()
public void Coach_Decelerate_22_20_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_22_20_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_22_20_downhill_5.vmod").Run();
......@@ -213,7 +214,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_level()
public void Coach_Decelerate_60_20_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_60_20_level.vmod").Run();
......@@ -223,37 +224,37 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_45_0_level()
public void Coach_Decelerate_45_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_45_0_level.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_level.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_level.vmod");
GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_level.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_level.vmod");
}
[TestMethod]
public void Decelerate_45_0_uphill_5()
public void Coach_Decelerate_45_0_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_45_0_uphill_5.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_uphill_5.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod");
GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_uphill_5.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod");
}
[TestMethod]
public void Decelerate_45_0_downhill_5()
public void Coach_Decelerate_45_0_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_45_0_downhill_5.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod");
GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod");
}
[TestMethod]
public void Decelerate_60_20_uphill_5()
public void Coach_Decelerate_60_20_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_60_20_uphill_5.vmod").Run();
......@@ -263,7 +264,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_downhill_5()
public void Coach_Decelerate_60_20_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_60_20_downhill_5.vmod").Run();
......@@ -283,7 +284,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_downhill_25()
public void Coach_Decelerate_60_20_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_60_20_downhill_25.vmod").Run();
......@@ -303,7 +304,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_downhill_15()
public void Coach_Decelerate_60_20_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
......@@ -318,7 +319,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_level()
public void Coach_Decelerate_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_level.vmod").Run();
......@@ -328,7 +329,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_uphill_5()
public void Coach_Decelerate_80_0_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_uphill_5.vmod").Run();
......@@ -338,7 +339,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_downhill_5()
public void Coach_Decelerate_80_0_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_downhill_5.vmod").Run();
......@@ -358,7 +359,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_downhill_25()
public void Coach_Decelerate_80_0_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_downhill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_downhill_25.vmod").Run();
......@@ -378,7 +379,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_downhill_15()
public void Coach_Decelerate_80_0_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_downhill_15.vmod").Run();
......@@ -392,7 +393,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Drive
[TestMethod]
public void Drive_80_level()
public void Coach_Drive_80_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_level.vmod").Run();
......@@ -402,7 +403,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_uphill_5()
public void Coach_Drive_80_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_uphill_5.vmod").Run();
......@@ -412,7 +413,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_downhill_5()
public void Coach_Drive_80_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_downhill_5.vmod").Run();
......@@ -422,7 +423,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_20_downhill_15()
public void Coach_Drive_20_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_20_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_20_downhill_15.vmod").Run();
......@@ -432,7 +433,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_30_downhill_15()
public void Coach_Drive_30_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_downhill_15.vmod").Run();
......@@ -442,7 +443,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_50_downhill_15()
public void Coach_Drive_50_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_downhill_15.vmod").Run();
......@@ -452,7 +453,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod, Ignore]
public void Drive_80_uphill_25()
public void Coach_Drive_80_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_uphill_25.vmod").Run();
......@@ -462,7 +463,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_downhill_15()
public void Coach_Drive_80_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_downhill_15.vmod").Run();
......@@ -472,7 +473,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_uphill_15()
public void Coach_Drive_80_uphill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_uphill_15.vmod").Run();
......@@ -482,41 +483,41 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_level()
public void Coach_Drive_10_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_level.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_10_level.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_level.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_10_level.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_level.vmod");
}
[TestMethod]
public void Drive_10_uphill_5()
public void Coach_Drive_10_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
" 0, 10, 5, 0",
"1000, 10, 5, 0",
"800, 10, 5, 0",
});
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_uphill_5.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_10_uphill_5.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_uphill_5.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_10_uphill_5.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_uphill_5.vmod");
}
[TestMethod]
public void Drive_10_downhill_5()
public void Coach_Drive_10_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_downhill_5.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_10_downhill_5.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_downhill_5.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_10_downhill_5.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_downhill_5.vmod");
}
[TestMethod]
public void Drive_10_downhill_25()
public void Coach_Drive_10_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_downhill_25.vmod").Run();
......@@ -526,7 +527,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_uphill_25()
public void Coach_Drive_10_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_uphill_25.vmod").Run();
......@@ -536,7 +537,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_downhill_15()
public void Coach_Drive_10_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_downhill_15.vmod").Run();
......@@ -546,7 +547,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_uphill_15()
public void Coach_Drive_10_uphill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_uphill_15.vmod").Run();
......@@ -560,94 +561,94 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Slope
[TestMethod]
public void Drive_80_Increasing_Slope()
public void Coach_Drive_80_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_inc.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_inc.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_inc.vmod");
}
[TestMethod]
public void Drive_50_Increasing_Slope()
public void Coach_Drive_50_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_inc.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_inc.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_inc.vmod");
}
[TestMethod]
public void Drive_30_Increasing_Slope()
public void Coach_Drive_30_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_inc.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_inc.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_inc.vmod");
}
[TestMethod]
public void Drive_80_Decreasing_Slope()
public void Coach_Drive_80_Decreasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_dec.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec.vmod");
}
[TestMethod]
public void Drive_50_Decreasing_Slope()
public void Coach_Drive_50_Decreasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_dec.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec.vmod");
}
[TestMethod]
public void Drive_30_Decreasing_Slope()
public void Coach_Drive_30_Decreasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_dec.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec.vmod");
}
[TestMethod]
public void Drive_80_Dec_Increasing_Slope()
public void Coach_Drive_80_Dec_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec-inc.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec-inc.vmod");
}
[TestMethod]
public void Drive_50_Dec_Increasing_Slope()
public void Coach_Drive_50_Dec_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec-inc.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec-inc.vmod");
}
[TestMethod]
public void Drive_30_Dec_Increasing_Slope()
public void Coach_Drive_30_Dec_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod").Run();
//GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec-inc.vmod");
GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec-inc.vmod");
}
#endregion
......@@ -655,7 +656,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Misc
[TestMethod]
public void DecelerateWhileBrake_80_0_level()
public void Coach_DecelerateWhileBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod").Run();
......@@ -665,7 +666,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void AccelerateWhileBrake_80_0_level()
public void Coach_AccelerateWhileBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod").Run();
......@@ -675,7 +676,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void AccelerateAtBrake_80_0_level()
public void Coach_AccelerateAtBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_AccelerateAtBrake_80_0_level.vmod").Run();
......@@ -685,7 +686,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void AccelerateBeforeBrake_80_0_level()
public void Coach_AccelerateBeforeBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod").Run();
......@@ -695,7 +696,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_stop_85_stop_85_level()
public void Coach_Drive_stop_85_stop_85_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_stop_85_stop_85_level.vmod").Run();
......
VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
+ 92
− 91
View file @ a2e8d2a0
......@@ -13,10 +13,11 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
public void DisableLogging()
{
//LogManager.DisableLogging();
GraphWriter.Disable();
}
[TestMethod]
public void Accelerate_20_60_level()
public void Truck_Accelerate_20_60_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_Level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_level.vmod").Run();
......@@ -26,7 +27,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_uphill_5()
public void Truck_Accelerate_20_60_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphilll_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_uphill_5.vmod").Run();
......@@ -37,7 +38,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_60_downhill_5()
public void Truck_Accelerate_20_60_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_downhill_5.vmod").Run();
......@@ -48,7 +49,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod, Ignore]
public void Accelerate_20_60_uphill_25()
public void Truck_Accelerate_20_60_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_uphill_25.vmod").Run();
......@@ -58,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_downhill_25()
public void Truck_Accelerate_20_60_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_downhill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_downhill_25.vmod").Run();
......@@ -68,7 +69,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_uphill_15()
public void Truck_Accelerate_20_60_uphill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_uphill_15.vmod").Run();
......@@ -78,7 +79,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_20_60_downhill_15()
public void Truck_Accelerate_20_60_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_downhill_15.vmod").Run();
......@@ -88,7 +89,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_level()
public void Truck_Accelerate_0_85_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_level.vmod").Run();
......@@ -98,7 +99,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_1()
public void Truck_Accelerate_0_85_uphill_1()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_1);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_uphill_1.vmod").Run();
......@@ -108,7 +109,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_2()
public void Truck_Accelerate_0_85_uphill_2()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_2);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_uphill_2.vmod").Run();
......@@ -118,7 +119,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_5()
public void Truck_Accelerate_0_85_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_uphill_5.vmod").Run();
......@@ -128,7 +129,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_downhill_5()
public void Truck_Accelerate_0_85_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_downhill_5.vmod").Run();
......@@ -138,7 +139,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_25()
public void Truck_Accelerate_0_85_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_uphill_25.vmod").Run();
......@@ -148,7 +149,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_downhill_25()
public void Truck_Accelerate_0_85_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_downhill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_downhill_25.vmod").Run();
......@@ -158,7 +159,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_uphill_10()
public void Truck_Accelerate_0_85_uphill_10()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_uphill_10);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_uphill_10.vmod").Run();
......@@ -168,7 +169,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_0_85_downhill_15()
public void Truck_Accelerate_0_85_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_downhill_15.vmod").Run();
......@@ -178,7 +179,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Accelerate_stop_0_85_level()
public void Truck_Accelerate_stop_0_85_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_stop_0_85_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_stop_0_85_level.vmod").Run();
......@@ -189,7 +190,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_22_uphill_5()
public void Truck_Accelerate_20_22_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_22_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_22_uphill_5.vmod").Run();
......@@ -203,7 +204,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Decelerate
[TestMethod]
public void Decelerate_22_20_downhill_5()
public void Truck_Decelerate_22_20_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_22_20_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_22_20_downhill_5.vmod").Run();
......@@ -213,7 +214,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_level()
public void Truck_Decelerate_60_20_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_60_20_level.vmod").Run();
......@@ -223,17 +224,17 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_45_0_level()
public void Truck_Decelerate_45_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_45_0_level.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_level.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod");
GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_level.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod");
}
[TestMethod]
public void Decelerate_45_0_uphill_5()
public void Truck_Decelerate_45_0_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_45_0_uphill_5.vmod").Run();
......@@ -243,17 +244,17 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_45_0_downhill_5()
public void Truck_Decelerate_45_0_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_45_0_downhill_5.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod");
GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod");
}
[TestMethod]
public void Decelerate_60_20_uphill_5()
public void Truck_Decelerate_60_20_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_60_20_uphill_5.vmod").Run();
......@@ -263,7 +264,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_downhill_5()
public void Truck_Decelerate_60_20_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_60_20_downhill_5.vmod").Run();
......@@ -283,7 +284,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_downhill_25()
public void Truck_Decelerate_60_20_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_60_20_downhill_25.vmod").Run();
......@@ -303,7 +304,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_60_20_downhill_15()
public void Truck_Decelerate_60_20_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
......@@ -318,7 +319,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_level()
public void Truck_Decelerate_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_level.vmod").Run();
......@@ -328,7 +329,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_uphill_5()
public void Truck_Decelerate_80_0_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_uphill_5.vmod").Run();
......@@ -338,7 +339,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_downhill_5()
public void Truck_Decelerate_80_0_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_downhill_5.vmod").Run();
......@@ -358,7 +359,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_downhill_25()
public void Truck_Decelerate_80_0_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_downhill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_downhill_25.vmod").Run();
......@@ -378,7 +379,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Decelerate_80_0_downhill_15()
public void Truck_Decelerate_80_0_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_downhill_15.vmod").Run();
......@@ -392,7 +393,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Drive
[TestMethod]
public void Drive_80_level()
public void Truck_Drive_80_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_level.vmod").Run();
......@@ -402,7 +403,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_uphill_5()
public void Truck_Drive_80_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_uphill_5.vmod").Run();
......@@ -412,7 +413,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_downhill_5()
public void Truck_Drive_80_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_downhill_5.vmod").Run();
......@@ -422,7 +423,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_20_downhill_15()
public void Truck_Drive_20_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_20_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_20_downhill_15.vmod").Run();
......@@ -432,7 +433,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_30_downhill_15()
public void Truck_Drive_30_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_downhill_15.vmod").Run();
......@@ -442,7 +443,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_50_downhill_15()
public void Truck_Drive_50_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_downhill_15.vmod").Run();
......@@ -452,7 +453,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod, Ignore]
public void Drive_80_uphill_25()
public void Truck_Drive_80_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_uphill_25.vmod").Run();
......@@ -462,7 +463,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_downhill_15()
public void Truck_Drive_80_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_downhill_15.vmod").Run();
......@@ -472,7 +473,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_80_uphill_15()
public void Truck_Drive_80_uphill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_uphill_15.vmod").Run();
......@@ -482,41 +483,41 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_level()
public void Truck_Drive_10_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_level.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_10_level.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_10_level.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod");
}
[TestMethod]
public void Drive_10_uphill_5()
public void Truck_Drive_10_uphill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
" 0, 10, 5, 0",
"1000, 10, 5, 0",
"500, 10, 5, 0",
});
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_uphill_5.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_10_uphill_5.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_10_uphill_5.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod");
}
[TestMethod]
public void Drive_10_downhill_5()
public void Truck_Drive_10_downhill_5()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_downhill_5.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_10_downhill_5.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_10_downhill_5.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod");
}
[TestMethod]
public void Drive_10_downhill_25()
public void Truck_Drive_10_downhill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_downhill_25.vmod").Run();
......@@ -526,7 +527,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_uphill_25()
public void Truck_Drive_10_uphill_25()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_uphill_25.vmod").Run();
......@@ -536,7 +537,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_downhill_15()
public void Truck_Drive_10_downhill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_downhill_15.vmod").Run();
......@@ -546,7 +547,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_10_uphill_15()
public void Truck_Drive_10_uphill_15()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_uphill_15.vmod").Run();
......@@ -560,94 +561,94 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Slope
[TestMethod]
public void Drive_80_Increasing_Slope()
public void Truck_Drive_80_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_inc.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_inc.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_inc.vmod");
}
[TestMethod]
public void Drive_50_Increasing_Slope()
public void Truck_Drive_50_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_inc.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_inc.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_inc.vmod");
}
[TestMethod]
public void Drive_30_Increasing_Slope()
public void Truck_Drive_30_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_inc.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_inc.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_inc.vmod");
}
[TestMethod]
public void Drive_80_Decreasing_Slope()
public void Truck_Drive_80_Decreasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_dec.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec.vmod");
}
[TestMethod]
public void Drive_50_Decreasing_Slope()
public void Truck_Drive_50_Decreasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_dec.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec.vmod");
}
[TestMethod]
public void Drive_30_Decreasing_Slope()
public void Truck_Drive_30_Decreasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_dec.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec.vmod");
}
[TestMethod]
public void Drive_80_Dec_Increasing_Slope()
public void Truck_Drive_80_Dec_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec-inc.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec-inc.vmod");
}
[TestMethod]
public void Drive_50_Dec_Increasing_Slope()
public void Truck_Drive_50_Dec_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec-inc.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec-inc.vmod");
}
[TestMethod]
public void Drive_30_Dec_Increasing_Slope()
public void Truck_Drive_30_Dec_Increasing_Slope()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod").Run();
//GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod",
// @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec-inc.vmod");
GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod",
@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec-inc.vmod");
}
#endregion
......@@ -655,7 +656,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
#region Misc
[TestMethod]
public void DecelerateWhileBrake_80_0_level()
public void Truck_DecelerateWhileBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod").Run();
......@@ -665,7 +666,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void AccelerateWhileBrake_80_0_level()
public void Truck_AccelerateWhileBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod").Run();
......@@ -675,7 +676,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void AccelerateAtBrake_80_0_level()
public void Truck_AccelerateAtBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_AccelerateAtBrake_80_0_level.vmod").Run();
......@@ -685,7 +686,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void AccelerateBeforeBrake_80_0_level()
public void Truck_AccelerateBeforeBrake_80_0_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod").Run();
......@@ -695,7 +696,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
}
[TestMethod]
public void Drive_stop_85_stop_85_level()
public void Truck_Drive_stop_85_stop_85_level()
{
var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_stop_85_stop_85_level.vmod").Run();
......
VectoCoreTest/Integration/SimpleDrivingCycles.cs
+ 3
− 3
View file @ a2e8d2a0
......@@ -310,13 +310,13 @@ namespace TUGraz.VectoCore.Tests.Integration
public static readonly string[] CycleDrive_10_level = {
// <s>,<v>,<grad>,<stop>
" 0, 10, 0, 0",
"1000, 10, 0, 0",
"500, 10, 0, 0",
};
public static readonly string[] CycleDrive_10_uphill_5 = {
// <s>,<v>,<grad>,<stop>
" 0, 10, -5, 0",
" 1000, 10, -5, 0",
" 800, 10, -5, 0",
};
public static readonly string[] CycleDrive_10_downhill_25 = {
......@@ -328,7 +328,7 @@ namespace TUGraz.VectoCore.Tests.Integration
public static readonly string[] CycleDrive_10_uphill_25 = {
// <s>,<v>,<grad>,<stop>
" 0, 10, 25, 0",
" 500, 10, 25, 0",
" 800, 10, 25, 0",
};
public static readonly string[] CycleDrive_10_downhill_15 = {
......
VectoCoreTest/Utils/GraphWriter.cs
+ 81
− 0
View file @ a2e8d2a0
......@@ -7,6 +7,8 @@ using System.Drawing;
using System.Drawing.Text;
using System.Linq;
using System.Net;
using System.Text.RegularExpressions;
using NLog;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Utils;
......@@ -14,9 +16,84 @@ namespace TUGraz.VectoCore.Tests.Utils
{
public static class GraphWriter
{
private static bool _enabled = true;
public static void Enabled()
{
_enabled = true;
}
public static void Disable()
{
_enabled = false;
}
public static void Write(string fileName)
{
if (!_enabled) {
return;
}
var modDataV3 = VectoCSVFile.Read(fileName);
var xfields = new[] { ModalResultField.time, ModalResultField.dist };
var yfields = new[] {
ModalResultField.v_act, ModalResultField.n, ModalResultField.Gear, ModalResultField.Pe_eng, ModalResultField.Tq_eng,
ModalResultField.FCMap
};
var images = new List<Stream>();
try {
foreach (var xfield in xfields) {
var x = modDataV3.Rows.Cast<DataRow>().Select(v => v.Field<string>(xfield.GetName())).ToArray();
for (var i = 1; i <= yfields.Length; i++) {
var yfield = yfields[i - 1];
var y = modDataV3.Rows.Cast<DataRow>().Select(v => v.Field<string>(yfield.GetName())).ToArray();
var values = string.Format("{0}|{1}", string.Join(",", x), string.Join(",", y));
if (yfield == ModalResultField.v_act) {
var y3 =
modDataV3.Rows.Cast<DataRow>()
.Select(v => v.Field<string>(ModalResultField.v_targ.GetName()))
.Select(v => string.IsNullOrWhiteSpace(v) ? "0" : v);
values += string.Format("|{0}|{1}", string.Join(",", x), string.Join(",", y3));
}
values = values.Replace("NaN", "0");
if (values.Length > 14000) {
// remove all decimal places to reduce request size
values = Regex.Replace(values, @"\..*?,", ",");
}
var maxX = (int)Math.Ceiling(x.ToDouble().Max());
images.Add(CreateGraphStream(xfield.GetCaption(), yfield.GetCaption(), maxX, values));
}
var outfileName = string.Format("{0}_{1}.png", Path.GetFileNameWithoutExtension(fileName), xfield.GetName());
SaveImages(outfileName, images.ToArray());
images.Clear();
}
} finally {
images.ForEach(x => x.Close());
}
}
public static void Write(string fileNameV3, string fileNameV22)
{
if (!_enabled) {
return;
}
var modDataV3 = VectoCSVFile.Read(fileNameV3);
if (!File.Exists(fileNameV22)) {
LogManager.GetCurrentClassLogger().Error("Modfile V2.2 not found: " + fileNameV22);
Write(fileNameV3);
return;
}
var modDataV22 = VectoCSVFile.Read(fileNameV22);
var xfields = new[] { ModalResultField.time, ModalResultField.dist };
......@@ -50,6 +127,10 @@ namespace TUGraz.VectoCore.Tests.Utils
}
values = values.Replace("NaN", "0");
if (values.Length > 14000) {
// remove all decimal places to reduce request size
values = Regex.Replace(values, @"\..*?,", ",");
}
var maxX = (int)Math.Ceiling(Math.Max(x.ToDouble().Max(), x2.ToDouble().Max()));
images.Add(CreateGraphStream(xfield.GetCaption(), yfield.GetCaption(), maxX, values));
}
......
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