From 0d57a27c56d8849b1126d5e773a051ce82c59757 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 26 Apr 2016 15:27:32 +0200
Subject: [PATCH] use fulloadcurvereader
---
.../Reader/DataObjectAdaper/DeclarationDataAdapter.cs | 2 +-
.../Reader/DataObjectAdaper/EngineeringDataAdapter.cs | 3 ++-
.../SimulationComponent/Data/Engine/EngineFullLoadCurve.cs | 5 +++--
.../VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs | 2 +-
VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs | 2 +-
.../Integration/SimulationRuns/FullPowertrain.cs | 2 +-
VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs | 2 +-
.../Models/Simulation/LossMapRangeValidationTest.cs | 2 +-
.../VectoCoreTest/Models/SimulationComponent/GearboxTest.cs | 2 +-
.../Models/SimulationComponentData/GearboxDataTest.cs | 5 +++--
10 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
index 68d56bd9a1..6cc610ec6e 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
@@ -192,7 +192,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
var gearLossMap = TransmissionLossMap.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1));
var gearFullLoad = gear.FullLoadCurve == null
? engine.FullLoadCurve
- : FullLoadCurve.Create(gear.FullLoadCurve, true);
+ : FullLoadCurveReader.Create(gear.FullLoadCurve, true);
var fullLoadCurve = IntersectFullLoadCurves(engine.FullLoadCurve, gearFullLoad);
var shiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(i, fullLoadCurve, gears, engine, axlegearRatio,
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
index 64f0e0f054..480caa8f3e 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
@@ -37,6 +37,7 @@ using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
@@ -151,7 +152,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
retVal.Gears = gears.Select((gear, i) => {
var lossMap = TransmissionLossMap.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1));
var gearFullLoad = gear.FullLoadCurve != null
- ? FullLoadCurve.Create(gear.FullLoadCurve)
+ ? FullLoadCurveReader.Create(gear.FullLoadCurve)
: null;
var fullLoadCurve = IntersectFullLoadCurves(engineData.FullLoadCurve, gearFullLoad);
var shiftPolygon = gear.ShiftPolygon != null
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
index e30fbacb47..2e91ec58bf 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
@@ -36,6 +36,7 @@ using System.Diagnostics.Contracts;
using System.Dynamic;
using System.Linq;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
@@ -52,13 +53,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
public static EngineFullLoadCurve ReadFromFile(string fileName, bool declarationMode = false)
{
- var curve = FullLoadCurve.ReadFromFile(fileName, declarationMode, true);
+ var curve = FullLoadCurveReader.ReadFromFile(fileName, declarationMode, true);
return new EngineFullLoadCurve { FullLoadEntries = curve.FullLoadEntries, PT1Data = curve.PT1Data };
}
public static EngineFullLoadCurve Create(DataTable data, bool declarationMode = false)
{
- var curve = FullLoadCurve.Create(data, declarationMode, true);
+ var curve = FullLoadCurveReader.Create(data, declarationMode, true);
return new EngineFullLoadCurve() { FullLoadEntries = curve.FullLoadEntries, PT1Data = curve.PT1Data };
}
diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index adb23aec1f..a6ac20f2dd 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -86,7 +86,7 @@ namespace TUGraz.VectoCore.Tests.Integration
Gears = ratios.Select((ratio, i) =>
Tuple.Create((uint)i,
new GearData {
- FullLoadCurve = FullLoadCurve.ReadFromFile(GearboxFullLoadCurveFile),
+ FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap = (ratio != 1.0)
? TransmissionLossMap.ReadFromFile(GearboxIndirectLoss, ratio,
string.Format("Gear {0}", i))
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 3afa5d6a47..9c00644641 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.Tests.Integration
Gears = ratios.Select((ratio, i) =>
Tuple.Create((uint)i,
new GearData {
- FullLoadCurve = FullLoadCurve.ReadFromFile(GearboxFullLoadCurveFile),
+ FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap = (ratio != 1.0)
? TransmissionLossMap.ReadFromFile(GearboxIndirectLoss, ratio,
string.Format("Gear {0}", i))
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index e43ddae43b..1a960727ff 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -308,7 +308,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
Gears = ratios.Select((ratio, i) =>
Tuple.Create((uint)i,
new GearData {
- FullLoadCurve = FullLoadCurve.ReadFromFile(GearboxFullLoadCurveFile),
+ FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap =
TransmissionLossMap.ReadFromFile(GearboxLossMap, ratio, string.Format("Gear {0}", i)),
Ratio = ratio,
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index 3d6bc4f8dd..28e9ae59cb 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -125,7 +125,7 @@ namespace TUGraz.VectoCore.Tests.Integration
Gears = ratios.Select((ratio, i) =>
Tuple.Create((uint)i,
new GearData {
- FullLoadCurve = FullLoadCurve.ReadFromFile(GearboxFullLoadCurveFile),
+ FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap = TransmissionLossMap.ReadFromFile(ratio != 1.0 ? GearboxIndirectLoss : GearboxDirectLoss, ratio,
string.Format("Gear {0}", i)),
Ratio = ratio,
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
index a330749feb..d1d43423d7 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
@@ -137,7 +137,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Gears = ratios.Select((ratio, i) =>
Tuple.Create((uint)i,
new GearData {
- FullLoadCurve = FullLoadCurve.ReadFromFile(GearboxFullLoadCurveFile),
+ FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap = TransmissionLossMap.ReadFromFile(ratio != 1.0 ? directlossMap : indirectLossMap, ratio,
string.Format("Gear {0}", i)),
Ratio = ratio,
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index a83fce3b30..72fd4cfd39 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Gears = ratios.Select((ratio, i) =>
Tuple.Create((uint)i,
new GearData {
- FullLoadCurve = FullLoadCurve.ReadFromFile(GearboxFullLoadCurveFile),
+ FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap = TransmissionLossMap.ReadFromFile(i != 6 ? IndirectLossMap : DirectLossMap, ratio,
string.Format("Gear {0}", i)),
Ratio = ratio,
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
index 5751539a1b..432cacc77c 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
@@ -36,6 +36,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
@@ -313,7 +314,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
var engineFLD = EngineFullLoadCurve.Create(dataEng, true);
var dataGbx = VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("n [U/min],Mfull [Nm]", gbxFLDString));
- var gbxFLD = FullLoadCurve.Create(dataGbx, true);
+ var gbxFLD = FullLoadCurveReader.Create(dataGbx, true);
var fullLoadCurve = AbstractSimulationDataAdapter.IntersectFullLoadCurves(engineFLD, gbxFLD);
@@ -336,7 +337,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
};
var dataGbx = VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("n [U/min],Mfull [Nm]", gbxFLDString));
- var gbxFLD = FullLoadCurve.Create(dataGbx, true);
+ var gbxFLD = FullLoadCurveReader.Create(dataGbx, true);
var maxTorque = gbxFLD.FullLoadStationaryTorque(800.RPMtoRad());
Assert.AreEqual(750, maxTorque.Value());
--
GitLab