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

Skip to content
Snippets Groups Projects
Commit 5e69bbe2 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

Pull request #919: Extend mock-cycle data in VTP testcases with newly required columns 

Merge in VECTO/vecto-sim from VECTO/mq_vecto-sim:develop to develop

* commit '6d3b36de':
  Extend mock-cycle data in VTP testcases with newly required columns
parents 6e311dd8 6d3b36de
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs
+ 49
− 41
View file @ 5e69bbe2
......@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
{
public static ThreadLocal<List<string>> LogList = new ThreadLocal<List<string>>();
const string Header = "<t> [s],<v> [km/h],<n_eng> [rpm],<n_fan> [rpm],<tq_left> [Nm],<tq_right> [Nm],<n_wh_left> [rpm],<n_wh_right> [rpm],<fc> [g/h],<gear>";
const string Header = "<t> [s],<v> [km/h],<n_eng> [rpm],<n_fan> [rpm],<tq_left> [Nm],<tq_right> [Nm],<n_wh_left> [rpm],<n_wh_right> [rpm],<fc_Diesel CI> [g/h],<gear>,CO,NMHC,NOx,PN,tq_eng,thc";
[TestCase()]
......@@ -71,10 +71,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var wheelSpeed = 100;
var cycleEntries = string.Format(
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
", wheelSpeed, wheelSpeed * DeclarationData.VTPMode.WheelSpeedDifferenceFactor * 1.1);
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -100,10 +100,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var wheelSpeed = 100;
var cycleEntries = string.Format(
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
", wheelSpeed, wheelSpeed * DeclarationData.VTPMode.WheelSpeedDifferenceFactor * 1.1);
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -129,10 +129,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var wheelSpeed = 0.95 * DeclarationData.VTPMode.WheelSpeedZeroTolerance.AsRPM;
var cycleEntries = string.Format(
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
1 , 0, 600, 400, 200, 200, {1}, {0} , 100, 3
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {1}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
", wheelSpeed.ToString(CultureInfo.InvariantCulture), (wheelSpeed + DeclarationData.VTPMode.MaxWheelSpeedDifferenceStandstill.AsRPM * 1.1).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -157,10 +157,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var wheelSpeed = 0.95*DeclarationData.VTPMode.WheelSpeedZeroTolerance.AsRPM;
var cycleEntries = string.Format(
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
", wheelSpeed.ToString(CultureInfo.InvariantCulture), (wheelSpeed + DeclarationData.VTPMode.MaxWheelSpeedDifferenceStandstill.AsRPM * 1.1).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -187,10 +187,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var fanSpeed = 1.05 * DeclarationData.VTPMode.MinFanSpeed.AsRPM;
var cycleEntries = string.Format(
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0, 0, 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0, 0, 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0, 0, 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0, 0, 0 , 0 , 0 , 0
", fanSpeed.ToString(CultureInfo.InvariantCulture), (fanSpeed * 0.9).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -220,10 +220,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var fanSpeed = 0.95 * DeclarationData.VTPMode.MaxFanSpeed.AsRPM;
var cycleEntries = string.Format(
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
", fanSpeed, 1.1 * fanSpeed );
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -254,10 +254,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var fanSpeed = 1.05 * DeclarationData.VTPMode.MinFanSpeed.AsRPM;
var cycleEntries = string.Format(
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
", fanSpeed.ToString(CultureInfo.InvariantCulture), (fanSpeed * 0.9).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -286,10 +286,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var fanSpeed = 0.95 * DeclarationData.VTPMode.MaxFanSpeed.AsRPM;
var cycleEntries = string.Format(
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0
", fanSpeed, 1.1 * fanSpeed);
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -323,11 +323,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var cycleEntries = "";
for (var i = 0; i < 2000; i++)
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 \n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 1.01 * (1 - i/100000.0)).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 , 0 , 0 , 0 , 0 , 0 , 0 \n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 1.01 * (1 - i/100000.0)).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
RunData = new VectoRunData() {
Aux = new List<VectoRunData.AuxData>()
Aux = new List<VectoRunData.AuxData>(),
TorqueDriftLeftWheel = 0.SI<NewtonMeter>(),
TorqueDriftRightWheel = 0.SI<NewtonMeter>(),
}
};
var cycle = InputDataHelper.InputDataAsStream(Header, cycleEntries.Split('\n'));
......@@ -353,11 +355,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var cycleEntries = "";
for (var i = 0; i < 2000; i++)
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 \n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 1.0001).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 , 0 , 0 , 0 , 0 , 0 , 0 \n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 1.0001).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
RunData = new VectoRunData() {
Aux = new List<VectoRunData.AuxData>()
Aux = new List<VectoRunData.AuxData>(),
TorqueDriftLeftWheel = 0.SI<NewtonMeter>(),
TorqueDriftRightWheel = 0.SI<NewtonMeter>(),
}
};
var cycle = InputDataHelper.InputDataAsStream(Header, cycleEntries.Split('\n'));
......@@ -382,11 +386,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var cycleEntries = "";
for (var i = 0; i < 2000; i++)
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 \n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 0.99 * (1 + i / 100000.0)).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 , 0 , 0 , 0 , 0 , 0 , 0 \n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 0.99 * (1 + i / 100000.0)).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
RunData = new VectoRunData() {
Aux = new List<VectoRunData.AuxData>()
Aux = new List<VectoRunData.AuxData>(),
TorqueDriftLeftWheel = 0.SI<NewtonMeter>(),
TorqueDriftRightWheel = 0.SI<NewtonMeter>(),
}
};
var cycle = InputDataHelper.InputDataAsStream(Header, cycleEntries.Split('\n'));
......@@ -411,11 +417,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var cycleEntries = "";
for (var i = 0; i < 2000; i++)
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 \n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 0.9999).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 , 0 , 0 , 0 , 0 , 0 , 0\n", (i / 2.0).ToString(CultureInfo.InvariantCulture), ((fcLimit * 0.9999).ConvertToGrammPerHour().Value).ToString(CultureInfo.InvariantCulture));
var container = new VehicleContainer(ExecutionMode.Declaration) {
RunData = new VectoRunData() {
Aux = new List<VectoRunData.AuxData>()
Aux = new List<VectoRunData.AuxData>(),
TorqueDriftLeftWheel = 0.SI<NewtonMeter>(),
TorqueDriftRightWheel = 0.SI<NewtonMeter>(),
}
};
var cycle = InputDataHelper.InputDataAsStream(Header, cycleEntries.Split('\n'));
......
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