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

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

Merge branch 'feature/VECTO-139-prepare-for-first-beta-release' of... 

Merge branch 'feature/VECTO-139-prepare-for-first-beta-release' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-139-prepare-for-first-beta-release
parents c5573719 906329e3
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2946 additions and 2868 deletions
VectoConsole/Properties/Version.cs
+ 1
− 1
View file @ 571b828d
using System.Reflection;
// generated on 11.11.2015 13:07:57
// generated on 11.11.2015 13:31:46
[assembly: AssemblyVersion("3.0.1.314")]
[assembly: AssemblyFileVersion("3.0.1.314")]
VectoCore/Properties/Version.cs
+ 1
− 1
View file @ 571b828d
using System.Reflection;
// generated on 11.11.2015 13:07:52
// generated on 11.11.2015 13:31:44
[assembly: AssemblyVersion("3.0.1.314")]
[assembly: AssemblyFileVersion("3.0.1.314")]
VectoCoreTest/Integration/FullCycleDeclarationTest.cs
+ 176
− 173
View file @ 571b828d
......@@ -13,177 +13,180 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Integration
{
[TestClass]
public class FullCycleDeclarationTest
{
public const string TruckDeclarationJob = @"TestData\Integration\DeclarationMode\40t Truck\40t_Long_Haul_Truck.vecto";
[TestMethod]
public void Truck40t_LongHaulCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("LongHaul");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_LongHaulCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_RegionalDeliveryCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("RegionalDelivery");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_RegionalDeliveryCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>(), true);
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_RegionalDeliveryCycle_RefLoad_Declaration()
{
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode,
@"c:\Users\Technik\Downloads\40t Long Haul Truck\40t_Long_Haul_Truck.vecto");
factory.WriteModalResults = true;
factory.SumWriter = new SummaryFileWriter("Test.vsum");
var runs = factory.SimulationRuns().ToArray();
var run = runs[4];
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_UrbanDeliveryCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("UrbanDelivery");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_UrbanDeliveryCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_MunicipalCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Municipal");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_MunicipalCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_ConstructionCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Construction");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_ConstructionCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_HeavyUrbanCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("HeavyUrban");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_HeavyUrbanCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_SubUrbanCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Suburban");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_SubUrbanCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_InterUrbanCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Interurban");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_InterUrbanCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_CoachCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Coach");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_CoachCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40tDeclarationTest()
{
LogManager.DisableLogging();
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode, TruckDeclarationJob);
factory.WriteModalResults = true;
var sumFileName = Path.GetFileNameWithoutExtension(TruckDeclarationJob) + Constants.FileExtensions.SumFile;
var sumWriter = new SummaryFileWriter(sumFileName);
var jobContainer = new JobContainer(sumWriter);
jobContainer.AddRuns(factory);
jobContainer.Execute();
jobContainer.WaitFinished();
foreach (var run in jobContainer.Runs) {
Assert.IsTrue(run.Run.FinishedWithoutErrors);
}
}
[TestMethod]
public void Truck12t_LongHaulCycle_RefLoad_Declaration()
{
// TODO: fails due to interpolaion failure in Gear 4
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode,
@"c:\Users\Technik\Downloads\12t Delivery Truck\12t Delivery Truck.vecto");
factory.WriteModalResults = true;
factory.SumWriter = new SummaryFileWriter("Test.vsum");
var runs = factory.SimulationRuns().ToArray();
var run = runs[1];
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck12t_UrbanDeliveryCycle_RefLoad_Declaration()
{
// TODO: fails due to interpolaion failure in Gear 4
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode,
@"c:\Users\Technik\Downloads\12t Delivery Truck\12t Delivery Truck.vecto");
factory.WriteModalResults = true;
factory.SumWriter = new SummaryFileWriter("Test.vsum");
var runs = factory.SimulationRuns().ToArray();
var run = runs[7];
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
}
[TestClass]
public class FullCycleDeclarationTest
{
public const string TruckDeclarationJob =
@"TestData\Integration\DeclarationMode\40t Truck\40t_Long_Haul_Truck.vecto";
[TestMethod]
public void Truck40t_LongHaulCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("LongHaul");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_LongHaulCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_RegionalDeliveryCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("RegionalDelivery");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_RegionalDeliveryCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>(), true);
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_UrbanDeliveryCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("UrbanDelivery");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_UrbanDeliveryCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_MunicipalCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("MunicipalUtility");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_MunicipalCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_ConstructionCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Construction");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_ConstructionCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_HeavyUrbanCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("HeavyUrban");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_HeavyUrbanCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_SubUrbanCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Suburban");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_SubUrbanCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_InterUrbanCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Interurban");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_InterUrbanCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40t_CoachCycle_RefLoad()
{
var cycle = SimpleDrivingCycles.ReadDeclarationCycle("Coach");
var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck40t_CoachCycle_RefLoad.vmod",
7500.SI<Kilogram>(), 12900.SI<Kilogram>());
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod]
public void Truck40tDeclarationTest()
{
LogManager.DisableLogging();
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode, TruckDeclarationJob);
factory.WriteModalResults = true;
var sumFileName = Path.GetFileNameWithoutExtension(TruckDeclarationJob) + Constants.FileExtensions.SumFile;
var sumWriter = new SummaryFileWriter(sumFileName);
var jobContainer = new JobContainer(sumWriter);
jobContainer.AddRuns(factory);
jobContainer.Execute();
jobContainer.WaitFinished();
foreach (var run in jobContainer.Runs) {
Assert.IsTrue(run.Run.FinishedWithoutErrors);
}
}
[TestMethod, Ignore]
public void Truck40t_RegionalDeliveryCycle_RefLoad_Declaration()
{
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode,
@"c:\Users\Technik\Downloads\40t Long Haul Truck\40t_Long_Haul_Truck.vecto");
factory.WriteModalResults = true;
factory.SumWriter = new SummaryFileWriter("Test.vsum");
var runs = factory.SimulationRuns().ToArray();
var run = runs[4];
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod, Ignore]
public void Truck12t_LongHaulCycle_RefLoad_Declaration()
{
// TODO: fails due to interpolaion failure in Gear 4
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode,
@"c:\Users\Technik\Downloads\12t Delivery Truck\12t Delivery Truck.vecto") {
WriteModalResults = true,
SumWriter = new SummaryFileWriter("Test.vsum")
};
var runs = factory.SimulationRuns().ToArray();
var run = runs[1];
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
[TestMethod, Ignore]
public void Truck12t_UrbanDeliveryCycle_RefLoad_Declaration()
{
// TODO: fails due to interpolaion failure in Gear 4
var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode,
@"c:\Users\Technik\Downloads\12t Delivery Truck\12t Delivery Truck.vecto") {
WriteModalResults = true,
SumWriter = new SummaryFileWriter("Test.vsum")
};
var runs = factory.SimulationRuns().ToArray();
var run = runs[7];
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
}
}
}
\ No newline at end of file
VectoCoreTest/Models/Simulation/AuxTests.cs
+ 309
− 300
View file @ 571b828d
This diff is collapsed.
VectoCoreTest/Models/Simulation/SimulationTests.cs
+ 100
− 99
View file @ 571b828d
This diff is collapsed.
VectoCoreTest/Reports/SumWriterTest.cs
+ 98
− 92
View file @ 571b828d
This diff is collapsed.
VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum
+ 2
− 2
View file @ 571b828d
Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],∆altitude [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [kWh],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 [%]
1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.194878,0.04471858,0.03797225,0.870663,0.04664611
\ No newline at end of file
Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [kWh],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 [%]
1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,Success,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.194878,0.04471858,0.03797225,0.870663,0.04664611
\ No newline at end of file
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