This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 3ebb5575 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

moved pwheel test files to own directory

parent aafe09c1
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 28 additions and 326 deletions
VectoCoreTest/Models/Simulation/PwheelModeTests.cs
+ 7
− 7
View file @ 3ebb5575
...@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation ...@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestMethod] [TestMethod]
public void Pwheel_Run_Test() public void Pwheel_Run_Test()
{ {
var jobFile = @"TestData\Jobs\Pwheel.vecto"; var jobFile = @"TestData\Pwheel\Pwheel.vecto";
var fileWriter = new FileOutputWriter(jobFile); var fileWriter = new FileOutputWriter(jobFile);
var sumWriter = new SummaryDataContainer(fileWriter); var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter); var jobContainer = new JobContainer(sumWriter);
...@@ -149,10 +149,10 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation ...@@ -149,10 +149,10 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
ResultFileHelper.TestSumFile(@"TestData\Results\Pwheel\Atego_ges.v2.vsum", @"TestData\Jobs\Pwheel.vsum"); ResultFileHelper.TestSumFile(@"TestData\Pwheel\Results\Atego_ges.v2.vsum", @"TestData\Jobs\Pwheel.vsum");
ResultFileHelper.TestModFile(@"TestData\Results\Pwheel\Atego_ges_Gear2_pt1_rep1_actual.vmod", ResultFileHelper.TestModFile(@"TestData\Pwheel\Results\Atego_ges_Gear2_pt1_rep1_actual.vmod",
@"TestData\Jobs\Pwheel_Gear2_pt1_rep1_actual.vmod"); @"TestData\Pwheel\Pwheel_Gear2_pt1_rep1_actual.vmod");
} }
/// <summary> /// <summary>
...@@ -162,7 +162,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation ...@@ -162,7 +162,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestMethod] [TestMethod]
public void Pwheel_ultimate_Run_Test() public void Pwheel_ultimate_Run_Test()
{ {
var jobFile = @"TestData\Jobs\Pwheel_ultimate.vecto"; var jobFile = @"TestData\Pwheel\Pwheel_ultimate.vecto";
var fileWriter = new FileOutputWriter(jobFile); var fileWriter = new FileOutputWriter(jobFile);
var sumWriter = new SummaryDataContainer(fileWriter); var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter); var jobContainer = new JobContainer(sumWriter);
...@@ -177,8 +177,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation ...@@ -177,8 +177,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
ResultFileHelper.TestModFile(@"TestData\Results\P_wheel_in\Atego_HDVCO2_RD_#1_AuxStd.vmod", ResultFileHelper.TestModFile(@"TestData\Pwheel\Results\P_wheel_in\Atego_HDVCO2_RD_#1_AuxStd.vmod",
@"TestData\Jobs\Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod", testRowCount: false); @"TestData\Pwheel\Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod", testRowCount: false);
} }
} }
} }
\ No newline at end of file
VectoCoreTest/TestData/Jobs/Pwheel.vecto → VectoCoreTest/TestData/Pwheel/Pwheel.vecto
+ 5
− 5
View file @ 3ebb5575
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
}, },
"Body": { "Body": {
"SavedInDeclMode": false, "SavedInDeclMode": false,
"VehicleFile": "../Components/Pwheel/Atego.vveh", "VehicleFile": "..\\Components\\Pwheel\\Atego.vveh",
"EngineFile": "../Components/Pwheel/OM906.veng", "EngineFile": "..\\Components\\Pwheel\\OM906.veng",
"GearboxFile": "../Components/Pwheel/G_85-6_6_7-0_17.vgbx", "GearboxFile": "..\\Components\\Pwheel\\G_85-6_6_7-0_17.vgbx",
"Cycles": [ "Cycles": [
"../Components/Pwheel/Gear2_pt1_rep1_actual.vdri" "..\\Components\\Pwheel\\Gear2_pt1_rep1_actual.vdri"
], ],
"VACC": "../Components/Pwheel/Truck.vacc", "VACC": "..\\Components\\Pwheel\\Truck.vacc",
"EngineOnlyMode": false, "EngineOnlyMode": false,
"StartStop": { "StartStop": {
"Enabled": false, "Enabled": false,
......
VectoCoreTest/TestData/Results/Pwheel/Atego_ges.v2.vsum → VectoCoreTest/TestData/Pwheel/Results/Atego_ges.v2.vsum
+ 1
− 1
View file @ 3ebb5575
Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%] Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
1,Atego_ges.vecto,Gear2_pt1_rep1_actual.vdri,Success,1,-,-,-,93.5667266845703,0,19058.18,-,-,-,-,-,-,-,-,-,-,89.0198287963867,0,0.0259907574123806,0,0,0,0,0,0,0,-0.00126302613152398,0,0,12000,0,0,0,0,0,0,0,0,0 1,Atego_ges.vecto,Gear2_pt1_rep1_actual.vdri,Success,1,-,-,-,93.5667266845703,0,19058.18,-,-,-,-,-,-,-,-,-,-,89.0198287963867,0,0.0259907574123806,0,0,0,0,0,0,0,-0.00126302613152398,0,0,12000,0,0,0,0,0,0,0,0,0
VectoCoreTest/TestData/Results/Pwheel/Atego_ges.v2.vsig deleted 100644 → 0
+ 0
− 96
View file @ aafe09c1
{
"Header": {
"FileVersion": "1.1",
"LicenseOwner": "TUG ITI (59f3bd5f-1e50-474f-928a-435968d769f6)",
"Mode": "auto",
"Date": "23.11.2015 09:28:43 (UTC)"
},
"Body": {
"FileList": [
{
"Path": "Atego_ges.v2.vsum",
"SHA1-Hash": "entOH3HN5ekfTXUAxG8hJZkfkwo="
},
{
"Path": "Atego_ges.v2.vsum.json",
"SHA1-Hash": "V3Pv4OVW7N4s2R2/oIlszat9Hjc="
},
{
"Path": "Atego_ges_Gear2_pt1_rep1_actual.vmod",
"SHA1-Hash": "SMblZ7oL0agKE2sgIBoBLh/1t0A="
},
{
"Path": "Atego_ges.vecto",
"SHA1-Hash": "HVL8xMytCIdp19B4KdUm2GolMYI="
},
{
"Path": "Atego.vveh",
"SHA1-Hash": "Fd/ItzeyUjIdPZQjswQ8FoeNzeQ="
},
{
"Path": "OM906.veng",
"SHA1-Hash": "KD7//0LW6a70ZjjRLOlmCmHOn3Y="
},
{
"Path": "o9061750850E4.vfld",
"SHA1-Hash": "0DR6ZfUzfvOX3VGyhliRFbY1LYk="
},
{
"Path": "om9062101120_e4e5_b7c_sl2499_20110727.vmap",
"SHA1-Hash": "d6P93j2nGWWX8lSE4Wns1YC3vLc="
},
{
"Path": "G_85-6_6_7-0_17.vgbx",
"SHA1-Hash": "XqchL2YY1Dv19rXEH2dSL3Vw6p0="
},
{
"Path": "axle_losses_r390_80_serie_1306.vtlm",
"SHA1-Hash": "uc/tYiFspk7b6r+eGZt1Vg21jmE="
},
{
"Path": "losses_g85_6_6696_0728_1401_loss_1.vtlm",
"SHA1-Hash": "N+fYLnjpBhfuURk5r5D3uMrcyrQ="
},
{
"Path": "ShiftPolygons_o9061750850E4.vgbs",
"SHA1-Hash": "KWcJDqrQVQ+m70Njj9K5/0CHhXg="
},
{
"Path": "losses_g85_6_6696_0728_1401_loss_2.vtlm",
"SHA1-Hash": "nfIm8IBF5dNofEG+CnnSrIsqy3A="
},
{
"Path": "losses_g85_6_6696_0728_1401_loss_3.vtlm",
"SHA1-Hash": "vX9AOecyN2wPgW+xRxoqFU23rJ4="
},
{
"Path": "losses_g85_6_6696_0728_1401_loss_4.vtlm",
"SHA1-Hash": "9D50ratpAxq7qkLOuaUuZb3lDyM="
},
{
"Path": "losses_g85_6_6696_0728_1401_loss_5.vtlm",
"SHA1-Hash": "TCz8YCmk0SzQuqpVAZ003ngbopQ="
},
{
"Path": "Truck.vacc",
"SHA1-Hash": "AQv2YmPBCjNQ+J8BdhNJfRgAagk="
},
{
"Path": "Gear2_pt1_rep1_actual.vdri",
"SHA1-Hash": "TPJ0ffCaiEVD5m6h+JJ09e4dxwk="
}
],
"PublicKey": {
"DSAKeyValue": {
"P": "y+Ktr+ZdYFzCTkn97vOQelYvp76zj9Gj78h22qwgwRCuLuZ0AAxxlgxwYAuut3A8aLRBBnMK54RuaHJsQ7Es3PpHli/tOw4AtsBltSTFnk7EXGhB3ltKXJehKZrJj02NPzqZbiR9X64EiRsAMaNXN2QkKRnlHrmuGsZmTcsH2gU=",
"Q": "nTWtKGq3EiTslHtnxIc8zM51VvE=",
"G": "rQc0wUPLXAMgdoG8zq3PXi1Zmd5y8MRz/jH20o0DK0GvYUoAba05jPAIBvId1xQ+aUb9WV0bVjnf0RnMPuAMGqNTljBCH8QU7rcHnKyjm2FKc/zoq4cELKSylrrpeXgNc/jcLvTRH5lngZvxFzEeHXQ8pVTOJMddJpPhSE1NO/I=",
"Y": "H9XqvicxCLhNrMvVau+xqWKTzZXEBQuQMu69Cu9v72tUTGX//VezCZgh7uZ6SWBZJ7qPHbcAS6u05a0vYVG+FsAmiX727KCwES/Mi2oRHDzDdZJCpi5iGNDBvA+Unf0Rfow5OTBEsctWoYMAcg6/dEUqxp9tAyq8X21nXtBcqL8=",
"J": "AAAAAUwBvMDI7dYS15yuZWdsADPGiic7Z14w6xouSy3sMGR0r7+jyWXz7jMhypoDf8VhDbaaj7ldxMhZwAcWOPI2Td+AxPY6RhNb8pR/gi8NT4bUpuirAFJcdTbUj2prSQrsScYEJVQD+57zBtziRA==",
"Seed": "ZoCcbotFI7EWKHZHUwteBo56gHc=",
"PgenCounter": "2Q=="
}
},
"Signature": "VFBdX+p/3KD3h6xEul0vyVmd9mNWj6xb6bdNG67/s7uFGJW/ZbMo0g=="
}
}
\ No newline at end of file
VectoCoreTest/TestData/Results/Pwheel/Atego_ges.v2.vsum.json deleted 100644 → 0
+ 0
− 196
View file @ aafe09c1
{
"Header": {
"CreatedBy": "TUG ITI (59f3bd5f-1e50-474f-928a-435968d769f6)",
"Date": "23.11.2015 10:28:42",
"AppVersion": "2.2",
"FileVersion": 1
},
"Body": {
"Settings": {
"Air Density [kg/m3]": 1.188,
"CO2/FC [-]": 3.16,
"Fuel Density [kg/l]": 0.832,
"Distance Correction": false
},
"Results": [
{
"Job": "Atego_ges.vecto",
"Cycle": "Gear2_pt1_rep1_actual.vdri",
"Loading": "User-defined Loading",
"AbortedByError": false,
"Results": {
"time": {
"Value": 1,
"Unit": "[s]"
},
"distance": {
"Value": "-",
"Unit": "[km]"
},
"speed": {
"Value": "-",
"Unit": "[km/h]"
},
"∆altitude": {
"Value": "-",
"Unit": "[m]"
},
"Ppos": {
"Value": 93.566726684570313,
"Unit": "[kW]"
},
"Pneg": {
"Value": 0.0,
"Unit": "[kW]"
},
"FC-Map": [
{
"Value": 19058.1777,
"Unit": "[g/h]"
},
{
"Value": "-",
"Unit": "[g/km]"
}
],
"FC-AUXc": [
{
"Value": "-",
"Unit": "[g/h]"
},
{
"Value": "-",
"Unit": "[g/km]"
}
],
"FC-WHTCc": [
{
"Value": "-",
"Unit": "[g/h]"
},
{
"Value": "-",
"Unit": "[g/km]"
}
],
"CO2": [
{
"Value": "-",
"Unit": "[g/km]"
},
{
"Value": "-",
"Unit": "[g/tkm]"
}
],
"FC-Final": [
{
"Value": "-",
"Unit": "[g/km]"
},
{
"Value": "-",
"Unit": "[l/100tkm]"
},
{
"Value": "-",
"Unit": "[l/100km]"
}
],
"PwheelPos": {
"Value": 89.019828796386719,
"Unit": "[kW]"
},
"Pbrake": {
"Value": 0.0,
"Unit": "[kW]"
},
"EposICE": {
"Value": 0.025990757412380643,
"Unit": "[kWh]"
},
"EnegICE": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Eair": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Eroll": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Egrad": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Eacc": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Eaux": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Ebrake": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Etransm": {
"Value": -0.00126302613152398,
"Unit": "[kWh]"
},
"Eretarder": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Etorqueconv": {
"Value": 0.0,
"Unit": "[kWh]"
},
"Mass": {
"Value": 12000.0,
"Unit": "[kg]"
},
"Loading": {
"Value": 0.0,
"Unit": "[kg]"
},
"a": {
"Value": "0",
"Unit": "[m/s^2]"
},
"a_pos": {
"Value": "0",
"Unit": "[m/s^2]"
},
"a_neg": {
"Value": "0",
"Unit": "[m/s^2]"
},
"Acc.Noise": {
"Value": "0",
"Unit": "[m/s^2]"
},
"pAcc": {
"Value": "0",
"Unit": "[%]"
},
"pDec": {
"Value": "0",
"Unit": "[%]"
},
"pCruise": {
"Value": "0",
"Unit": "[%]"
},
"pStop": {
"Value": "0",
"Unit": "[%]"
}
}
}
]
}
}
\ No newline at end of file
VectoCoreTest/VectoCoreTest.csproj
+ 15
− 21
View file @ 3ebb5575
...@@ -890,12 +890,6 @@ ...@@ -890,12 +890,6 @@
<None Include="TestData\Jobs\EngineOnlyJob.vecto"> <None Include="TestData\Jobs\EngineOnlyJob.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="TestData\Jobs\Pwheel.vecto">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Jobs\Pwheel_ultimate.vecto">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\MeasuredSpeed\Alternator.vaux"> <None Include="TestData\MeasuredSpeed\Alternator.vaux">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
...@@ -953,6 +947,21 @@ ...@@ -953,6 +947,21 @@
<None Include="TestData\MeasuredSpeed\Vehicle.vveh"> <None Include="TestData\MeasuredSpeed\Vehicle.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="TestData\Pwheel\Pwheel.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Pwheel\Pwheel_ultimate.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Pwheel\Results\Atego_ges.v2.vsum">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Pwheel\Results\Atego_ges_Gear2_pt1_rep1_actual.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Pwheel\Results\Atego_HDVCO2_RD_#1_AuxStd.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Engineering\24t Coach.vsum"> <None Include="TestData\Results\Engineering\24t Coach.vsum">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
...@@ -1028,21 +1037,6 @@ ...@@ -1028,21 +1037,6 @@
<None Include="TestData\Results\Integration\job_1-Gear-Test-dist.vmod"> <None Include="TestData\Results\Integration\job_1-Gear-Test-dist.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="TestData\Results\Pwheel\Atego_ges.v2.vsig">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_ges.v2.vsum">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_ges.v2.vsum.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_ges_Gear2_pt1_rep1_actual.vmod">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_HDVCO2_RD_#1_AuxStd.vmod">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="TestData\Cycles\EngineOnly_FullLoad.vdri"> <None Include="TestData\Cycles\EngineOnly_FullLoad.vdri">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about