From b63495140606af626292ae6d6f84c77df24fe782 Mon Sep 17 00:00:00 2001
From: Harald Martini <harald.martini@student.tugraz.at>
Date: Tue, 16 Aug 2022 14:45:03 +0200
Subject: [PATCH] implemented ovchev and maxcharging power in
XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01
---
.../DataProvider/XMLDeclarationVehicleDataProvider.cs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index ed054c69f2..bd3952c6ef 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -553,14 +553,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
public virtual Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> ElectricMotorTorqueLimits { get; }
public virtual TableData BoostingLimitations { get; }
-
public virtual string VehicleTypeApprovalNumber { get; }
-
-
public virtual IVehicleComponentsDeclaration Components => _components ?? (_components = ComponentReader.ComponentInputData);
public virtual ArchitectureID ArchitectureID => ElementExists(XMLNames.Vehicle_ArchitectureID) ? ArchitectureIDHelper.Parse(GetString(XMLNames.Vehicle_ArchitectureID)) : ArchitectureID.UNKNOWN;
- public virtual bool OvcHev { get; }
- public virtual Watt MaxChargingPower { get; }
+ public virtual bool OvcHev => ElementExists(XMLNames.Vehicle_OvcHev) && GetBool(XMLNames.Vehicle_OvcHev);
+ public virtual Watt MaxChargingPower => ElementExists(XMLNames.Vehicle_MaxChargingPower) ? GetDouble(XMLNames.Vehicle_MaxChargingPower).SI<Watt>() : null;
#region Non seeded Properties
--
GitLab