From 1f5a621602402ec3f18d46d4397ceb5a949b6dff Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Wed, 12 Apr 2023 17:45:10 +0200
Subject: [PATCH] support for battery system with standard values
---
VECTO/GUI/BatteryForm.vb | 4 ++--
VECTO/Input Files/Battery.vb | 4 ++--
VECTO/Input Files/Vehicle.vb | 4 ++--
VectoCore/VectoCore/VectoCore.csproj | 4 +---
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/VECTO/GUI/BatteryForm.vb b/VECTO/GUI/BatteryForm.vb
index d7e065ff66..6889801cd1 100644
--- a/VECTO/GUI/BatteryForm.vb
+++ b/VECTO/GUI/BatteryForm.vb
@@ -196,8 +196,8 @@ Public Class BatteryForm
tbSoCCurve.Text = GetRelativePath(battery.VoltageCurve.Source, basePath)
tbRiCurve.Text = GetRelativePath(battery.InternalResistanceCurve.Source, basePath)
tbTestingTempB.Text = battery.TestingTemperature.AsDegCelsius.ToGUIFormat()
- cbJunctionBoxIncl.Checked = battery.JunctionboxIncluded
- cbConnectorsIncluded.Checked = battery.ConnectorsSubsystemsIncluded
+ cbJunctionBoxIncl.Checked = battery.JunctionboxIncluded.Value
+ cbConnectorsIncluded.Checked = battery.ConnectorsSubsystemsIncluded.Value
tbSuperCapCapacity.Text = String.Empty
tbSuperCapMaxV.Text = string.Empty
diff --git a/VECTO/Input Files/Battery.vb b/VECTO/Input Files/Battery.vb
index b3decfc430..93c8d46abe 100644
--- a/VECTO/Input Files/Battery.vb
+++ b/VECTO/Input Files/Battery.vb
@@ -231,8 +231,8 @@ Public Class Battery
End Get
End Property
- Public Property ConnectorsSubsystemsIncluded As Boolean Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
- Public Property JunctionboxIncluded As Boolean Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
+ Public Property ConnectorsSubsystemsIncluded As Boolean? Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
+ Public Property JunctionboxIncluded As Boolean? Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
Public Property TestingTemperature As Kelvin Implements IBatteryPackDeclarationInputData.TestingTemperature
Public ReadOnly Property InternalResistanceCurve As TableData Implements IBatteryPackDeclarationInputData.InternalResistanceCurve
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 869df8dbe2..50c83e932a 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -1073,8 +1073,8 @@ Public Class ElectricStorageWrapper
Public ReadOnly Property MaxSOC As Double? Implements IBatteryPackDeclarationInputData.MaxSOC
Public ReadOnly Property BatteryType As BatteryType Implements IBatteryPackDeclarationInputData.BatteryType
Public ReadOnly Property Capacity As AmpereSecond Implements IBatteryPackDeclarationInputData.Capacity
- Public ReadOnly Property ConnectorsSubsystemsIncluded As Boolean Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
- Public ReadOnly Property JunctionboxIncluded As Boolean Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
+ Public ReadOnly Property ConnectorsSubsystemsIncluded As Boolean? Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
+ Public ReadOnly Property JunctionboxIncluded As Boolean? Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
Public ReadOnly Property TestingTemperature As Kelvin Implements IBatteryPackDeclarationInputData.TestingTemperature
Public ReadOnly Property InternalResistanceCurve As TableData Implements IBatteryPackDeclarationInputData.InternalResistanceCurve
Public ReadOnly Property VoltageCurve As TableData Implements IBatteryPackDeclarationInputData.VoltageCurve
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 29f2324063..f9351dbe39 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -116,9 +116,7 @@
</ItemGroup>
<ItemGroup>
- <InternalsVisibleTo Include="VectoAPI" />
- <InternalsVisibleTo Include="VectoEngineeringAPI" />
- <InternalsVisibleTo Include="VectoXML" />
+ <InternalsVisibleTo Include="VectoXML" />
<InternalsVisibleTo Include="XMLTest" />
<InternalsVisibleTo Include="VECTO" />
<InternalsVisibleTo Include="VectoCoreTest" />
--
GitLab