diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index 8b40896aa7e4ee7d6c33fbcbf4d63876a27e8381..02e14fc4f3ab00062c11853c688120fea7215b3f 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 5157c02e1bd013584f112bd71976cc5e9787a0ae..d27ad891731d05635a0f5050674d309254b13ac8 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -46,6 +46,7 @@ Imports TUGraz.VectoCommon.Resources
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore
Imports TUGraz.VectoCore.InputData.FileIO.XML
+Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponents
Imports TUGraz.VectoCore.Models.Simulation
Imports TUGraz.VectoCore.Models.Simulation.Data
Imports TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
@@ -1060,14 +1061,20 @@ lbFound:
Dim initSOC = Double.Parse(tbInitSOCinPercent.Text) / 100
+
+
If(runData.HybridStrategyParameters IsNot Nothing)
runData.HybridStrategyParameters.InitialSoc = initSOC
- runData.HybridStrategyParameters.TargetSoC = initSOC - 1
+ runData.HybridStrategyParameters.TargetSoC = initSOC - 0.01
End If
If(runData.BatteryData IsNot Nothing)
runData.BatteryData.InitialSoc = initSOC
End If
+
+ If(runData.SuperCapData IsNot Nothing)
+ runData.SuperCapData.InitialSoC = initSOC
+ End If
End If
runData.IterativeRunStrategy.Enabled = Not cbCSIteratingModeDeactivated.Checked
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 9e1a01f78139d08f8df200b30b2968ad33a3abbe..09b694c8ac8b49ed935795f63b1c2049dc4ee84d 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -4632,6 +4632,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Sucht eine lokalisierte Zeichenfolge, die charge sustaining ähnelt.
+ /// </summary>
+ public static string Results_Report_OVCModeAttr_ChargeSustaining {
+ get {
+ return ResourceManager.GetString("Results_Report_OVCModeAttr_ChargeSustaining", resourceCulture);
+ }
+ }
+
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die RetarderDataDeclarationType ähnelt.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index fa848583d3e15104476dfc301bd6e77fbb84c978..71ac4fea48f4d94a2d42f367c36267d67fde6a80 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1914,127 +1914,130 @@
<data name="REESS" xml:space="preserve">
<value>ElectricEnergyStorage</value>
</data>
-<data name="MRF_OutputDataType_ConventionalLorryManufacturerOutputDataType" xml:space="preserve">
- <value>ConventionalLorryManufacturerOutputDataType</value>
-</data>
-<data name="MRF_OutputDataType_ConventionalPrimaryBusManufacturerOutputDataType" xml:space="preserve">
- <value>ConventionalPrimaryBusManufacturerOutputDataType</value>
-</data>
-<data name="CIF_OutputDataType_ConventionalLorryOutputType" xml:space="preserve">
- <value>ConventionalLorryOutputType</value>
-</data>
-<data name="MRF_OutputDataType_HEV_Px_IHPCLorryManufacturerOutputDataType" xml:space="preserve">
- <value>HEV-Px_IHPCLorryManufacturerOutputDataType</value>
-</data>
-<data name="MRF_OutputDataType_HEV_S2_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>HEV-S2_LorryManufacturerOutputDataType</value>
-</data>
-<data name="CIF_OutputDataType_HEV_S2_LorryOutputType" xml:space="preserve">
- <value>HEV_S2_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_HEV_S3_LorryOutputType" xml:space="preserve">
- <value>HEV_S3_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_HEV_S4_LorryOutputType" xml:space="preserve">
- <value>HEV_S4_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_HEV_IEPC_S_LorryOutputType" xml:space="preserve">
- <value>HEV_IEPC_S_LorryOutputType</value>
-</data>
-<data name="MRF_OutputDataType_HEV_S3_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>HEV-S3_LorryManufacturerOutputDataType</value>
-</data>
-<data name="MRF_OutputDataType_HEV_S4_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>HEV-S4_LorryManufacturerOutputDataType</value>
-</data>
-<data name="MRF_OutputDataType_HEV_IEPC_S_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>HEV-IEPC-S_LorryManufacturerOutputDataType</value>
-</data>
-<data name="CIF_OutputDataType_HEV_Px_LorryOutputType" xml:space="preserve">
- <value>HEV_Px_LorryOutputType</value>
-</data>
-<data name="MRF_OutputDataType_PEV_E2_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>PEV-E2_LorryManufacturerOutputDataType</value>
-</data>
-<data name="MRF_OutputDataType_PEV_E3_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>PEV-E3_LorryManufacturerOutputDataType</value>
-</data>
-<data name="MRF_OutputDataType_PEV_E4_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>PEV-E4_LorryManufacturerOutputDataType</value>
-</data>
-<data name="MRF_OutputDataType_PEV_IEPC_LorryManufacturerOutputDataType" xml:space="preserve">
- <value>PEV-IEPC_LorryManufacturerOutputDataType</value>
-</data>
-<data name="CIF_OutputDataType_PEV_E2_LorryOutputType" xml:space="preserve">
- <value>PEV_E2_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_PEV_E3_LorryOutputType" xml:space="preserve">
- <value>PEV_E3_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_PEV_E4_LorryOutputType" xml:space="preserve">
- <value>PEV_E4_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_PEV_IEPC_LorryOutputType" xml:space="preserve">
- <value>PEV_IEPC_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_Exempted_LorryOutputType" xml:space="preserve">
- <value>Exempted_LorryOutputType</value>
-</data>
-<data name="CIF_OutputDataType_Exempted_CompletedBusOutputType" xml:space="preserve">
- <value>Exempted_CompletedBusOutputType</value>
-</data>
-<data name="BusAux_Clutch" xml:space="preserve">
- <value>Clutch</value>
-</data>
-<data name="ElectricMachine_P2_5GearRatios_Gear_Attr" xml:space="preserve">
- <value>gear</value>
-</data>
-<data name="XSIType" xml:space="preserve">
- <value>type</value>
-</data>
-<data name="Report_Results_PrimaryVehicleSubgroup" xml:space="preserve">
- <value>PrimaryVehicleSubgroup</value>
-</data>
-<data name="Results_Report_OVCModeAttr_ChargeDepleting" xml:space="preserve">
- <value>charge depleting</value>
-</data>
-<data name="Results_Report_OVCModeAttr" xml:space="preserve">
- <value>type</value>
-</data>
-<data name="Report_Results_OVCMode" xml:space="preserve">
- <value>OVCMode</value>
-</data>
-<data name="Report_ResultEntry_ActualChargeDepletingRange" xml:space="preserve">
- <value>ActualChargeDepletingRange</value>
-</data>
-<data name="Report_ResultEntry_EquivalentAllElectricRange" xml:space="preserve">
- <value>EquivalentAllElectricRange</value>
-</data>
-<data name="Report_ResultEntry_ZeroCO2EmissionsRange" xml:space="preserve">
- <value>ZeroCO2EmissionsRange</value>
-</data>
-<data name="Report_ResultEntry_Total" xml:space="preserve">
- <value>Total</value>
-</data>
-<data name="Report_ResultEntry_FCZEVAuxHeater" xml:space="preserve">
- <value>FC_ZEV_AuxHeater</value>
-</data>
-<data name="Report_ResultEntry_CO2ZEVAuxHeater" xml:space="preserve">
- <value>CO2_ZEV_AuxHeater</value>
-</data>
-<data name="Report_ResultEntry_ElectricEnergyConsumption" xml:space="preserve">
- <value>ElectricEnergy</value>
-</data>
-<data name="Report_ResultEntry_VIF_ElectricEnergyConsumption" xml:space="preserve">
- <value>ElectricEnergyConsumption</value>
-</data>
-<data name="Report_Results_Status_Error_Val" xml:space="preserve">
- <value>error</value>
-</data>
-<data name="Report_Results_Status_Success_Val" xml:space="preserve">
- <value>success</value>
-</data>
-<data name="VehicleGroupCO2" xml:space="preserve">
- <value>VehicleGroupCO2</value>
-</data>
+ <data name="MRF_OutputDataType_ConventionalLorryManufacturerOutputDataType" xml:space="preserve">
+ <value>ConventionalLorryManufacturerOutputDataType</value>
+ </data>
+ <data name="MRF_OutputDataType_ConventionalPrimaryBusManufacturerOutputDataType" xml:space="preserve">
+ <value>ConventionalPrimaryBusManufacturerOutputDataType</value>
+ </data>
+ <data name="CIF_OutputDataType_ConventionalLorryOutputType" xml:space="preserve">
+ <value>ConventionalLorryOutputType</value>
+ </data>
+ <data name="MRF_OutputDataType_HEV_Px_IHPCLorryManufacturerOutputDataType" xml:space="preserve">
+ <value>HEV-Px_IHPCLorryManufacturerOutputDataType</value>
+ </data>
+ <data name="MRF_OutputDataType_HEV_S2_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>HEV-S2_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="CIF_OutputDataType_HEV_S2_LorryOutputType" xml:space="preserve">
+ <value>HEV_S2_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_HEV_S3_LorryOutputType" xml:space="preserve">
+ <value>HEV_S3_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_HEV_S4_LorryOutputType" xml:space="preserve">
+ <value>HEV_S4_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_HEV_IEPC_S_LorryOutputType" xml:space="preserve">
+ <value>HEV_IEPC_S_LorryOutputType</value>
+ </data>
+ <data name="MRF_OutputDataType_HEV_S3_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>HEV-S3_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="MRF_OutputDataType_HEV_S4_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>HEV-S4_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="MRF_OutputDataType_HEV_IEPC_S_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>HEV-IEPC-S_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="CIF_OutputDataType_HEV_Px_LorryOutputType" xml:space="preserve">
+ <value>HEV_Px_LorryOutputType</value>
+ </data>
+ <data name="MRF_OutputDataType_PEV_E2_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>PEV-E2_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="MRF_OutputDataType_PEV_E3_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>PEV-E3_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="MRF_OutputDataType_PEV_E4_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>PEV-E4_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="MRF_OutputDataType_PEV_IEPC_LorryManufacturerOutputDataType" xml:space="preserve">
+ <value>PEV-IEPC_LorryManufacturerOutputDataType</value>
+ </data>
+ <data name="CIF_OutputDataType_PEV_E2_LorryOutputType" xml:space="preserve">
+ <value>PEV_E2_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_PEV_E3_LorryOutputType" xml:space="preserve">
+ <value>PEV_E3_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_PEV_E4_LorryOutputType" xml:space="preserve">
+ <value>PEV_E4_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_PEV_IEPC_LorryOutputType" xml:space="preserve">
+ <value>PEV_IEPC_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_Exempted_LorryOutputType" xml:space="preserve">
+ <value>Exempted_LorryOutputType</value>
+ </data>
+ <data name="CIF_OutputDataType_Exempted_CompletedBusOutputType" xml:space="preserve">
+ <value>Exempted_CompletedBusOutputType</value>
+ </data>
+ <data name="BusAux_Clutch" xml:space="preserve">
+ <value>Clutch</value>
+ </data>
+ <data name="ElectricMachine_P2_5GearRatios_Gear_Attr" xml:space="preserve">
+ <value>gear</value>
+ </data>
+ <data name="XSIType" xml:space="preserve">
+ <value>type</value>
+ </data>
+ <data name="Report_Results_PrimaryVehicleSubgroup" xml:space="preserve">
+ <value>PrimaryVehicleSubgroup</value>
+ </data>
+ <data name="Results_Report_OVCModeAttr_ChargeDepleting" xml:space="preserve">
+ <value>charge depleting</value>
+ </data>
+ <data name="Results_Report_OVCModeAttr" xml:space="preserve">
+ <value>type</value>
+ </data>
+ <data name="Report_Results_OVCMode" xml:space="preserve">
+ <value>OVCMode</value>
+ </data>
+ <data name="Report_ResultEntry_ActualChargeDepletingRange" xml:space="preserve">
+ <value>ActualChargeDepletingRange</value>
+ </data>
+ <data name="Report_ResultEntry_EquivalentAllElectricRange" xml:space="preserve">
+ <value>EquivalentAllElectricRange</value>
+ </data>
+ <data name="Report_ResultEntry_ZeroCO2EmissionsRange" xml:space="preserve">
+ <value>ZeroCO2EmissionsRange</value>
+ </data>
+ <data name="Report_ResultEntry_Total" xml:space="preserve">
+ <value>Total</value>
+ </data>
+ <data name="Report_ResultEntry_FCZEVAuxHeater" xml:space="preserve">
+ <value>FC_ZEV_AuxHeater</value>
+ </data>
+ <data name="Report_ResultEntry_CO2ZEVAuxHeater" xml:space="preserve">
+ <value>CO2_ZEV_AuxHeater</value>
+ </data>
+ <data name="Report_ResultEntry_ElectricEnergyConsumption" xml:space="preserve">
+ <value>ElectricEnergy</value>
+ </data>
+ <data name="Report_ResultEntry_VIF_ElectricEnergyConsumption" xml:space="preserve">
+ <value>ElectricEnergyConsumption</value>
+ </data>
+ <data name="Report_Results_Status_Error_Val" xml:space="preserve">
+ <value>error</value>
+ </data>
+ <data name="Report_Results_Status_Success_Val" xml:space="preserve">
+ <value>success</value>
+ </data>
+ <data name="VehicleGroupCO2" xml:space="preserve">
+ <value>VehicleGroupCO2</value>
+ </data>
+ <data name="Results_Report_OVCModeAttr_ChargeSustaining" xml:space="preserve">
+ <value>charge sustaining</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultWriter.cs
index 76e6015cee89d6341829f5136c200d0e7e9931d6..5d446df67cadf4562d94143d97021cc76fcbabf9 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultWriter.cs
@@ -143,7 +143,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
public override XElement GetElement(IResultEntry entry)
{
return new XElement(TNS + XMLNames.Report_Results_OVCMode,
- new XAttribute(XMLNames.Results_Report_OVCModeAttr, XMLNames.Results_Report_OVCModeAttr_ChargeDepleting),
+ new XAttribute(XMLNames.Results_Report_OVCModeAttr, XMLNames.Results_Report_OVCModeAttr_ChargeSustaining),
_factory.GetVehiclePerformanceLorry(_factory, TNS).GetElement(entry),
entry.FuelData.Select(f =>
_factory.GetFuelConsumptionLorry(_factory, TNS).GetElement(entry, entry.FuelConsumptionFinal(f.FuelType))),
@@ -257,7 +257,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
public override XElement GetElement(IResultEntry entry)
{
return new XElement(TNS + XMLNames.Report_Results_OVCMode,
- new XAttribute(XMLNames.Results_Report_OVCModeAttr, XMLNames.Results_Report_OVCModeAttr_ChargeDepleting),
+ new XAttribute(XMLNames.Results_Report_OVCModeAttr, XMLNames.Results_Report_OVCModeAttr_ChargeSustaining),
_factory.GetVehiclePerformanceBus(_factory, TNS).GetElement(entry),
//new XElement(TNS + XMLNames.Report_ResultEntry_AverageSpeed, XMLHelper.ValueAsUnit(entry.AverageSpeed, XMLNames.Unit_kmph, 1)),
entry.FuelData.Select(f =>
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ResultWriter/ResultWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ResultWriter/ResultWriter.cs
index 173e7f1160641e0a18ef94c0832f4a7f70b8bcc3..221f09f3dc5887ddaf64a12e03ca474937cc4a26 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ResultWriter/ResultWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ResultWriter/ResultWriter.cs
@@ -138,7 +138,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
#region Overrides of VIFOVCCModeWriter
- public override string OVCMode => XMLNames.Results_Report_OVCModeAttr_ChargeDepleting;
+ public override string OVCMode => XMLNames.Results_Report_OVCModeAttr_ChargeSustaining;
#endregion
}