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

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

Merge pull request #584 in VECTO/vecto-sim from... 

Merge pull request #584 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-633-unable-to-start-vtp-mode-simulation to develop

* commit 'd48a8a16':
  adding testcase for VTP-simulation without gear in cycle
  fix: setting gear for initializing startgear
parents ea70f20a d48a8a16
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4707 additions and 60 deletions
VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs
+ 36
− 36
View file @ 0297fd30
......@@ -29,40 +29,40 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.ComponentModel.DataAnnotations;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
public class SimulationComponentData : LoggingObject
{
public bool SavedInDeclarationMode { get; internal set; }
public string Manufacturer { get; internal set; }
public string ModelName { get; internal set; }
public string Date { get; internal set; }
public CertificationMethod CertificationMethod { get; internal set; }
public string CertificationNumber { get; internal set; }
public string DigestValueInput { get; internal set; }
protected static ExecutionMode GetExecutionMode(ValidationContext context)
{
var validationService =
context.GetService(typeof(VectoValidationModeServiceContainer)) as VectoValidationModeServiceContainer;
return validationService == null ? ExecutionMode.Declaration : validationService.Mode;
}
protected static bool GetEmsMode(ValidationContext context)
{
var validationService =
context.GetService(typeof(VectoValidationModeServiceContainer)) as VectoValidationModeServiceContainer;
return validationService != null && validationService.IsEMSCycle;
}
}
using System.ComponentModel.DataAnnotations;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
public class SimulationComponentData : LoggingObject
{
public bool SavedInDeclarationMode { get; internal set; }
public string Manufacturer { get; internal set; }
public string ModelName { get; internal set; }
public string Date { get; internal set; }
public CertificationMethod CertificationMethod { get; internal set; }
public string CertificationNumber { get; internal set; }
public string DigestValueInput { get; internal set; }
protected static ExecutionMode GetExecutionMode(ValidationContext context)
{
var validationService =
context.GetService(typeof(VectoValidationModeServiceContainer)) as VectoValidationModeServiceContainer;
return validationService == null ? ExecutionMode.Declaration : validationService.Mode;
}
protected static bool GetEmsMode(ValidationContext context)
{
var validationService =
context.GetService(typeof(VectoValidationModeServiceContainer)) as VectoValidationModeServiceContainer;
return validationService != null && validationService.IsEMSCycle;
}
}
}
\ No newline at end of file
VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs
+ 1
− 1
View file @ 0297fd30
......@@ -100,7 +100,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
internal ResponseDryRun Initialize(uint gear, NewtonMeter outTorque, PerSecond outAngularVelocity)
{
CycleIterator.RightSample.Gear = gear;
CycleIterator.LeftSample.Gear = gear;
//var inAngularVelocity = outAngularVelocity * RunData.GearboxData.Gears[gear].Ratio;
//var torqueLossResult = RunData.GearboxData.Gears[gear].LossMap.GetTorqueLoss(outAngularVelocity, outTorque);
//var inTorque = outTorque / RunData.GearboxData.Gears[gear].Ratio + torqueLossResult.Value;
......
VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
+ 22
− 23
View file @ 0297fd30
......@@ -39,32 +39,31 @@ using TUGraz.VectoCore.OutputData.FileIO;
namespace TUGraz.VectoCore.Tests.Integration.VTP
{
[TestFixture]
public class VTPTest
{
[TestFixture]
public class VTPTest
{
[OneTimeSetUp]
public void Init()
{
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
[TestCase()]
public void RunVTP()
{
var jobFile = @"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle.vecto";
var fileWriter = new FileOutputWriter(jobFile);
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
var dataProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
var runsFactory = new SimulatorFactory(ExecutionMode.Engineering, dataProvider, fileWriter) {
ModalResults1Hz = false,
WriteModalResults = true,
ActualModalData = false,
Validate = false,
};
jobContainer.AddRuns(runsFactory);
[TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle.vecto"),
TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle_noGear.vecto")]
public void RunVTP(string jobFile)
{
var fileWriter = new FileOutputWriter(jobFile);
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
var dataProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
var runsFactory = new SimulatorFactory(ExecutionMode.Engineering, dataProvider, fileWriter) {
ModalResults1Hz = false,
WriteModalResults = true,
ActualModalData = false,
Validate = false,
};
jobContainer.AddRuns(runsFactory);
//var i = 0;
//jobContainer.Runs[i].Run.Run();
......@@ -74,8 +73,8 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
jobContainer.WaitFinished();
Assert.AreEqual(true, jobContainer.AllCompleted);
}
}
}
}
}
\ No newline at end of file
VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/VTP_rural_2Hz_noGear.vdri 0 → 100644
+ 4621
− 0
View file @ 0297fd30
Source diff could not be displayed: it is too large. Options to address this: view the blob.
VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/class_5_generic vehicle_noGear.vecto 0 → 100644
+ 21
− 0
View file @ 0297fd30
{
"Header": {
"CreatedBy": "",
"Date": "2017-11-20T13:22:33.6138904Z",
"AppVersion": "3",
"FileVersion": 4
},
"Body": {
"SavedInDeclMode": false,
"DeclarationVehicle": "Tractor_4x2_vehicle-class-5_Generic vehicle.xml",
"FanPowerCoefficients": [
5.5E-07,
15.0,
108.5
],
"FanDiameter": 0.225,
"Cycles": [
"VTP_rural_2Hz_noGear.vdri"
]
}
}
\ No newline at end of file
VectoCore/VectoCoreTest/VectoCoreTest.csproj
+ 6
− 0
View file @ 0297fd30
......@@ -1732,6 +1732,9 @@
<None Include="TestData\Integration\FullPowerTrain\unlimited.vacc">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle_noGear.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
......@@ -1744,6 +1747,9 @@
<None Include="TestData\Integration\VTPMode\GenericVehicle\VTLM_axle.vtlm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\VTPMode\GenericVehicle\VTP_rural_2Hz_noGear.vdri">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\VTPMode\GenericVehicle\VTP_rural_2Hz.vdri">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
......
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