From 2637b1d0801ffb83f9938dda85d00db0d4cb163d Mon Sep 17 00:00:00 2001
From: Harald Martini <harald.martini@student.tugraz.at>
Date: Tue, 16 Aug 2022 14:45:44 +0200
Subject: [PATCH] implemented properties taken from primary vehicle in
consolidated vehicle
---
.../XMLDeclarationMultistageInputReader.cs | 48 +++++++++++++------
1 file changed, 34 insertions(+), 14 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index 14f4b96240..c8bbb71626 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -607,26 +607,46 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
}
+ #region Properties taken from primary vehicle
public AxleConfiguration AxleConfiguration => _primaryVehicle.Vehicle.AxleConfiguration;
public IList<ITorqueLimitInputData> TorqueLimits { get; }
+ public bool HybridElectricHDV => _primaryVehicle.Vehicle.HybridElectricHDV;
- public PerSecond EngineIdleSpeed { get; }
- public bool VocationalVehicle { get; }
- public bool? SleeperCab { get; }
- public bool ZeroEmissionVehicle { get; }
- public bool HybridElectricHDV { get; }
- public bool DualFuelVehicle { get; }
- public Watt MaxNetPower1 { get; }
- public Watt MaxNetPower2 { get; }
- public string ExemptedTechnology { get; }
-
- public CubicMeter CargoVolume { get; }
+ public bool ZeroEmissionVehicle => _primaryVehicle.Vehicle.ZeroEmissionVehicle;
+
+ public bool VocationalVehicle => _primaryVehicle.Vehicle.VocationalVehicle;
+ public bool? SleeperCab => _primaryVehicle.Vehicle.SleeperCab;
+
+ public bool DualFuelVehicle => _primaryVehicle.Vehicle.DualFuelVehicle;
+
+ public bool OvcHev => _primaryVehicle.Vehicle.OvcHev;
+
+ public PerSecond EngineIdleSpeed => _primaryVehicle.Vehicle.EngineIdleSpeed;
+
+ public Watt MaxNetPower1 => _primaryVehicle.Vehicle.MaxNetPower1;
+ public Watt MaxNetPower2 => _primaryVehicle.Vehicle.MaxNetPower2;
+ public string ExemptedTechnology => _primaryVehicle.Vehicle.ExemptedTechnology;
+
+ public ArchitectureID ArchitectureID => _primaryVehicle.Vehicle.ArchitectureID;
+
+ public Watt MaxChargingPower => _primaryVehicle.Vehicle.MaxChargingPower;
+
+ #endregion
+
+
+
+
+
+
+
+
+ public CubicMeter CargoVolume { get; }
public bool Articulated { get; }
public XmlNode XMLSource { get; }
- public ArchitectureID ArchitectureID { get; }
- public bool OvcHev { get; }
- public Watt MaxChargingPower { get; }
+
+
+
#endregion
--
GitLab