diff --git a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh
index 3602729e7e3ced9b439fca29a2144745c06c0dde..8a84bb5ff02a190d5d6b07de670c12c615c528bc 100644
--- a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh
+++ b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh
@@ -1,7 +1,7 @@
-{
+{
"Header": {
"CreatedBy": "",
- "Date": "2019-12-03T16:56:30.4122138Z",
+ "Date": "2022-01-26T08:54:53.5628568Z",
"AppVersion": "3",
"FileVersion": 8
},
@@ -11,28 +11,11 @@
"LegislativeClass": "Unknown",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
- "Loading": 19300.0,
"MassMax": 18.0,
+ "Loading": 19300.0,
"rdyn": 492.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "Retarder": {
- "Type": "secondary",
- "Ratio": 1.0,
- "File": "Default.vrlm"
- },
- "Angledrive": {
- "Type": "None",
- "Ratio": 0.0,
- "LossMap": ""
- },
- "PTO": {
- "Type": "None",
- "LossMap": "",
- "Cycle": ""
- },
- "TorqueLimits": {},
- "IdlingSpeed": 0.0,
"AxleConfig": {
"Type": "4x2",
"Axles": [
@@ -84,10 +67,28 @@
]
},
"EngineStopStart": false,
- "EcoRoll": "None",
- "PredictiveCruiseControl": "None",
+ "EcoRoll": "WithoutEngineStop",
+ "PredictiveCruiseControl": "Option_1_2_3",
"ATEcoRollReleaseLockupClutch": false,
"CdA": 5.3,
- "VehicleHeight": 0.0
+ "VehicleHeight": 0.0,
+ "IdlingSpeed": 0.0,
+ "Retarder": {
+ "Type": "secondary",
+ "Ratio": 1.0,
+ "File": "Default.vrlm"
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": "",
+ "CycleDriving": ""
+ },
+ "TorqueLimits": {}
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto
index 5549443574ace22bf7455ed68df430ec79dc31e9..6c50201d0b36ecb9bbdb464c461990f58a180569 100644
--- a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto
+++ b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-03-03T09:04:48.6087237Z",
+ "Date": "2022-01-26T09:00:21.8597275Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -12,7 +12,6 @@
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
- "ShiftStrategy": "",
"Padd": 5000.0,
"Paux_ICEOff_Driving": 3000.0,
"Paux_ICEOff_Standstill": 2000.0,
@@ -20,6 +19,7 @@
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
"EngineStopStartUtilityFactor": 0.8,
+ "EngineStopStartUtilityFactorDriving": 0.8,
"EcoRollMinSpeed": 60.000000000000007,
"EcoRollActivationDelay": 2.0,
"EcoRollUnderspeedThreshold": 0.0,
@@ -45,7 +45,7 @@
"OverSpeed": 5.0
},
"Cycles": [
- "Long_Haul+ES.vdri"
+ "E:\\QUAM\\Downloads\\CoachCycle\\Coach_short_HW.vdri"
]
}
}
\ No newline at end of file
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 70aaab2ba722bb1feb32d4c849dd6f7282677c79..dfe3c093bd8bca83847b3503fbd0855296dfcf57 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -902,7 +902,12 @@ end Property
End Get
End Property
- Public ReadOnly Property XMLSource As XmlNode Implements IAdvancedDriverAssistantSystemDeclarationInputData.XMLSource
+ Public ReadOnly Property NumSteeredAxles As Integer? Implements IAxlesDeclarationInputData.NumSteeredAxles
+ get
+ return nothing
+ End Get
+ End Property
+ Public ReadOnly Property XMLSource As XmlNode Implements IAdvancedDriverAssistantSystemDeclarationInputData.XMLSource
Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
Public ReadOnly Property ArchitectureID As ArchitectureID Implements IVehicleDeclarationInputData.ArchitectureID
Public ReadOnly Property OvcHev As Boolean Implements IVehicleDeclarationInputData.OvcHev
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs
index 97c194b88d1633123a82426ceb6421550b3cb29c..a1880347bb904087987f87e11bfc904a2827c2cf 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs
@@ -48,6 +48,8 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle.Components
public IList<IAxleDeclarationInputData> AxlesDeclaration =>
AxleViewModels.Cast<IAxleDeclarationInputData>().ToList();
+ public int? NumSteeredAxles => null;
+
public XmlNode XMLSource => _xmlSource;
}
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 58bc4d96609781f9f7f140c4a81e263a11497d5d..ffa5440acdf37bf51c1a711a4d94de66f506a514 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -254,6 +254,8 @@ namespace TUGraz.VectoCommon.InputData
/// </summary>
IList<IAxleDeclarationInputData> AxlesDeclaration { get; }
+ int? NumSteeredAxles { get; }
+
XmlNode XMLSource { get; }
}
@@ -457,9 +459,9 @@ namespace TUGraz.VectoCommon.InputData
ITyreDeclarationInputData Tyre { get; }
DataSource DataSource { get; }
-
- bool Steered { get; }
- }
+
+ bool Steered { get; }
+ }
public interface ITyreDeclarationInputData : IComponentInputData
{
diff --git a/VectoCommon/VectoCommon/Utils/SI.cs b/VectoCommon/VectoCommon/Utils/SI.cs
index f41f07245d0052ded32fb5049fd9c23aa6649b60..cd11bb53b0187e69e378850caf12716bff0aa5c2 100644
--- a/VectoCommon/VectoCommon/Utils/SI.cs
+++ b/VectoCommon/VectoCommon/Utils/SI.cs
@@ -1456,7 +1456,7 @@ namespace TUGraz.VectoCommon.Utils
/// <param name="val">The value.</param>
/// <param name="unitFactor"></param>
/// <param name="units">The units.</param>
- [DebuggerHidden]
+ //[DebuggerHidden]
protected SI(double val, double unitFactor, int[] units)
{
Val = val;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index d34603e5d125066ad7be1861f811bc63d45d820d..3985a3abdf15e2cdf8901d6779160d11efc6a839 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -308,6 +308,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
IVehicleComponentsEngineering IVehicleEngineeringInputData.Components => this;
+ public int? NumSteeredAxles => null;
XmlNode IVehicleDeclarationInputData.XMLSource => null;
public virtual string VehicleTypeApprovalNumber { get; }
public ArchitectureID ArchitectureID { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
index 4041fd877cfa3a749cee94e9ddbb89bd59259bbe..7181384e6fac40f491ed5319857a53f8e4e3d220 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
@@ -30,6 +30,7 @@
*/
using System.Collections.Generic;
+using System.Linq;
using System.Xml;
using System.Xml.Linq;
using TUGraz.VectoCommon.Exceptions;
@@ -95,6 +96,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
+ public int? NumSteeredAxles=> AxlesDeclaration.Count(x => x.Steered);
+
public XmlNode XMLSource => BaseNode;
#endregion
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
index d0be389f2411ea3f0f10de36d04f026563da846d..0a36841a9952039f1a9fcfd89741de120fe7db1e 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
@@ -218,7 +218,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected VectoRunData CreateVectoRunDataSpecific(Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, int modeIdx)
{
var cycle = DeclarationData.CyclesCache.GetOrAdd(mission.MissionType, _ => DrivingCycleDataReader.ReadFromStream(mission.CycleFile, CycleType.DistanceBased, "", false));
- var numSteeredAxles = PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered);
+ var numSteeredAxles = PrimaryVehicle.Components.AxleWheels.NumSteeredAxles;
var simulationRunData = new VectoRunData {
Loading = loading.Key,
@@ -269,7 +269,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
AngledriveData = _angledriveData,
Aux = DataAdapterGeneric.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
primaryBusAuxiliaries, mission.MissionType, primarySegment.VehicleClass,
- mission.BusParameter.VehicleLength, PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ mission.BusParameter.VehicleLength, PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverData,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index 7bbcf8a900b016df1a411c9b83dcf19f83e5c068..baeba8a41c51a797cccec0fc376049139df02c27 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
AngledriveData = _angledriveData,
Aux = DataAdapterSpecific.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
PrimaryVehicle.Components.BusAuxiliaries, mission.MissionType, _segmentCompletedBus.VehicleClass, CompletedVehicle.Length,
- PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverData,
@@ -292,7 +292,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Aux = DataAdapterGeneric.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
primaryBusAuxiliaries, mission.MissionType, primarySegment.VehicleClass,
mission.BusParameter.VehicleLength,
- PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverData,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
index 5e165e4ada0398d0fcd84673a3b954546c118c9a..d07214774fe8ad549d74b8855be47d178cf83cd4 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
@@ -165,7 +165,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
vehicle.Components.AuxiliaryInputData,
vehicle.Components.BusAuxiliaries, mission.MissionType,
_segment.VehicleClass, vehicle.Length,
- vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ vehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverdata,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
index bf87fba39115fd94560935d2b9d71bd9e0366e5f..b4dfa81ff8cb72c4ff9f5ddfa89d4bcf764dba5d 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
vehicle.Components.AuxiliaryInputData,
vehicle.Components.BusAuxiliaries, mission.MissionType, _segment.VehicleClass,
vehicle.Length ?? mission.BusParameter.VehicleLength,
- vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ vehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverdata,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
index 2802c869d7f700f34fe38866c84b6d72819a8b00..b397c4bc184f0312e47a4bee36ff52cb5302a49c 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
Aux = DataAdapter.CreateAuxiliaryData(vehicle.Components.AuxiliaryInputData,
vehicle.Components.BusAuxiliaries, mission.MissionType,
_segment.VehicleClass, vehicle.Length ?? mission.BusParameter.VehicleLength,
- vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ vehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverdata,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
index 468cae22cb84a07898091fb27905fa713ca90b5c..574d77a8497ddf95411de146f8765e0371d9a992 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
@@ -120,12 +120,12 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
JobInputData.Vehicle.Components.BusAuxiliaries,
missionType,
Segment.VehicleClass, JobInputData.Vehicle.Length,
- JobInputData.Vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered));
+ JobInputData.Vehicle.Components.AxleWheels.NumSteeredAxles);
}
protected virtual List<VectoRunData.AuxData> CreateVTPAuxData(IVehicleDeclarationInputData vehicle)
{
- var numSteered = vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered);
+ var numSteered = vehicle.Components.AxleWheels.NumSteeredAxles;
var auxRD = Dao.CreateAuxiliaryData(
vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.RegionalDelivery, Segment.VehicleClass, vehicle.Length, numSteered)
.ToList();
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index e8c249af168970033b953dbf60a4ea4fd68ca9fe..add7faf080d2476f993ab2efb5189dcee970c9af 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -74,7 +74,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
case VectoSimulationJobType.BatteryElectricVehicle:
return GetBatteryElectricVehicleRunData();
default:
- throw new ArgumentOutOfRangeException();
+ throw new ArgumentOutOfRangeException($"Invalid JobType {InputDataProvider.JobInputData.JobType}");
}
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index ffc8be13bd2317627a4ad87a9778617732c2e0bd..617872a0bd98102a5a00fc5a18add5fe78cffa85 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
@@ -10,6 +10,7 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1" schemaLocation="VectoDeclarationDefinitions.2.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
</xs:schema>
diff --git a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
index 6d198dcf89cf8e85da868b651e2f52138126dd35..258f8d9668b62488919f21c44d6d16a8f63c545a 100644
--- a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
@@ -277,7 +277,7 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers
public IVehicleEngineeringInputData Vehicle { get; set; }
public IHybridStrategyParameters HybridStrategyParameters { get; }
public IList<ICycleData> Cycles { get; set; }
- public VectoSimulationJobType JobType { get; }
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
public bool EngineOnlyMode => false;
public IEngineEngineeringInputData EngineOnly => null;
public TableData PTOCycleWhileDrive { get; set; }
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 0d6a30ca91032ac382c94b56a1bf8662afe33629..2ca51d1fc96915837fb6b2351a431318ace89b92 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -1213,6 +1213,9 @@
<None Include="TestData\Hybrids\GenericVehicle_Group5_P2_BatSystem\Hybrid_Parameters.vhctl">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Hybrids\GenericVehicle_Group5_P2_BatSystem\Interurban_Short.vdri">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Hybrids\GenericVehicle_Group5_P2_BatSystem\MaxCurrent.vimax">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 7b67c6a129caa3df120c394dc5ac61f15802c808..c953f429177e094f02dfd04e86fa2c484abeabaa 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<PrimaryVehicle>
- <Data id="VEH-dda89003b1894b738e01" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+ <Data id="VEH-bce95de06ff54c85bca9" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -265,13 +265,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-b24e106754644462913e">
+ <di:Reference URI="#RESULT-75ce50bbcc114a1a8fa8">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>tCwhy15j1jcO+sj2PNaNEQEcczz0hoj6BhzdsLxMHlo=</di:DigestValue>
+ <di:DigestValue>nFutXxdSkqt7h2WAMbnJuL50CjfABdvcu9V30e0y1NI=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -587,17 +587,17 @@
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.7.7.2547-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2022-01-27T14:55:40.5963202Z</Date>
+ <Date>2022-02-04T13:12:27.6775278Z</Date>
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#VEH-dda89003b1894b738e01">
+ <di:Reference URI="#VEH-bce95de06ff54c85bca9">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>TqJtY535jeu6qydOprHVzvXTRScAKSj4mkDwzpx1y6A=</di:DigestValue>
+ <di:DigestValue>3nwxGv2EIt273Cowtnqnd99NijSf4E6945LbLgs886M=</di:DigestValue>
</di:Reference>
</Signature>
</PrimaryVehicle>