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

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

fix testdata in VTP tests: adding missing columns, renaming columns

parent 63021612
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
+ 37
− 37
View file @ 8393126f
......@@ -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_Diesel CI> [g/h],<gear>,CO,NMHC,NOx,PN,tq_eng,thc";
const string Header = "<t> [s],<v> [km/h],<n_eng> [rpm],<n_fan> [rpm],<tq_wh_left> [Nm],<tq_wh_right> [Nm],<n_wh_left> [rpm],<n_wh_right> [rpm],<fc_Diesel CI> [g/h],<gear>,CO,NMHC,NOx,PN,tq_eng,thc,CO2";
[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 , 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
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 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 , 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
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 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 , 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
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {1}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 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 , 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
@" 0 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, 400, 200, 200, {0}, {0} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, 400, 200, 200, {0}, {1} , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, 400, 200, 200, {1}, {1} , 100, 3 , 0 , 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, 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
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0, 0, 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0, 0, 0 , 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0, 0, 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0, 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 , 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
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 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 , 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
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 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 , 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
@" 0 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
0.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1 , 0, 600, {1}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
1.5 , 0, 600, {0}, 300 , 290 , 50 , 50 , 100, 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0
", fanSpeed, 1.1 * fanSpeed);
var container = new VehicleContainer(ExecutionMode.Declaration) {
......@@ -323,7 +323,7 @@ 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 , 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));
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 , 0 , 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() {
......@@ -355,7 +355,7 @@ 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 , 0 , 0 , 0 , 0 , 0 , 0 \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 , 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() {
......@@ -386,7 +386,7 @@ 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 , 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));
cycleEntries += string.Format(" {0} , 0, 600, 400, 500 , 500 , 100 , 100 , {1}, 3 , 0 , 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() {
......@@ -417,7 +417,7 @@ 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 , 0 , 0 , 0 , 0 , 0 , 0\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 , 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() {
......
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