From 4dd33562926d2527df2205346eed897f01283def Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Tue, 19 Oct 2021 16:21:46 +0200
Subject: [PATCH] removed EfficiencyMap at IElectricMotorVoltageLevel interface
because of new PowerMap structure
---
VECTO/GUI/ElectricMotorForm.vb | 4 ++--
.../VectoCommon/InputData/DeclarationInputData.cs | 2 --
.../DataObjectAdapter/EngineeringDataAdapter.cs | 2 +-
.../VectoCore/OutputData/FileIO/JSONFileWriter.cs | 2 +-
VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs | 12 ++++++++----
.../ElectricMotorEfficienyMapTest.cs | 10 ++++++----
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 6cb5287b19..39d9908312 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -185,14 +185,14 @@ Public Class ElectricMotorForm
' tbDragTorqueHi.Text = GetRelativePath(voltageLevelHigh.DragCurve.Source, basePath)
tbMaxTorqueHi.Text = GetRelativePath(voltageLevelHigh.FullLoadCurve.Source, basePath)
- tbMapHi.Text = GetRelativePath(voltageLevelHigh.EfficiencyMap.Source, basePath)
+ ' tbMapHi.Text = GetRelativePath(voltageLevelHigh.EfficiencyMap.Source, basePath) //PowerMap
tbVoltageHi.Text = voltageLevelHigh.VoltageLevel.Value().ToGUIFormat()
Dim voltageLevelLow As IElectricMotorVoltageLevel = engine.VoltageLevels.MinBy(function(level) level.VoltageLevel.Value())
' tbDragTorqueLow.Text = GetRelativePath(voltageLevelLow.DragCurve.Source, basePath)
tbMaxTorqueLow.Text = GetRelativePath(voltageLevelLow.FullLoadCurve.Source, basePath)
- tbMapLow.Text = GetRelativePath(voltageLevelLow.EfficiencyMap.Source, basePath)
+ ' tbMapLow.Text = GetRelativePath(voltageLevelLow.EfficiencyMap.Source, basePath) //PowerMap
tbVoltageLow.Text = voltageLevelLow.VoltageLevel.Value().ToGUIFormat()
DeclInit()
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 219722f28d..36f5bed0a2 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -761,8 +761,6 @@ namespace TUGraz.VectoCommon.InputData
TableData FullLoadCurve { get; } //MaxTorqueCurve
- TableData EfficiencyMap { get; } //PowerMap
-
IList<IElectricMotorPowerMap> PowerMap { get; }
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index ee7142b7d5..b8c9f7ed18 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -805,7 +805,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
Voltage = entry.VoltageLevel,
FullLoadCurve = fullLoadCurveCombined,
// DragCurve = ElectricMotorDragCurveReader.Create(entry.DragCurve, count),
- EfficiencyMap = ElectricMotorMapReader.Create(entry.EfficiencyMap, count),
+ //EfficiencyMap = ElectricMotorMapReader.Create(entry.EfficiencyMap, count), //PowerMap
});
}
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 282e105365..4945fb2b5a 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -96,7 +96,7 @@ public class JSONFileWriter : IOutputFileWriter
vlevel.Add("Voltage", entry.VoltageLevel.Value());
vlevel.Add("FullLoadCurve", GetRelativePath(entry.FullLoadCurve.Source, Path.GetDirectoryName(filename)));
// vlevel.Add("DragCurve", GetRelativePath(entry.DragCurve.Source, Path.GetDirectoryName(filename)));
- vlevel.Add("EfficiencyMap", GetRelativePath(entry.EfficiencyMap.Source, Path.GetDirectoryName(filename)));
+ // vlevel.Add("EfficiencyMap", GetRelativePath(entry.EfficiencyMap.Source, Path.GetDirectoryName(filename))); //PowerMap
vlevels.Add(vlevel);
}
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
index 2f0115a582..06d5c99500 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
@@ -69,7 +69,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(-401.07, fldMap.FullLoadDriveTorque(0.RPMtoRad()).Value());
Assert.AreEqual(401.07, fldMap.FullGenerationTorque(0.RPMtoRad()).Value());
- var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
+ var pwr = inputProvider.VoltageLevels.First().PowerMap.First().PowerMap;
+ // var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
Assert.AreEqual("0", pwr.Rows[0][ElectricMotorMapReader.Fields.MotorSpeed]);
Assert.AreEqual("-800", pwr.Rows[0][ElectricMotorMapReader.Fields.Torque]);
Assert.AreEqual("9.8449", pwr.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
@@ -100,7 +101,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(-401.07, fldMapLow.FullLoadDriveTorque(0.RPMtoRad()).Value());
Assert.AreEqual(401.07, fldMapLow.FullGenerationTorque(0.RPMtoRad()).Value());
- var pwrLow = inputProvider.VoltageLevels.First().EfficiencyMap;
+ var pwrLow = inputProvider.VoltageLevels.First().PowerMap.First().PowerMap;
+ // var pwrLow = inputProvider.VoltageLevels.First().EfficiencyMap;
Assert.AreEqual("0", pwrLow.Rows[0][ElectricMotorMapReader.Fields.MotorSpeed]);
Assert.AreEqual("-800", pwrLow.Rows[0][ElectricMotorMapReader.Fields.Torque]);
Assert.AreEqual("9.8449", pwrLow.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
@@ -123,7 +125,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(-476.284, fldMapHi.FullLoadDriveTorque(0.RPMtoRad()).Value());
Assert.AreEqual(486.284, fldMapHi.FullGenerationTorque(0.RPMtoRad()).Value());
- var pwrHi = inputProvider.VoltageLevels.Last().EfficiencyMap;
+ var pwrHi = inputProvider.VoltageLevels.Last().PowerMap.First().PowerMap;
+ // var pwrHi = inputProvider.VoltageLevels.Last().EfficiencyMap;
Assert.AreEqual("0", pwrHi.Rows[0][ElectricMotorMapReader.Fields.MotorSpeed]);
Assert.AreEqual("-800", pwrHi.Rows[0][ElectricMotorMapReader.Fields.Torque]);
Assert.AreEqual("8.86041", pwrHi.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
@@ -188,7 +191,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(-802.14, fldMap.FullLoadDriveTorque(50.RPMtoRad()).Value(), 1e-3);
Assert.AreEqual(802.14, fldMap.FullGenerationTorque(50.RPMtoRad()).Value(), 1e-3);
- var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
+ var pwr = inputProvider.VoltageLevels.First().PowerMap.First().PowerMap; //ToDo FK: maybe wrong selection
+ // var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
Assert.AreEqual("0", pwr.Rows[0][ElectricMotorMapReader.Fields.MotorSpeed]);
Assert.AreEqual("-800", pwr.Rows[0][ElectricMotorMapReader.Fields.Torque]);
Assert.AreEqual("9.8449", pwr.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
index a861e21b08..17c18496e3 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
@@ -29,7 +29,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
var fld = inputProvider.VoltageLevels.First().FullLoadCurve;
var fldMap = ElectricFullLoadCurveReader.Create(fld, 1);
- var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
+ var pwr = inputProvider.VoltageLevels.First().PowerMap.First().PowerMap; //ToDo FK: maybe wrong selection
+ // var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
var pwrMap = ElectricMotorMapReader.Create(pwr, 1);
var maxEmPwr = batPwr < 0
@@ -52,9 +53,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
JSONInputDataFactory.ReadElectricMotorData(@"TestData\Hybrids\ElectricMotor\GenericEMotor.vem", false);
var fld = inputProvider.VoltageLevels.First().FullLoadCurve;
- var fldMap = ElectricFullLoadCurveReader.Create(fld, 1);
-
- var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
+ var fldMap = ElectricFullLoadCurveReader.Create(fld, 1);
+
+ var pwr = inputProvider.VoltageLevels.First().PowerMap.First().PowerMap;//ToDo FK: maybe wrong selection
+ // var pwr = inputProvider.VoltageLevels.First().EfficiencyMap;
var pwrMap = ElectricMotorMapReader.Create(pwr, 1);
var maxEmPwr = batPwr < 0
--
GitLab