From 22399ac8f3d6fb195c6f5c41ad830a3e0880d64a Mon Sep 17 00:00:00 2001
From: Harald Martini <harald.martini@student.tugraz.at>
Date: Tue, 10 May 2022 10:44:43 +0200
Subject: [PATCH] Revert "added IDeclarationInputDataProvider argument to
InitializeReport"
This reverts commit fa87e45e1e4d9bd5d50d7c14a78347ffd5c80d21.
---
.../AbstractDeclarationVectoRunDataFactory.cs | 2 +-
.../SimulationFactoryNinjectModule.cs | 6 ++--
.../VectoCore/OutputData/DeclarationReport.cs | 6 ++--
.../AbstractManufacturerReport.cs | 2 +-
.../VTPReport/XMLVTPReport.cs | 3 +-
.../OutputData/XML/XMLDeclarationReport.cs | 8 +----
.../XMLDeclarationReportCompletedVehicle.cs | 3 +-
...MLDeclarationReportMultistageBusVehicle.cs | 4 +--
.../XML/XMLDeclarationReportPrimaryVehicle.cs | 4 +--
.../XML/XMLDeclarationReport_0_9.cs | 29 ++++++++++---------
10 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs
index 8939c26cba..dbf110ae22 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs
@@ -139,7 +139,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
fuels = vehicle.Components.EngineInputData.EngineModes.Select(x => x.Fuels.Select(f => DeclarationData.FuelData.Lookup(f.FuelType, vehicle.TankSystem)).ToList())
.ToList();
}
- Report.InitializeReport(powertrainConfig, fuels, InputDataProvider);
+ Report.InitializeReport(powertrainConfig, fuels);
}
protected virtual PTOData CreateDefaultPTOData()
diff --git a/VectoCore/VectoCore/Models/Simulation/SimulationFactoryNinjectModule.cs b/VectoCore/VectoCore/Models/Simulation/SimulationFactoryNinjectModule.cs
index df0140a393..20cce3d9ef 100644
--- a/VectoCore/VectoCore/Models/Simulation/SimulationFactoryNinjectModule.cs
+++ b/VectoCore/VectoCore/Models/Simulation/SimulationFactoryNinjectModule.cs
@@ -68,8 +68,7 @@ namespace TUGraz.VectoCore.Models.Simulation
{
#region Implementation of IDeclarationReport
- public void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null)
+ public void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
}
@@ -93,8 +92,7 @@ namespace TUGraz.VectoCore.Models.Simulation
{
#region Implementation of IDeclarationReport
- public void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null)
+ public void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
}
diff --git a/VectoCore/VectoCore/OutputData/DeclarationReport.cs b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
index ec58eca4b0..3aeb1536c5 100644
--- a/VectoCore/VectoCore/OutputData/DeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
@@ -51,8 +51,7 @@ namespace TUGraz.VectoCore.OutputData
* This methodd is called once befor creating the simulation runs with a temporary
* VectoRunData instance
*/
- void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null);
+ void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes);
/**
* called when creating the simulation run (before starting the simulations)
@@ -210,7 +209,6 @@ namespace TUGraz.VectoCore.OutputData
protected abstract void WriteResult(T result);
- public abstract void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null);
+ public abstract void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes);
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
index 35425cabf9..c15a18d6b1 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
@@ -34,7 +34,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
-
+ throw new NotImplementedException();
}
public XDocument Report { get; protected set; }
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs
index 2d45d072dd..c3e2338ebd 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs
@@ -345,8 +345,7 @@ namespace TUGraz.VectoCore.OutputData.XML
return retVal;
}
- public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null)
+ public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehicleClass = modelData.VehicleData.VehicleClass;
if (VehicleClass.IsBus()) {
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index 58b1724e04..94eb0b2430 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -226,8 +226,7 @@ namespace TUGraz.VectoCore.OutputData.XML
}
- public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null)
+ public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
if (modelData.Exempted) {
WeightingGroup = WeightingGroup.Unknown;
@@ -248,11 +247,6 @@ namespace TUGraz.VectoCore.OutputData.XML
InstantiateReports(modelData);
- InitializeReports(modelData, fuelModes, inputData);
- }
-
- protected virtual void InitializeReports(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes, IDeclarationInputDataProvider inputData)
- {
ManufacturerRpt.Initialize(modelData, fuelModes);
CustomerRpt.Initialize(modelData, fuelModes);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
index 820f4038a6..18d8a1e85e 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
@@ -37,8 +37,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
};
}
- public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null)
+ public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
_weightingFactors = EqualWeighting;
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
index 850afd8c3b..c2ba057037 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
@@ -20,8 +19,7 @@ namespace TUGraz.VectoCore.OutputData.XML
//_multistageBusReport = new XMLMultistageBusReport();
}
- public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null)
+ public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
_multistageBusReport =
modelData.Exempted ? new XMLMultistageExemptedBusReport() : new XMLMultistageBusReport();
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
index 8d6d135ebc..36bdb48f59 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Xml.Linq;
-using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile;
@@ -41,8 +40,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
}
- public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes,
- IDeclarationInputDataProvider inputData = null)
+ public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
base.InitializeReport(modelData, fuelModes);
PrimaryReport.Initialize(modelData,fuelModes);
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
index 7f2294e174..a238b5905b 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
-using System.Runtime.CompilerServices;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
@@ -8,41 +7,42 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9.CIFWriter;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport;
-using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
namespace TUGraz.VectoCore.OutputData.XML
{
- public class XMLDeclarationReport09 : XMLDeclarationReport
+ public class XMLDeclarationReport09 : IDeclarationReport
{
private readonly IReportWriter _writer;
private readonly IManufacturerReportFactory _mrfFactory;
private readonly ICustomerInformationFileFactory _cifFactory;
+ private IXMLManufacturerReport _manufacturerReport;
+ private IXMLCustomerReport _customerReport;
#region Implementation of IDeclarationReport
- public XMLDeclarationReport09(IReportWriter writer, IManufacturerReportFactory mrfFactory, ICustomerInformationFileFactory cifFactory) : base(writer)
+ public XMLDeclarationReport09(IReportWriter writer, IManufacturerReportFactory mrfFactory, ICustomerInformationFileFactory cifFactory)
{
_writer = writer;
_mrfFactory = mrfFactory;
_cifFactory = cifFactory;
}
- protected override void InstantiateReports(VectoRunData modelData)
+ public void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
var vehicleData = modelData.VehicleData.InputData;
var iepc = vehicleData.Components.IEPC != null;
var ihpc =
vehicleData.Components.ElectricMachines?.Entries?.Count(e => e.ElectricMachine.IHPCType != "None") > 0;
- ManufacturerRpt = _mrfFactory.GetManufacturerReport(vehicleData.VehicleCategory,
+ _manufacturerReport = _mrfFactory.GetManufacturerReport(vehicleData.VehicleCategory,
vehicleData.VehicleType,
vehicleData.ArchitectureID,
vehicleData.ExemptedVehicle,
iepc,
ihpc);
- CustomerRpt = _cifFactory.GetCustomerReport(vehicleData.VehicleCategory,
+ _customerReport = _cifFactory.GetCustomerReport(vehicleData.VehicleCategory,
vehicleData.VehicleType,
vehicleData.ArchitectureID,
vehicleData.ExemptedVehicle,
@@ -50,17 +50,18 @@ namespace TUGraz.VectoCore.OutputData.XML
ihpc);
}
- #region Overrides of XMLDeclarationReport
+ public void PrepareResult(LoadingType loading, Mission mission, int fuelMode, VectoRunData runData)
+ {
+ throw new System.NotImplementedException();
+ }
- protected override void InitializeReports(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes, IDeclarationInputDataProvider inputData)
+ public void AddResult(LoadingType loadingType, Mission mission, int fuelMode, VectoRunData runData,
+ IModalDataContainer modData)
{
- var customerReport = CustomerRpt as AbstractCustomerReport;
- var manufacturerReport = ManufacturerRpt as AbstractManufacturerReport;
- customerReport.InitializeVehicleData(inputData);
- manufacturerReport.InitializeVehicleData(inputData);
+ throw new System.NotImplementedException();
}
- #endregion
+
#endregion
}
--
GitLab