From 0469b5d0510c8fa65a7d309423a879d22fa4350d Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Thu, 23 Mar 2023 11:58:45 +0100
Subject: [PATCH] renamed MultistageVIFInputData to MultistageVifInputData,
renamed parameter multistageVifInputData
---
...eclarationModeMultistageBusVectoRunDataFactory.cs | 2 +-
.../InputData/Reader/VectoRunDataFactoryFactory.cs | 8 ++++----
.../VectoCore/Mockup/Reports/MockupReportFactory.cs | 10 +++++-----
.../VectoMockupRunDataFactoryFactory.cs | 8 ++++----
.../VectoCore/Models/Simulation/Data/VectoRunData.cs | 2 +-
.../VehicleInformationFile_Interim.cs | 12 ++++++------
.../VehicleInformationFile/XMLMultistageBusReport.cs | 8 ++++----
.../OutputData/XML/XMLDeclarationReportFactory.cs | 6 +++---
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
index 2e47fddbc7..a8e816a055 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Report = Report,
Mission = new Mission { MissionType = MissionType.ExemptedMission },
VehicleData = CreateVehicleData(InputDataProvider.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle),
- MultistageVIFInputData = InputDataProvider,
+ MultistageVifInputData = InputDataProvider,
};
}
diff --git a/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs b/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
index 1b43c18fce..34a30be767 100644
--- a/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
@@ -68,15 +68,15 @@ namespace TUGraz.VectoCore.InputData.Reader
}
- private IVectoRunDataFactory CreateRunDataReader(IMultistageVIFInputData multistageVifInputData, IDeclarationReport report)
+ private IVectoRunDataFactory CreateRunDataReader(IMultistageVIFInputData multiStepVifInputData, IDeclarationReport report)
{
- if (multistageVifInputData.VehicleInputData == null) {
+ if (multiStepVifInputData.VehicleInputData == null) {
return _internalFactory.CreateDeclarationCompletedBusRunDataFactory(
new VehicleTypeAndArchitectureStringHelperRundata.VehicleClassification(
- multistageVifInputData), multistageVifInputData, report);
+ multiStepVifInputData), multiStepVifInputData, report);
}
else {
- return new DeclarationModeMultistageBusVectoRunDataFactory(multistageVifInputData, report);
+ return new DeclarationModeMultistageBusVectoRunDataFactory(multiStepVifInputData, report);
}
}
diff --git a/VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs b/VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs
index e841f6e9fc..f664fe115d 100644
--- a/VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs
+++ b/VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs
@@ -72,21 +72,21 @@ namespace TUGraz.VectoMockup.Reports
: null;
}
- private IDeclarationReport CreateDeclarationReport(IMultistageVIFInputData multistageVifInputData, IOutputDataWriter outputDataWriter)
+ private IDeclarationReport CreateDeclarationReport(IMultistageVIFInputData multiStepVifInputData, IOutputDataWriter outputDataWriter)
{
- if (multistageVifInputData.VehicleInputData == null)
+ if (multiStepVifInputData.VehicleInputData == null)
{
var reportCompleted = new XMLDeclarationMockupReportCompletedVehicle(outputDataWriter, _mrfFactory, _cifFactory, _vifFactory,
- multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle)
+ multiStepVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle)
{
- PrimaryVehicleReportInputData = multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle,
+ PrimaryVehicleReportInputData = multiStepVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle,
};
return reportCompleted;
}
else {
var report = new XMLDeclarationMockupReportInterimVehicle(outputDataWriter, _mrfFactory, _cifFactory, _vifFactory, _interimFactory,
- multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle);
+ multiStepVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle);
return report;
}
}
diff --git a/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
index 3d7ce134fc..20f36b793b 100644
--- a/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
+++ b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
@@ -45,17 +45,17 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
throw new VectoException("Unknown InputData for Declaration Mode!");
}
- private IVectoRunDataFactory CreateRunDataReader(IMultistageVIFInputData multistageVifInputData, IDeclarationReport report)
+ private IVectoRunDataFactory CreateRunDataReader(IMultistageVIFInputData multiStepVifInputData, IDeclarationReport report)
{
- if (multistageVifInputData.VehicleInputData == null)
+ if (multiStepVifInputData.VehicleInputData == null)
{
return new MockupMultistageCompletedBusRunDataFactory(
- multistageVifInputData,
+ multiStepVifInputData,
report, new DeclarationDataAdapterSpecificCompletedBus.Conventional(),
new DeclarationDeclarationDataAdapterGenericCompletedBusDeclaration.Conventional());
}
else {
- return new DeclarationModeMultistageBusVectoRunDataFactory(multistageVifInputData, report);
+ return new DeclarationModeMultistageBusVectoRunDataFactory(multiStepVifInputData, report);
}
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index bcb2043ca3..301472af8b 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
public Watt ElectricAuxDemand { get; internal set; }
[JsonIgnore]
- public IMultistageVIFInputData MultistageVIFInputData { get; internal set; }
+ public IMultistageVIFInputData MultistageVifInputData { get; internal set; }
// container to pass genset data from powertrain to post-processing, not filled by dataadapter/rundatafactory
public GenSetData GenSet { get; set; }
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Interim.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Interim.cs
index 287f6703d2..da27bb0822 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Interim.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Interim.cs
@@ -47,14 +47,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public void Initialize(VectoRunData modelData)
{
- //InitializeVehicleData(modelData.MultistageVIFInputData);
+ //InitializeVehicleData(modelData.MultistageVifInputData);
- _primaryVehicleInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.PrimaryVehicle;
- _manufacturingStageInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.ManufacturingStages;
- _consolidatedInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.ConsolidateManufacturingStage;
- _vehicleInputData = modelData.MultistageVIFInputData.VehicleInputData;
+ _primaryVehicleInputData = modelData.MultistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle;
+ _manufacturingStageInputData = modelData.MultistageVifInputData.MultistageJobInputData.JobInputData.ManufacturingStages;
+ _consolidatedInputData = modelData.MultistageVifInputData.MultistageJobInputData.JobInputData.ConsolidateManufacturingStage;
+ _vehicleInputData = modelData.MultistageVifInputData.VehicleInputData;
- _inputData = modelData.MultistageVIFInputData;
+ _inputData = modelData.MultistageVifInputData;
SetInputXMLData(_primaryVehicleInputData.Vehicle.XMLSource);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index 8014f54f46..fded14e85c 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -96,10 +96,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public virtual void Initialize(VectoRunData modelData)
{
- _primaryVehicleInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.PrimaryVehicle;
- _manufacturingStageInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.ManufacturingStages;
- _consolidatedInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.ConsolidateManufacturingStage;
- _vehicleInputData = modelData.MultistageVIFInputData.VehicleInputData;
+ _primaryVehicleInputData = modelData.MultistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle;
+ _manufacturingStageInputData = modelData.MultistageVifInputData.MultistageJobInputData.JobInputData.ManufacturingStages;
+ _consolidatedInputData = modelData.MultistageVifInputData.MultistageJobInputData.JobInputData.ConsolidateManufacturingStage;
+ _vehicleInputData = modelData.MultistageVifInputData.VehicleInputData;
SetInputXMLData(_primaryVehicleInputData.Vehicle.XMLSource);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
index d245d66cc6..0e0eedf895 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
@@ -66,13 +66,13 @@ namespace TUGraz.VectoCore.OutputData.XML
: null;
}
- private IDeclarationReport CreateDeclarationReport(IMultistageVIFInputData multistageVifInputData, IOutputDataWriter outputDataWriter)
+ private IDeclarationReport CreateDeclarationReport(IMultistageVIFInputData multiStepVifInputData, IOutputDataWriter outputDataWriter)
{
- if (multistageVifInputData.VehicleInputData == null)
+ if (multiStepVifInputData.VehicleInputData == null)
{
var reportCompleted = new XMLDeclarationReportCompletedVehicle(outputDataWriter, _mrfFactory, _cifFactory, _vifFactory)
{
- PrimaryVehicleReportInputData = multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle,
+ PrimaryVehicleReportInputData = multiStepVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle,
};
return reportCompleted;
}
--
GitLab