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

Skip to content
Snippets Groups Projects
Commit e44a3fc1 authored by Harald Martini's avatar Harald Martini
Browse files

implemented parallel hev completed bus rundatafactory

parent 5f1157c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 280 additions and 77 deletions
VectoCommon/VectoCommon/Models/VehicleCode.cs
+ 16
− 1
View file @ e44a3fc1
using TUGraz.VectoCommon.BusAuxiliaries;
using System;
using Ninject.Planning.Bindings.Resolvers;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCommon.Models {
......@@ -41,6 +43,12 @@ namespace TUGraz.VectoCommon.Models {
return self.ToString();
}
public static bool IsDoubleDeckerBus(this VehicleCode self)
{
VehicleCode? selfNullable = self;
return selfNullable.IsDoubleDeckerBus();
}
public static bool IsDoubleDeckerBus(this VehicleCode? self)
{
switch (self) {
......@@ -61,6 +69,13 @@ namespace TUGraz.VectoCommon.Models {
}
}
public static FloorType GetFloorType(this VehicleCode self)
{
VehicleCode? selfNullable = self;
return selfNullable.GetFloorType();
}
public static FloorType GetFloorType(this VehicleCode? vehicleCode)
{
switch (vehicleCode) {
......
VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/IDeclarationDataAdapter.cs
+ 1
− 1
View file @ e44a3fc1
......@@ -119,7 +119,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
HybridStrategyParameters CreateHybridStrategy(BatterySystemData runDataBatteryData,
SuperCapData runDataSuperCapData, Kilogram vehicleMass, OvcHevMode ovcMode, LoadingType loading, VehicleClass vehicleClass, MissionType missionType);
// paralllel hybrid strategy
// parallel hybrid strategy
HybridStrategyParameters CreateHybridStrategy(BatterySystemData runDataBatteryData,
SuperCapData runDataSuperCapData, Kilogram vehicleMass, OvcHevMode ovcMode,
LoadingType loading, VehicleClass vehicleClass, MissionType missionType, TableData boostingLimitations,
......
VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/CompletedBusRunDataFactory/DeclarationModeCompletedBusRunDataFactory.cs
+ 229
− 74
View file @ e44a3fc1
......@@ -113,6 +113,13 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
return primarySegment;
}
protected virtual VehicleClass GetPrimaryGroup()
{
var segment = GetPrimarySegment();
return DeclarationData.PrimaryBusSegments.Lookup(hdvSuperGroup: segment.VehicleClass,
vehicleCode: CompletedVehicle.VehicleCode.Value);
}
protected virtual IEnumerable<VectoRunData> CreateVectoRunData(
Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading,
int? modeIdx = null, string fuelMode = null,
......@@ -269,31 +276,31 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, int? modeIdx,
OvcHevMode ovcMode = OvcHevMode.NotApplicable)
{
var simulationRunData = CreateCommonRunData(mission, loading, _modSuffixSpecific);
var simulationRunData = CreateCommonRunData(mission, loading, _modSuffixSpecific);
simulationRunData.VehicleData = DataAdapterSpecific.CreateVehicleData(PrimaryVehicle,
CompletedVehicle, _segment, mission, loading);
simulationRunData.AirdragData = DataAdapterSpecific.CreateAirdragData(CompletedVehicle, mission);
simulationRunData.EngineData =
DataAdapterGeneric.CreateEngineData(PrimaryVehicle, modeIdx.Value, mission);
simulationRunData.ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>();
simulationRunData.AxleGearData =
DataAdapterGeneric.CreateAxleGearData(PrimaryVehicle.Components.AxleGearInputData);
simulationRunData.AngledriveData =
DataAdapterGeneric.CreateAngledriveData(PrimaryVehicle.Components.AngledriveInputData);
simulationRunData.Aux = DataAdapterSpecific.CreateAuxiliaryData(
PrimaryVehicle.Components.AuxiliaryInputData,
PrimaryVehicle.Components.BusAuxiliaries, mission.MissionType, _segment.VehicleClass,
CompletedVehicle.Length, PrimaryVehicle.Components.AxleWheels.NumSteeredAxles, PrimaryVehicle.VehicleType);
simulationRunData.Retarder = DataAdapterGeneric.CreateRetarderData(PrimaryVehicle.Components.RetarderInputData);
simulationRunData.EngineData.FuelMode = 0;
simulationRunData.VehicleData.VehicleClass = _segment.VehicleClass;
simulationRunData.BusAuxiliaries =
DataAdapterSpecific.CreateBusAuxiliariesData(mission, PrimaryVehicle, CompletedVehicle,
simulationRunData);
simulationRunData.VehicleData = DataAdapterSpecific.CreateVehicleData(PrimaryVehicle,
CompletedVehicle, _segment, mission, loading);
simulationRunData.AirdragData = DataAdapterSpecific.CreateAirdragData(CompletedVehicle, mission);
simulationRunData.EngineData =
DataAdapterGeneric.CreateEngineData(PrimaryVehicle, modeIdx.Value, mission);
simulationRunData.ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>();
simulationRunData.AxleGearData =
DataAdapterGeneric.CreateAxleGearData(PrimaryVehicle.Components.AxleGearInputData);
simulationRunData.AngledriveData =
DataAdapterGeneric.CreateAngledriveData(PrimaryVehicle.Components.AngledriveInputData);
simulationRunData.Aux = DataAdapterSpecific.CreateAuxiliaryData(
PrimaryVehicle.Components.AuxiliaryInputData,
PrimaryVehicle.Components.BusAuxiliaries, mission.MissionType, _segment.VehicleClass,
CompletedVehicle.Length, PrimaryVehicle.Components.AxleWheels.NumSteeredAxles, PrimaryVehicle.VehicleType);
simulationRunData.Retarder = DataAdapterGeneric.CreateRetarderData(PrimaryVehicle.Components.RetarderInputData);
simulationRunData.EngineData.FuelMode = 0;
simulationRunData.VehicleData.VehicleClass = _segment.VehicleClass;
simulationRunData.BusAuxiliaries =
DataAdapterSpecific.CreateBusAuxiliariesData(mission, PrimaryVehicle, CompletedVehicle,
simulationRunData);
CreateGearboxAndGearshiftData(simulationRunData);
return simulationRunData;
CreateGearboxAndGearshiftData(simulationRunData);
return simulationRunData;
}
......@@ -312,8 +319,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
}
}
public abstract class Hybrid : CompletedBusBase
#region Hybrid
public abstract class Hybrid : CompletedBusBase
{
protected Hybrid(IMultistageVIFInputData dataProvider, IDeclarationReport report,
ISpecificCompletedBusDeclarationDataAdapter dataAdapterSpecific,
......@@ -365,25 +372,46 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, Segment primarySegment, int? modeIdx,
OvcHevMode ovcHevMode)
{
throw new NotImplementedException("dummy implementation");
}
throw new VectoException("Dummy implementation");
}
protected override VectoRunData CreateVectoRunDataSpecific(Mission mission,
KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, int? modeIdx,
OvcHevMode ovcMode = OvcHevMode.NotApplicable)
{
throw new NotImplementedException("dummy implementation");
}
throw new VectoException("Dummy implementation");
}
protected override void CreateGearboxAndGearshiftData(VectoRunData runData)
{
throw new NotImplementedException("dummy implementation");
throw new VectoException("Dummy implementation");
}
#endregion
}
protected void SetOvcModeProperties(OvcHevMode ovcHevMode, VectoRunData rd)
{
if (ovcHevMode != OvcHevMode.NotApplicable) {
if (rd.BatteryData != null) {
rd.BatteryData.InitialSoC = rd.HybridStrategyParameters.InitialSoc;
}
if (rd.SuperCapData != null) {
rd.SuperCapData.InitialSoC = rd.HybridStrategyParameters.InitialSoc;
}
}
if (ovcHevMode != OvcHevMode.NotApplicable && PrimaryVehicle.OvcHev) {
rd.ModFileSuffix += ovcHevMode == OvcHevMode.ChargeSustaining ? "CS" : "CD";
}
if (ovcHevMode == OvcHevMode.ChargeDepleting) {
rd.BatteryData.Batteries.ForEach(b => b.Item2.ChargeSustainingBattery = true);
}
}
}
#region SerialHybrid
public abstract class SerialHybrid : Hybrid
{
......@@ -452,25 +480,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
DataAdapterGeneric.CreateHybridStrategy(rd.BatteryData, rd.SuperCapData, rd.VehicleData.TotalVehicleMass,
ovcHevMode, loading.Key, rd.VehicleData.VehicleClass, mission.MissionType);
if (ovcHevMode != OvcHevMode.NotApplicable) {
if (rd.BatteryData != null) {
rd.BatteryData.InitialSoC = rd.HybridStrategyParameters.InitialSoc;
}
if (rd.SuperCapData != null) {
rd.SuperCapData.InitialSoC = rd.HybridStrategyParameters.InitialSoc;
}
}
if (ovcHevMode != OvcHevMode.NotApplicable && PrimaryVehicle.OvcHev) {
rd.ModFileSuffix += ovcHevMode == OvcHevMode.ChargeSustaining ? "CS" : "CD";
}
if (ovcHevMode == OvcHevMode.ChargeDepleting) {
rd.BatteryData.Batteries.ForEach(b => b.Item2.ChargeSustainingBattery = true);
}
SetOvcModeProperties(ovcHevMode, rd);
return rd;
return rd;
}
protected override VectoRunData CreateVectoRunDataSpecific(Mission mission,
......@@ -486,16 +498,19 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
(bs) => rd.BatteryData = bs,
(sc) => rd.SuperCapData = sc);
if (PrimaryVehicle.VehicleType == VectoSimulationJobType.IEPC_S) {
if (PrimaryVehicle.VehicleType == VectoSimulationJobType.IEPC_S)
{
rd.ElectricMachinesData = DataAdapterGeneric.CreateIEPCElectricMachines(PrimaryVehicle.Components.IEPC,
rd.BatteryData.CalculateAverageVoltage());
} else {
rd.ElectricMachinesData = DataAdapterGeneric.CreateElectricMachines(
PrimaryVehicle.Components.ElectricMachines,
PrimaryVehicle.ElectricMotorTorqueLimits, rd.BatteryData.CalculateAverageVoltage(), null);
}
else
{
rd.ElectricMachinesData = DataAdapterGeneric.CreateElectricMachines(PrimaryVehicle.Components.ElectricMachines,
PrimaryVehicle.ElectricMotorTorqueLimits, rd.BatteryData.CalculateAverageVoltage(), null);
}
rd.VehicleData = DataAdapterSpecific.CreateVehicleData(PrimaryVehicle,
rd.VehicleData = DataAdapterSpecific.CreateVehicleData(PrimaryVehicle,
CompletedVehicle, _segment, mission, loading);
rd.AirdragData = DataAdapterSpecific.CreateAirdragData(CompletedVehicle, mission);
rd.EngineData =
......@@ -524,25 +539,18 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
DataAdapterSpecific.CreateBusAuxiliariesData(mission, PrimaryVehicle, CompletedVehicle,
rd);
CreateGearboxAndGearshiftData(rd);
if (ovcMode != OvcHevMode.NotApplicable) {
if (rd.BatteryData != null) {
rd.BatteryData.InitialSoC = rd.HybridStrategyParameters.InitialSoc;
}
if (rd.SuperCapData != null) {
rd.SuperCapData.InitialSoC = rd.HybridStrategyParameters.InitialSoc;
}
}
if (ovcMode != OvcHevMode.NotApplicable && PrimaryVehicle.OvcHev) {
rd.ModFileSuffix += ovcMode == OvcHevMode.ChargeSustaining ? "CS" : "CD";
}
CreateGearboxAndGearshiftData(rd);
rd.HybridStrategyParameters = DataAdapterGeneric.CreateHybridStrategy(
rd.BatteryData,
rd.SuperCapData,
rd.VehicleData.GrossVehicleMass,
ovcMode,
rd.Loading,
rd.VehicleData.VehicleClass,
rd.Mission.MissionType);
if (ovcMode == OvcHevMode.ChargeDepleting) {
rd.BatteryData.Batteries.ForEach(b => b.Item2.ChargeSustainingBattery = true);
}
SetOvcModeProperties(ovcMode, rd);
return rd;
}
......@@ -632,12 +640,154 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
#endregion
}
#endregion SerialHybrid
#region ParallelHybrid
public abstract class ParallelHybrid : Hybrid
{
protected ParallelHybrid(IMultistageVIFInputData dataProvider, IDeclarationReport report,
ISpecificCompletedBusDeclarationDataAdapter dataAdapterSpecific,
IGenericCompletedBusDeclarationDataAdapter dataAdapterGeneric) : base(dataProvider, report,
dataAdapterSpecific, dataAdapterGeneric) { }
#region Overrides of Hybrid
protected override VectoRunData CreateVectoRunDataGeneric(Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, Segment primarySegment, int? modeIdx,
OvcHevMode ovcHevMode)
{
var rd = CreateCommonRunData(mission, loading, _modSuffixGeneric);
DataAdapterGeneric.CreateREESSData(
componentsElectricStorage: PrimaryVehicle.Components.ElectricStorage,
PrimaryVehicle.VehicleType,
true,
(bs) => rd.BatteryData = bs,
(sc) => rd.SuperCapData = sc);
rd.ElectricMachinesData = DataAdapterGeneric.CreateElectricMachines(PrimaryVehicle.Components.ElectricMachines,
PrimaryVehicle.ElectricMotorTorqueLimits, rd.BatteryData.CalculateAverageVoltage(), null);
var primaryBusAuxiliaries = PrimaryVehicle.Components.BusAuxiliaries;
rd.VehicleData =
DataAdapterGeneric.CreateVehicleData(PrimaryVehicle, primarySegment, mission, loading, false);
rd.AirdragData = DataAdapterGeneric.CreateAirdragData(null, mission, new Segment());
rd.EngineData =
DataAdapterGeneric.CreateEngineData(PrimaryVehicle, modeIdx.Value, mission);
rd.AxleGearData =
DataAdapterGeneric.CreateAxleGearData(PrimaryVehicle.Components.AxleGearInputData);
rd.AngledriveData =
DataAdapterGeneric.CreateAngledriveData(PrimaryVehicle.Components.AngledriveInputData);
rd.Aux = DataAdapterGeneric.CreateAuxiliaryData(
PrimaryVehicle.Components.AuxiliaryInputData, primaryBusAuxiliaries, mission.MissionType,
primarySegment.VehicleClass, mission.BusParameter.VehicleLength,
PrimaryVehicle.Components.AxleWheels.NumSteeredAxles, PrimaryVehicle.VehicleType);
rd.Retarder =
DataAdapterGeneric.CreateRetarderData(PrimaryVehicle.Components.RetarderInputData);
rd.EngineData.FuelMode = 0;
rd.VehicleData.VehicleClass = _segment.VehicleClass;
rd.BusAuxiliaries =
DataAdapterGeneric.CreateBusAuxiliariesData(mission, PrimaryVehicle, CompletedVehicle, rd);
var shiftStrategyName =
PowertrainBuilder.GetShiftStrategyName(PrimaryVehicle.Components.GearboxInputData.Type,
PrimaryVehicle.VehicleType);
rd.GearboxData = DataAdapterGeneric.CreateGearboxData(PrimaryVehicle, rd,
ShiftPolygonCalculator.Create(shiftStrategyName, rd.GearshiftParameters));
GearboxData gbx = rd.GearboxData;
rd.GearshiftParameters =
DataAdapterGeneric.CreateGearshiftData((rd.AxleGearData?.AxleGear.Ratio ?? 1.0) *
(rd.AngledriveData?.Angledrive.Ratio ?? 1.0),
PrimaryVehicle.EngineIdleSpeed, gbx.Type, gbx.Gears.Count);
rd.HybridStrategyParameters = DataAdapterGeneric.CreateHybridStrategy(
rd.BatteryData,
rd.SuperCapData,
rd.VehicleData.GrossVehicleMass,
ovcHevMode,
rd.Loading,
GetPrimaryGroup(),//DeclarationData.PrimaryBusSegments.Lookup(GetPrimarySegment().VehicleClass, CompletedVehicle.LowEntry, CompletedVehicle.VehicleCode)
rd.Mission.MissionType,
PrimaryVehicle.BoostingLimitations,
rd.GearboxData,
rd.EngineData,
PrimaryVehicle.ArchitectureID
);
SetOvcModeProperties(ovcHevMode, rd);
return rd;
}
protected override VectoRunData CreateVectoRunDataSpecific(Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, int? modeIdx,
OvcHevMode ovcMode = OvcHevMode.NotApplicable)
{
var rd = CreateCommonRunData(mission, loading, _modSuffixSpecific);
DataAdapterGeneric.CreateREESSData(
componentsElectricStorage: PrimaryVehicle.Components.ElectricStorage,
PrimaryVehicle.VehicleType,
true,
(bs) => rd.BatteryData = bs,
(sc) => rd.SuperCapData = sc);
rd.ElectricMachinesData = DataAdapterGeneric.CreateElectricMachines(PrimaryVehicle.Components.ElectricMachines,
PrimaryVehicle.ElectricMotorTorqueLimits, rd.BatteryData.CalculateAverageVoltage(), null);
rd.VehicleData = DataAdapterSpecific.CreateVehicleData(PrimaryVehicle,
CompletedVehicle, _segment, mission, loading);
rd.AirdragData = DataAdapterSpecific.CreateAirdragData(CompletedVehicle, mission);
rd.EngineData =
DataAdapterGeneric.CreateEngineData(PrimaryVehicle, modeIdx.Value, mission);
rd.AxleGearData =
DataAdapterGeneric.CreateAxleGearData(PrimaryVehicle.Components.AxleGearInputData);
rd.AngledriveData =
DataAdapterGeneric.CreateAngledriveData(PrimaryVehicle.Components.AngledriveInputData);
rd.Aux = DataAdapterSpecific.CreateAuxiliaryData(
PrimaryVehicle.Components.AuxiliaryInputData,
PrimaryVehicle.Components.BusAuxiliaries, mission.MissionType, _segment.VehicleClass,
CompletedVehicle.Length, PrimaryVehicle.Components.AxleWheels.NumSteeredAxles, PrimaryVehicle.VehicleType);
rd.Retarder = DataAdapterGeneric.CreateRetarderData(PrimaryVehicle.Components.RetarderInputData);
rd.EngineData.FuelMode = 0;
rd.VehicleData.VehicleClass = _segment.VehicleClass;
rd.BusAuxiliaries =
DataAdapterSpecific.CreateBusAuxiliariesData(mission, PrimaryVehicle, CompletedVehicle,
rd);
CreateGearboxAndGearshiftData(rd);
rd.HybridStrategyParameters = DataAdapterGeneric.CreateHybridStrategy(
rd.BatteryData,
rd.SuperCapData,
rd.VehicleData.GrossVehicleMass,
ovcMode,
rd.Loading,
GetPrimaryGroup(),//DeclarationData.PrimaryBusSegments.Lookup(GetPrimarySegment().VehicleClass, CompletedVehicle.LowEntry, CompletedVehicle.VehicleCode)
rd.Mission.MissionType,
PrimaryVehicle.BoostingLimitations,
rd.GearboxData,
rd.EngineData,
PrimaryVehicle.ArchitectureID
);
SetOvcModeProperties(ovcMode, rd);
return rd;
}
protected override void CreateGearboxAndGearshiftData(VectoRunData runData)
{
var shiftStrategyName =
PowertrainBuilder.GetShiftStrategyName(PrimaryVehicle.Components.GearboxInputData.Type,
PrimaryVehicle.VehicleType);
runData.GearboxData = DataAdapterGeneric.CreateGearboxData(PrimaryVehicle, runData,
ShiftPolygonCalculator.Create(shiftStrategyName, runData.GearshiftParameters));
GearboxData gbx = runData.GearboxData;
runData.GearshiftParameters =
DataAdapterGeneric.CreateGearshiftData((runData.AxleGearData?.AxleGear.Ratio ?? 1.0) *
(runData.AngledriveData?.Angledrive.Ratio ?? 1.0),
PrimaryVehicle.EngineIdleSpeed, gbx.Type, gbx.Gears.Count);
}
#endregion
}
public class HEV_P1 : ParallelHybrid
......@@ -665,6 +815,11 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
public HEV_P4(IMultistageVIFInputData dataProvider, IDeclarationReport report, ISpecificCompletedBusDeclarationDataAdapter dataAdapterSpecific, IGenericCompletedBusDeclarationDataAdapter dataAdapterGeneric) : base(dataProvider, report, dataAdapterSpecific, dataAdapterGeneric) { }
}
#endregion ParallelHybrid
#endregion Hybrid
#region BatteryElectric
public abstract class BatteryElectric : CompletedBusBase
{
public BatteryElectric(IMultistageVIFInputData dataProvider, IDeclarationReport report,
......@@ -851,9 +1006,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
#endregion
}
#endregion BatteryElectric
public class Exempted : CompletedBusBase
public class Exempted : CompletedBusBase
{
public Exempted(IMultistageVIFInputData dataProvider, IDeclarationReport report, ISpecificCompletedBusDeclarationDataAdapter dataAdapterSpecific, IGenericCompletedBusDeclarationDataAdapter dataAdapterGeneric) : base(dataProvider, report, dataAdapterSpecific, dataAdapterGeneric) { }
......
VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
+ 30
− 0
View file @ e44a3fc1
......@@ -4,6 +4,7 @@ using System.Data;
using System.IO;
using System.Linq;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
......@@ -35,6 +36,35 @@ namespace TUGraz.VectoCore.Models.Declaration
#endregion
/// <summary>
/// Look up the hdv group based on the supergroup
/// </summary>
public VehicleClass Lookup(VehicleClass hdvSuperGroup, VehicleCode vehicleCode)
{
var doubleDecker = vehicleCode.IsDoubleDeckerBus();
var floorTyoe = vehicleCode.GetFloorType();
var row = _segmentTable.AsEnumerable().Where(r => {
bool doubleDeckerLookedup = r.Field<string>("doubledecker") == "1" ? true : false;
string floor = r.Field<string>("floortype");
var floorMatches = false;
switch (floor) {
case "high floor":
floorMatches = floorTyoe == FloorType.HighFloor; break;
case "low floor":
floorMatches = floorTyoe == FloorType.LowFloor; break;
default:
throw new VectoException($"Unexpected value in column floor type {floor}");
}
VehicleClass hdvSuperGroupLookedUp = VehicleClassHelper.Parse(r.Field<string>("hdvsupergroup"));
return floorMatches && doubleDecker == doubleDeckerLookedup &&
hdvSuperGroupLookedUp == hdvSuperGroup;
}).Single();
return VehicleClassHelper.Parse(row.Field<string>("hdvgroup"));
}
private Segment LookupPrimaryVehicle(
VehicleCategory vehicleCategory, AxleConfiguration axleConfiguration, bool articulated)
{
......
VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
+ 3
− 1
View file @ e44a3fc1
......@@ -174,7 +174,9 @@ public class PrimaryBusSimulation
var dataProvider = JSONInputDataFactory.ReadJsonJob(filePath);
var fileWriter = new FileOutputWriter(filePath);
var simFactory = _kernel.Get<ISimulatorFactoryFactory>();
var runsFactory = simFactory.Factory(ExecutionMode.Declaration, dataProvider, fileWriter, null, null);
//runsFactory.WriteModalResults = true;
runsFactory.SerializeVectoRunData = true;
var jobContainer = new JobContainer(new SummaryDataContainer(fileWriter)) { };
......@@ -183,7 +185,7 @@ public class PrimaryBusSimulation
jobContainer.AddRuns(runsFactory);
//PrintRuns(jobContainer, null);
jobContainer.Execute();
jobContainer.Execute(multithreaded:true);
jobContainer.WaitFinished();
Assert.IsTrue(jobContainer.AllCompleted);
Assert.IsTrue(jobContainer.Runs.TrueForAll(runEntry => runEntry.Success));
......
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml
+ 1
− 0
View file @ e44a3fc1
......@@ -20,6 +20,7 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>4000</MaxChargingPower>
<vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
......
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