From 92fd9b268d4de01ebf589f6771b694933866ee27 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 23 Feb 2016 17:55:39 +0100
Subject: [PATCH] adapt DataObjectAdapters
---
.../DataObjectAdaper/AbstractSimulationDataAdapter.cs | 10 +++++-----
.../Reader/DataObjectAdaper/DeclarationDataAdapter.cs | 10 +++++-----
.../Reader/DataObjectAdaper/EngineeringDataAdapter.cs | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs b/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
index 326e3a5c1d..6f27196c2c 100644
--- a/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
{
// =========================
- internal VehicleData SetCommonVehicleData(IVehicleInputData data)
+ internal VehicleData SetCommonVehicleData(IVehicleDeclarationInputData data)
{
var retVal = new VehicleData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
IntegrityStatus = data.IntegrityStatus,
VehicleCategory = data.VehicleCategory,
AxleConfiguration = data.AxleConfiguration,
- CurbWeight = data.CurbWeight,
+ CurbWeight = data.CurbWeightChassis,
//CurbWeigthExtra = data.CurbWeightExtra.SI<Kilogram>(),
//Loading = data.Loading.SI<Kilogram>(),
GrossVehicleMassRating = data.GrossVehicleMassRating,
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retVal;
}
- internal RetarderData SetCommonRetarderData(IRetarderInputData data, IVehicleInputData vehicle)
+ internal RetarderData SetCommonRetarderData(IRetarderInputData data, IVehicleDeclarationInputData vehicle)
{
var retarder = new RetarderData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
@@ -78,7 +78,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retarder;
}
- internal CombustionEngineData SetCommonCombustionEngineData(IEngineInputData data)
+ internal CombustionEngineData SetCommonCombustionEngineData(IEngineDeclarationInputData data)
{
var retVal = new CombustionEngineData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
@@ -99,7 +99,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retVal;
}
- internal GearboxData SetCommonGearboxData(IGearboxInputData data)
+ internal GearboxData SetCommonGearboxData(IGearboxDeclarationInputData data)
{
return new GearboxData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs b/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
index 9d694fb158..af7ce93c28 100644
--- a/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
+++ b/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
@@ -68,7 +68,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retVal;
}
- internal VehicleData CreateVehicleData(IVehicleInputData data, Mission mission, Kilogram loading)
+ internal VehicleData CreateVehicleData(IVehicleDeclarationInputData data, Mission mission, Kilogram loading)
{
if (!data.SavedInDeclarationMode) {
WarnDeclarationMode("VehicleData");
@@ -120,7 +120,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retVal;
}
- internal CombustionEngineData CreateEngineData(IEngineInputData engine)
+ internal CombustionEngineData CreateEngineData(IEngineDeclarationInputData engine)
{
if (!engine.SavedInDeclarationMode) {
WarnDeclarationMode("EngineData");
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retVal;
}
- internal GearboxData CreateGearboxData(IGearboxInputData gearbox, CombustionEngineData engine)
+ internal GearboxData CreateGearboxData(IGearboxDeclarationInputData gearbox, CombustionEngineData engine)
{
if (!gearbox.SavedInDeclarationMode) {
WarnDeclarationMode("GearboxData");
@@ -186,7 +186,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
}
- public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesInputData auxInputData,
+ public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesDeclarationInputData auxInputData,
MissionType mission, VehicleClass hvdClass)
{
if (!auxInputData.SavedInDeclarationMode) {
@@ -247,7 +247,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
Log.Warn("{0} not in Declaration Mode!", inputData);
}
- public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleInputData vehicle)
+ public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleDeclarationInputData vehicle)
{
return SetCommonRetarderData(retarder, vehicle);
}
diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs b/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
index 501153e4c4..8fabe6f85d 100644
--- a/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
+++ b/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
@@ -33,7 +33,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
{
public class EngineeringDataAdapter : AbstractSimulationDataAdapter
{
- internal VehicleData CreateVehicleData(IVehicleInputData data)
+ internal VehicleData CreateVehicleData(IVehicleEngineeringInputData data)
{
if (data.SavedInDeclarationMode) {
WarnEngineeringMode("VehicleData");
@@ -82,7 +82,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
Log.Warn("{0} is in Declaration Mode but is used for Engineering Mode!", msg);
}
- internal CombustionEngineData CreateEngineData(IEngineInputData engine)
+ internal CombustionEngineData CreateEngineData(IEngineEngineeringInputData engine)
{
if (engine.SavedInDeclarationMode) {
WarnEngineeringMode("EngineData");
@@ -95,7 +95,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retVal;
}
- internal GearboxData CreateGearboxData(IGearboxInputData gearbox, CombustionEngineData engineData)
+ internal GearboxData CreateGearboxData(IGearboxEngineeringInputData gearbox, CombustionEngineData engineData)
{
if (gearbox.SavedInDeclarationMode) {
WarnEngineeringMode("GearboxData");
@@ -144,7 +144,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
return retVal;
}
- public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesInputData auxInputData)
+ public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesEngineeringInputData auxInputData)
{
if (auxInputData.SavedInDeclarationMode) {
WarnEngineeringMode("AuxData");
@@ -197,7 +197,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
}
//=================================
- public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleInputData vehicle)
+ public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleEngineeringInputData vehicle)
{
return SetCommonRetarderData(retarder, vehicle);
}
--
GitLab