renamed MultistageVIFInputData to MultistageVifInputData, renamed parameter multistageVifInputData

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,
 			};
 		}
 		

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);
 			}
 		}
 

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;
             }
         }

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);
 			}
 		}
 

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; }

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);
 		}

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);
 		}

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;
 			}