From 389741a65f09252813c3efbdd7e6912a56e279ee Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 23 Sep 2015 15:46:59 +0200
Subject: [PATCH] common method for creating simple driving cycles
---
.../DriverStrategy/DriverStrategyTestCoach.cs | 151 ++++++++----------
.../DriverStrategy/DriverStrategyTestTruck.cs | 151 ++++++++----------
.../Integration/SimpleDrivingCycles.cs | 16 ++
.../GearboxPowertrainTest.cs | 19 +--
4 files changed, 153 insertions(+), 184 deletions(-)
diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
index 1bfa7edb7e..3b685cc3db 100644
--- a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
+++ b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
@@ -3,6 +3,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using NLog;
using TUGraz.VectoCore.FileIO.Reader;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Tests.Utils;
namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
{
@@ -20,14 +21,14 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_60_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_Level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_Level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_level.vmod").Run();
}
[TestMethod]
public void Accelerate_20_60_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphilll_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphilll_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_20_60_uphill_5.vmod").Run();
}
@@ -35,7 +36,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_60_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
@@ -43,98 +44,98 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod, Ignore]
public void Accelerate_20_60_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_20_60_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_20_60_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_20_60_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Accelerate_0_85_level.vmod").Run();
}
[TestMethod]
public void Accelerate_0_85_uphill_1()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_2()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_10()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_stop_0_85_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
@@ -142,7 +143,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_22_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
@@ -153,77 +154,77 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Decelerate_22_20_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_60_20_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_60_20_level.vmod").Run();
}
[TestMethod]
public void Decelerate_45_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_45_0_level.vmod").Run();
}
[TestMethod]
public void Decelerate_45_0_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_45_0_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_60_20_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_60_20_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_60_20_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_60_20_uphill_25.vmod").Run();
}
[TestMethod]
public void Decelerate_60_20_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_60_20_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_60_20_uphill_15.vmod").Run();
}
[TestMethod]
public void Decelerate_60_20_downhill_15()
{
- var cycle = CreateCycleData(new[] {
+ var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
" 0, 60, -15, 0",
" 800, 20, -15, 0",
@@ -235,49 +236,49 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Decelerate_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_level.vmod").Run();
}
[TestMethod]
public void Decelerate_80_0_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_80_0_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_80_0_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_steep_uphill_25.vmod").Run();
}
[TestMethod]
public void Decelerate_80_0_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_80_0_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_80_0_steep_uphill_15.vmod").Run();
}
[TestMethod]
public void Decelerate_80_0_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
@@ -288,77 +289,77 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_80_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_level.vmod").Run();
}
[TestMethod]
public void Drive_80_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_uphill_5.vmod").Run();
}
[TestMethod]
public void Drive_80_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_downhill_5.vmod").Run();
}
[TestMethod]
public void Drive_20_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_20_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_20_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_20_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_30_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_30_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_50_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_50_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_downhill_15.vmod").Run();
}
[TestMethod, Ignore]
public void Drive_80_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_uphill_25.vmod").Run();
}
[TestMethod]
public void Drive_80_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_80_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_uphill_15.vmod").Run();
}
[TestMethod]
public void Drive_10_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_level.vmod").Run();
}
[TestMethod]
public void Drive_10_uphill_5()
{
- var cycle = CreateCycleData(new[] {
+ var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
" 0, 10, 5, 0",
"1000, 10, 5, 0",
@@ -369,35 +370,35 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_10_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_downhill_5.vmod").Run();
}
[TestMethod]
public void Drive_10_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_downhill_25.vmod").Run();
}
[TestMethod]
public void Drive_10_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_25);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_uphill_25.vmod").Run();
}
[TestMethod]
public void Drive_10_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_10_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_15);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_uphill_15.vmod").Run();
}
@@ -408,56 +409,56 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_80_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_inc.vmod").Run();
}
[TestMethod]
public void Drive_50_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_inc.vmod").Run();
}
[TestMethod]
public void Drive_30_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_inc.vmod").Run();
}
[TestMethod]
public void Drive_80_Decreasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_dec.vmod").Run();
}
[TestMethod]
public void Drive_50_Decreasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_dec.vmod").Run();
}
[TestMethod]
public void Drive_30_Decreasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_dec.vmod").Run();
}
[TestMethod]
public void Drive_80_Dec_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
[TestMethod]
public void Drive_50_Dec_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
@@ -465,7 +466,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_30_Dec_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
@@ -476,56 +477,38 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void DecelerateWhileBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void AccelerateWhileBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void AccelerateAtBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_AccelerateAtBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void AccelerateBeforeBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level);
CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void Drive_stop_85_stop_85_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
#endregion
-
- // ===============================
-
- public DrivingCycleData CreateCycleData(string[] entries)
- {
- var cycleData = new MemoryStream();
- var writer = new StreamWriter(cycleData);
- writer.WriteLine("<s>,<v>,<grad>,<stop>");
- foreach (var entry in entries) {
- writer.WriteLine(entry);
- }
- writer.Flush();
- cycleData.Seek(0, SeekOrigin.Begin);
- return DrivingCycleDataReader.ReadFromStream(cycleData, CycleType.DistanceBased);
- }
-
-
- // =========================================
}
}
\ No newline at end of file
diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
index 226761146c..72554cda7c 100644
--- a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
+++ b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
@@ -3,6 +3,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using NLog;
using TUGraz.VectoCore.FileIO.Reader;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Tests.Utils;
namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
{
@@ -20,14 +21,14 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_60_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_Level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_Level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_level.vmod").Run();
}
[TestMethod]
public void Accelerate_20_60_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphilll_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphilll_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_20_60_uphill_5.vmod").Run();
}
@@ -35,7 +36,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_60_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
@@ -43,98 +44,98 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod, Ignore]
public void Accelerate_20_60_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_20_60_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_20_60_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_20_60_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_0_85_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Accelerate_0_85_level.vmod").Run();
}
[TestMethod]
public void Accelerate_0_85_uphill_1()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_2()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_uphill_10()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_0_85_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
[TestMethod]
public void Accelerate_stop_0_85_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
@@ -142,7 +143,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Accelerate_20_22_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerate_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();
}
@@ -153,77 +154,77 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Decelerate_22_20_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_60_20_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_60_20_level.vmod").Run();
}
[TestMethod]
public void Decelerate_45_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_45_0_level.vmod").Run();
}
[TestMethod]
public void Decelerate_45_0_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_45_0_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_60_20_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_60_20_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_60_20_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_60_20_uphill_25.vmod").Run();
}
[TestMethod]
public void Decelerate_60_20_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_60_20_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_uphill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_60_20_uphill_15.vmod").Run();
}
[TestMethod]
public void Decelerate_60_20_downhill_15()
{
- var cycle = CreateCycleData(new[] {
+ var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
" 0, 60, -15, 0",
" 800, 20, -15, 0",
@@ -235,49 +236,49 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Decelerate_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_60_20_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_level.vmod").Run();
}
[TestMethod]
public void Decelerate_80_0_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod]
public void Decelerate_80_0_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_80_0_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_steep_uphill_25.vmod").Run();
}
[TestMethod]
public void Decelerate_80_0_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
[TestMethod, Ignore]
public void Decelerate_80_0_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_80_0_uphill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_80_0_steep_uphill_15.vmod").Run();
}
[TestMethod]
public void Decelerate_80_0_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerate_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();
}
@@ -288,77 +289,77 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_80_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_level.vmod").Run();
}
[TestMethod]
public void Drive_80_uphill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_uphill_5.vmod").Run();
}
[TestMethod]
public void Drive_80_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_downhill_5.vmod").Run();
}
[TestMethod]
public void Drive_20_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_20_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_20_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_20_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_30_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_30_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_50_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_50_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_downhill_15.vmod").Run();
}
[TestMethod, Ignore]
public void Drive_80_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_uphill_25.vmod").Run();
}
[TestMethod]
public void Drive_80_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_80_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_uphill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_uphill_15.vmod").Run();
}
[TestMethod]
public void Drive_10_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_level.vmod").Run();
}
[TestMethod]
public void Drive_10_uphill_5()
{
- var cycle = CreateCycleData(new[] {
+ var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
" 0, 10, 5, 0",
"1000, 10, 5, 0",
@@ -369,35 +370,35 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_10_downhill_5()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_downhill_5.vmod").Run();
}
[TestMethod]
public void Drive_10_downhill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_downhill_25.vmod").Run();
}
[TestMethod]
public void Drive_10_uphill_25()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_25);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_25);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_uphill_25.vmod").Run();
}
[TestMethod]
public void Drive_10_downhill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_downhill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_downhill_15.vmod").Run();
}
[TestMethod]
public void Drive_10_uphill_15()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_15);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_15);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_uphill_15.vmod").Run();
}
@@ -408,56 +409,56 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_80_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_inc.vmod").Run();
}
[TestMethod]
public void Drive_50_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_inc.vmod").Run();
}
[TestMethod]
public void Drive_30_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_inc.vmod").Run();
}
[TestMethod]
public void Drive_80_Decreasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_dec.vmod").Run();
}
[TestMethod]
public void Drive_50_Decreasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_dec.vmod").Run();
}
[TestMethod]
public void Drive_30_Decreasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_dec.vmod").Run();
}
[TestMethod]
public void Drive_80_Dec_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
[TestMethod]
public void Drive_50_Dec_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
@@ -465,7 +466,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void Drive_30_Dec_Increasing_Slope()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
@@ -476,56 +477,38 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestMethod]
public void DecelerateWhileBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void AccelerateWhileBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void AccelerateAtBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_AccelerateAtBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void AccelerateBeforeBrake_80_0_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level);
+ var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level);
Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod").Run();
}
[TestMethod]
public void Drive_stop_85_stop_85_level()
{
- var cycle = CreateCycleData(SimpleDrivingCycles.CycleDrive_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();
}
#endregion
-
- // ===============================
-
- public DrivingCycleData CreateCycleData(string[] entries)
- {
- var cycleData = new MemoryStream();
- var writer = new StreamWriter(cycleData);
- writer.WriteLine("<s>,<v>,<grad>,<stop>");
- foreach (var entry in entries) {
- writer.WriteLine(entry);
- }
- writer.Flush();
- cycleData.Seek(0, SeekOrigin.Begin);
- return DrivingCycleDataReader.ReadFromStream(cycleData, CycleType.DistanceBased);
- }
-
-
- // =========================================
}
}
\ No newline at end of file
diff --git a/VectoCoreTest/Integration/SimpleDrivingCycles.cs b/VectoCoreTest/Integration/SimpleDrivingCycles.cs
index cde3a93fe0..4625b894f8 100644
--- a/VectoCoreTest/Integration/SimpleDrivingCycles.cs
+++ b/VectoCoreTest/Integration/SimpleDrivingCycles.cs
@@ -1,4 +1,7 @@
using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using TUGraz.VectoCore.FileIO.Reader;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
namespace TUGraz.VectoCore.Tests.Integration
{
@@ -559,5 +562,18 @@ namespace TUGraz.VectoCore.Tests.Integration
};
#endregion
+
+ public static DrivingCycleData CreateCycleData(string[] entries)
+ {
+ var cycleData = new MemoryStream();
+ var writer = new StreamWriter(cycleData);
+ writer.WriteLine("<s>,<v>,<grad>,<stop>");
+ foreach (var entry in entries) {
+ writer.WriteLine(entry);
+ }
+ writer.Flush();
+ cycleData.Seek(0, SeekOrigin.Begin);
+ return DrivingCycleDataReader.ReadFromStream(cycleData, CycleType.DistanceBased);
+ }
}
}
\ No newline at end of file
diff --git a/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs b/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
index 6720cea47b..e5ccb04c01 100644
--- a/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
+++ b/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
@@ -15,7 +15,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[TestMethod]
public void Gearbox_Initialize_Empty()
{
- var cycle = CreateCycleData(new[] {
+ var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>, <v>, <grad>, <stop>
" 0, 0, 2.95016969027809, 1",
"1000, 60, 2.95016969027809, 0",
@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[TestMethod]
public void Gearbox_Initialize_RefLoad()
{
- var cycle = CreateCycleData(new[] {
+ var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>, <v>, <grad>, <stop>
" 0, 0, 2.95016969027809, 1",
" 1000, 60, 2.95016969027809, 0",
@@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[TestMethod]
public void Gearbox_Initialize_85_RefLoad()
{
- var cycle = CreateCycleData(new[] {
+ var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
// <s>,<v>,<grad>,<stop>
" 0, 85, 2.95016969027809, 0",
" 100, 85, 2.95016969027809, 0",
@@ -100,18 +100,5 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
// ===============================
-
- public static DrivingCycleData CreateCycleData(string[] entries)
- {
- var cycleData = new MemoryStream();
- var writer = new StreamWriter(cycleData);
- writer.WriteLine("<s>,<v>,<grad>,<stop>");
- foreach (var entry in entries) {
- writer.WriteLine(entry);
- }
- writer.Flush();
- cycleData.Seek(0, SeekOrigin.Begin);
- return DrivingCycleDataReader.ReadFromStream(cycleData, CycleType.DistanceBased);
- }
}
}
\ No newline at end of file
--
GitLab