diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
index 9110544bd593abc67cc6a92ec33791d9fa658982..ef0b026cffb7bf2e5278212a0d582840bf2ca357 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
switch (retarder.Type) {
case RetarderType.Primary:
case RetarderType.Secondary:
- retarder.LossMap = RetarderLossMap.Create(data.LossMap);
+ retarder.LossMap = RetarderLossMapReader.Create(data.LossMap);
retarder.Ratio = data.Ratio;
break;
case RetarderType.None:
@@ -147,10 +147,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
TransmissionLossMap axleLossMap;
try {
- axleLossMap = TransmissionLossMap.Create(data.LossMap, data.Ratio, "AxleGear");
+ axleLossMap = TransmissionLossMapReader.Create(data.LossMap, data.Ratio, "AxleGear");
} catch (InvalidFileFormatException) {
if (useEfficiencyFallback)
- axleLossMap = TransmissionLossMap.Create(data.Efficiency, data.Ratio, "AxleGear");
+ axleLossMap = TransmissionLossMapReader.Create(data.Efficiency, data.Ratio, "AxleGear");
else {
throw;
}
@@ -200,12 +200,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
AngularGear = new TransmissionData { Ratio = data.Ratio }
};
try {
- angularGear.AngularGear.LossMap = TransmissionLossMap.Create(data.LossMap, data.Ratio, "AngularGear");
+ angularGear.AngularGear.LossMap = TransmissionLossMapReader.Create(data.LossMap, data.Ratio, "AngularGear");
} catch (VectoException ex) {
Log.Info("AngularGear Loss Map not found.");
if (useEfficiencyFallback) {
Log.Info("AngularGear Trying with Efficiency instead of Loss Map.");
- angularGear.AngularGear.LossMap = TransmissionLossMap.Create(data.Efficiency, data.Ratio, "AngularGear");
+ angularGear.AngularGear.LossMap = TransmissionLossMapReader.Create(data.Efficiency, data.Ratio, "AngularGear");
} else {
throw new VectoException("AngularGear: LossMap not found.", ex);
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 116010cb45326f3340edfa23c5c835e196e9e3b1..5d026e44907e484d17c3cf1cac13ed028d1b3239 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -197,10 +197,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
if (gear.LossMap == null) {
throw new InvalidFileFormatException(string.Format("LossMap for Gear {0} is missing.", i + 1));
}
- gearLossMap = TransmissionLossMap.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1));
+ gearLossMap = TransmissionLossMapReader.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1));
} catch (InvalidFileFormatException) {
if (useEfficiencyFallback) {
- gearLossMap = TransmissionLossMap.Create(gear.Efficiency, gear.Ratio, string.Format("Gear {0}", i + 1));
+ gearLossMap = TransmissionLossMapReader.Create(gear.Efficiency, gear.Ratio, string.Format("Gear {0}", i + 1));
} else {
throw;
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 0d3b4cbe16b88fc1682ced035d4c631506197310..5202186f3ce7d3ad5118fdfdaac78ba445b2851f 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -145,9 +145,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.Gears = gears.Select((gear, i) => {
TransmissionLossMap lossMap;
if (gear.LossMap != null)
- lossMap = TransmissionLossMap.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1));
+ lossMap = TransmissionLossMapReader.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1));
else if (useEfficiencyFallback)
- lossMap = TransmissionLossMap.Create(gear.Efficiency, gear.Ratio, string.Format("Gear {0}", i + 1));
+ lossMap = TransmissionLossMapReader.Create(gear.Efficiency, gear.Ratio, string.Format("Gear {0}", i + 1));
else {
throw new InvalidFileFormatException("Gear {0} LossMap or Efficiency missing.", i + 1);
}
@@ -202,7 +202,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
AccelerationCurveData accelerationData = null;
if (driver.AccelerationCurve != null) {
- accelerationData = AccelerationCurveData.Create(driver.AccelerationCurve);
+ accelerationData = AccelerationCurveReader.Create(driver.AccelerationCurve);
}
var lookAheadData = new DriverData.LACData {
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index ce38c1997713813b7cbc4bf6e6e25cd3c152d6f9..a2da101383dea4ee7effe178661d77d56bcbe654 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -66,7 +66,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
InputDataProvider.VehicleInputData.AxleConfiguration,
InputDataProvider.VehicleInputData.GrossVehicleMassRating, InputDataProvider.VehicleInputData.CurbWeightChassis);
var driverdata = dao.CreateDriverData(InputDataProvider.DriverInputData);
- driverdata.AccelerationCurve = AccelerationCurveData.ReadFromStream(segment.AccelerationFile);
+ driverdata.AccelerationCurve = AccelerationCurveReader.ReadFromStream(segment.AccelerationFile);
var tempVehicle = dao.CreateVehicleData(InputDataProvider.VehicleInputData, segment.Missions.First(),
segment.Missions.First().Loadings.First().Value);
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index e7753b6634cc97b85afda16d4ccf36d4b82af243..3a7dedfcd90f7b988f828b4ca0ec8cfa26d6ed09 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -131,7 +131,12 @@
<Compile Include="Models\Connector\Ports\Impl\Response.cs" />
<Compile Include="Models\Connector\Ports\IFvPort.cs" />
<Compile Include="Models\Connector\Ports\ITnPort.cs" />
+ <Compile Include="InputData\Reader\ComponentData\AccelerationCurveReader.cs" />
<Compile Include="Models\SimulationComponent\Data\AngularGearData.cs" />
+ <Compile Include="InputData\Reader\ComponentData\TransmissionLossMapReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\RetarderLossMapReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\TorqueConverterDataReader.cs" />
+ <Compile Include="Models\SimulationComponent\Impl\TorqueConverter.cs" />
<Compile Include="Utils\ProviderExtensions.cs" />
<Compile Include="Models\Declaration\AirDrag.cs" />
<Compile Include="Models\Declaration\Fan.cs" />
@@ -149,7 +154,7 @@
<Compile Include="Models\Declaration\Wheels.cs" />
<Compile Include="Models\Declaration\WHTCCorrection.cs" />
<Compile Include="Models\SimulationComponent\Data\CrosswindCorrectionCdxALookup.cs" />
- <Compile Include="Models\SimulationComponent\Data\CrossWindCorrectionCurveReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\CrossWindCorrectionCurveReader.cs" />
<Compile Include="Models\SimulationComponent\Data\AuxiliaryData.cs" />
<Compile Include="Models\SimulationComponent\Data\AuxSupplyPowerReader.cs" />
<Compile Include="Models\SimulationComponent\Data\AxleGearData.cs" />
diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index 0d889a00838c3a9badaa5b1681d05fdaef5fe505..f08757e55b0edf7482cf2c5f737212185106c9a0 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -119,8 +119,8 @@ namespace TUGraz.VectoCore.Tests.Integration
new GearData {
FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap = ratio.IsEqual(1)
- ? TransmissionLossMap.ReadFromFile(GearboxIndirectLoss, ratio, string.Format("Gear {0}", i))
- : TransmissionLossMap.ReadFromFile(GearboxDirectLoss, ratio, string.Format("Gear {0}", i)),
+ ? TransmissionLossMapReader.ReadFromFile(GearboxIndirectLoss, ratio, string.Format("Gear {0}", i))
+ : TransmissionLossMapReader.ReadFromFile(GearboxDirectLoss, ratio, string.Format("Gear {0}", i)),
Ratio = ratio,
ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile)
}))
@@ -145,7 +145,7 @@ namespace TUGraz.VectoCore.Tests.Integration
return new AxleGearData {
AxleGear = new GearData {
Ratio = ratio,
- LossMap = TransmissionLossMap.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
+ LossMap = TransmissionLossMapReader.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
}
};
}
@@ -193,7 +193,7 @@ namespace TUGraz.VectoCore.Tests.Integration
private static DriverData CreateDriverData(string accelerationFile, bool overspeed = false)
{
return new DriverData {
- AccelerationCurve = AccelerationCurveData.ReadFromFile(accelerationFile),
+ AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = true,
//MinSpeed = 50.KMPHtoMeterPerSecond(),
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 734a48b373424f690e546ab0b8d9e6cd1b714ac9..07e47ed28cc4fd84f053a56b04f077c0b3c1b898 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -121,8 +121,8 @@ namespace TUGraz.VectoCore.Tests.Integration
new GearData {
FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap = ratio.IsEqual(1)
- ? TransmissionLossMap.ReadFromFile(GearboxIndirectLoss, ratio, string.Format("Gear {0}", i))
- : TransmissionLossMap.ReadFromFile(GearboxDirectLoss, ratio, string.Format("Gear {0}", i)),
+ ? TransmissionLossMapReader.ReadFromFile(GearboxIndirectLoss, ratio, string.Format("Gear {0}", i))
+ : TransmissionLossMapReader.ReadFromFile(GearboxDirectLoss, ratio, string.Format("Gear {0}", i)),
Ratio = ratio,
ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile)
}))
@@ -147,7 +147,7 @@ namespace TUGraz.VectoCore.Tests.Integration
return new AxleGearData {
AxleGear = new GearData {
Ratio = ratio,
- LossMap = TransmissionLossMap.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
+ LossMap = TransmissionLossMapReader.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
}
};
}
@@ -195,7 +195,7 @@ namespace TUGraz.VectoCore.Tests.Integration
private static DriverData CreateDriverData(string accelerationFile, bool overspeed = false)
{
return new DriverData {
- AccelerationCurve = AccelerationCurveData.ReadFromFile(accelerationFile),
+ AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = true,
//MinSpeed = 50.KMPHtoMeterPerSecond(),
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index 73e36b2edd5617d2740a64fc8628b0888515eb6c..cf5529dab582b016e1d0d3680c431e0eab87800d 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -306,7 +306,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
new GearData {
// TODO mk-2016-05-09: add realistic FullLoadCurve for gearbox - gearbox will have only 1 constant value as full load
FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
- LossMap = TransmissionLossMap.ReadFromFile(GearboxLossMap, ratio, string.Format("Gear {0}", i)),
+ LossMap = TransmissionLossMapReader.ReadFromFile(GearboxLossMap, ratio, string.Format("Gear {0}", i)),
Ratio = ratio,
ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile)
}))
@@ -330,7 +330,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
return new AxleGearData {
AxleGear = new GearData {
Ratio = ratio,
- LossMap = TransmissionLossMap.ReadFromFile(AxleLossMap, ratio, "AxleGear")
+ LossMap = TransmissionLossMapReader.ReadFromFile(AxleLossMap, ratio, "AxleGear")
}
};
}
@@ -343,7 +343,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
{
1, new GearData {
FullLoadCurve = null,
- LossMap = TransmissionLossMap.ReadFromFile(GearboxLossMap, ratio, "Gear 1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(GearboxLossMap, ratio, "Gear 1"),
Ratio = ratio,
ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile)
}
@@ -403,7 +403,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
private static DriverData CreateDriverData(string accelerationFile)
{
return new DriverData {
- AccelerationCurve = AccelerationCurveData.ReadFromFile(accelerationFile),
+ AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = false,
//Deceleration = -0.5.SI<MeterPerSquareSecond>()
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index 8c7f127015a4ff910bccab0da2ee16d3313f5b0b..a24ab0bced905e0e1ee8797a8d7820cf3d3a000f 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -250,7 +250,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
return new AxleGearData() {
AxleGear = new GearData {
Ratio = 3.0 * 3.5,
- LossMap = TransmissionLossMap.ReadFromFile(GbxLossMap, 3.0 * 3.5, "AxleGear")
+ LossMap = TransmissionLossMapReader.ReadFromFile(GbxLossMap, 3.0 * 3.5, "AxleGear")
}
};
}
@@ -296,7 +296,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
private static DriverData CreateDriverData(string accelerationFile)
{
return new DriverData {
- AccelerationCurve = AccelerationCurveData.ReadFromFile(accelerationFile),
+ AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = false,
//Deceleration = -0.5.SI<MeterPerSquareSecond>()
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index ae4ad0c609414b9cc0af103ee61771a5b857bad8..b7bcfd76a24825e460d7b024b07f208927e5db9e 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -138,7 +138,7 @@ namespace TUGraz.VectoCore.Tests.Integration
Gears = ratios.Select((ratio, i) => Tuple.Create((uint)i, new GearData {
FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
LossMap =
- TransmissionLossMap.ReadFromFile(ratio.IsEqual(1) ? GearboxIndirectLoss : GearboxDirectLoss, ratio,
+ TransmissionLossMapReader.ReadFromFile(ratio.IsEqual(1) ? GearboxIndirectLoss : GearboxDirectLoss, ratio,
string.Format("Gear {0}", i)),
Ratio = ratio,
ShiftPolygon = ShiftPolygonReader.ReadFromFile(ShiftPolygonFile)
@@ -164,7 +164,7 @@ namespace TUGraz.VectoCore.Tests.Integration
return new AxleGearData {
AxleGear = new GearData {
Ratio = ratio,
- LossMap = TransmissionLossMap.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
+ LossMap = TransmissionLossMapReader.ReadFromFile(AxleGearLossMap, ratio, "AxleGear")
}
};
}
@@ -228,7 +228,7 @@ namespace TUGraz.VectoCore.Tests.Integration
private static DriverData CreateDriverData(string accelerationFile, bool overspeed = false)
{
return new DriverData {
- AccelerationCurve = AccelerationCurveData.ReadFromFile(accelerationFile),
+ AccelerationCurve = AccelerationCurveReader.ReadFromFile(accelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = true,
//MinSpeed = 50.KMPHtoMeterPerSecond(),
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index d270790a3ba4458c7d273fd620fcb2ae98831e87..d8f0fbc69346dfa4825981874fb1f72b578cb9b0 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -537,7 +537,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(VehicleClass.Class2, segment.VehicleClass);
- var data = AccelerationCurveData.ReadFromStream(segment.AccelerationFile);
+ var data = AccelerationCurveReader.ReadFromStream(segment.AccelerationFile);
TestAcceleration(data);
Assert.AreEqual(3, segment.Missions.Length);
@@ -612,7 +612,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(VehicleClass.Class4, segment.VehicleClass);
- var data = AccelerationCurveData.ReadFromStream(segment.AccelerationFile);
+ var data = AccelerationCurveReader.ReadFromStream(segment.AccelerationFile);
TestAcceleration(data);
Assert.AreEqual(3, segment.Missions.Length);
@@ -652,7 +652,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(VehicleClass.Class5, segment.VehicleClass);
- var data = AccelerationCurveData.ReadFromStream(segment.AccelerationFile);
+ var data = AccelerationCurveReader.ReadFromStream(segment.AccelerationFile);
TestAcceleration(data);
Assert.AreEqual(2, segment.Missions.Length);
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
index a3ae58ab347b80e4f93592ed52b52c0f6a30bbcc..9c9dfc44e7f822c0d1efda443bdda9c2c006f760 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
@@ -143,7 +143,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Tuple.Create((uint)i,
new GearData {
FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
- LossMap = TransmissionLossMap.ReadFromFile(!ratio.IsEqual(1.0) ? directlossMap : indirectLossMap, ratio,
+ LossMap = TransmissionLossMapReader.ReadFromFile(!ratio.IsEqual(1.0) ? directlossMap : indirectLossMap, ratio,
string.Format("Gear {0}", i)),
Ratio = ratio,
ShiftPolygon = ShiftPolygonReader.ReadFromFile(ShiftPolygonFile)
@@ -158,7 +158,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
return new AxleGearData {
AxleGear = new GearData {
Ratio = ratio,
- LossMap = TransmissionLossMap.ReadFromFile(lossMap, ratio, "AxleGear")
+ LossMap = TransmissionLossMapReader.ReadFromFile(lossMap, ratio, "AxleGear")
}
};
}
@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestMethod]
public void TestLossMapValuesWithEfficiency()
{
- var lossMap = TransmissionLossMap.Create(0.95, 1.0, "Dummy");
+ var lossMap = TransmissionLossMapReader.Create(0.95, 1.0, "Dummy");
AssertHelper.AreRelativeEqual(0.SI<NewtonMeter>(),
lossMap.GetTorqueLoss(0.RPMtoRad(), 0.SI<NewtonMeter>()).Value);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index 345719ff41c0846a5cb201339c7d5e0da58840f0..06ba84cd14024c4588167337121c8c928749b466 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -402,7 +402,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
private static DriverData CreateDriverData()
{
return new DriverData {
- AccelerationCurve = AccelerationCurveData.ReadFromFile(AccelerationFile),
+ AccelerationCurve = AccelerationCurveReader.ReadFromFile(AccelerationFile),
LookAheadCoasting = new DriverData.LACData {
Enabled = false,
//Deceleration = -0.5.SI<MeterPerSquareSecond>()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index 89fb85d1e3f408b277ede49d715b1be1de16c405..15b8f7ebd8a2938abe7a57c06fc0feacc5fe1c39 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Tuple.Create((uint)i,
new GearData {
FullLoadCurve = FullLoadCurveReader.ReadFromFile(GearboxFullLoadCurveFile),
- LossMap = TransmissionLossMap.ReadFromFile(i != 6 ? IndirectLossMap : DirectLossMap, ratio,
+ LossMap = TransmissionLossMapReader.ReadFromFile(i != 6 ? IndirectLossMap : DirectLossMap, ratio,
string.Format("Gear {0}", i)),
Ratio = ratio,
ShiftPolygon = ShiftPolygonReader.ReadFromFile(GearboxShiftPolygonFile)
@@ -163,7 +163,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var vehicle = new VehicleContainer(ExecutionMode.Engineering);
var angularGearData = new AngularGearData {
AngularGear = new TransmissionData {
- LossMap = TransmissionLossMap.Create(VectoCSVFile.Read(AngularGearLossMap), ratio, "AngularGear"),
+ LossMap = TransmissionLossMapReader.Create(VectoCSVFile.Read(AngularGearLossMap), ratio, "AngularGear"),
Ratio = ratio
}
};
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
index 0449b9b8b77422941ca2e476b59590fe8edfb7fb..43f559dc9c05bbd139155cd7c88f9e6cc417c29b 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
public void RetarderBasicTest()
{
var vehicle = new VehicleContainer(ExecutionMode.Declaration);
- var retarderData = RetarderLossMap.ReadFromFile(RetarderLossMapFile);
+ var retarderData = RetarderLossMapReader.ReadFromFile(RetarderLossMapFile);
var retarder = new Retarder(vehicle, retarderData, 1.0);
var nextRequest = new MockTnOutPort();
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
public void RetarderRatioTest()
{
var vehicle = new VehicleContainer(ExecutionMode.Engineering);
- var retarderData = RetarderLossMap.ReadFromFile(RetarderLossMapFile);
+ var retarderData = RetarderLossMapReader.ReadFromFile(RetarderLossMapFile);
var retarder = new Retarder(vehicle, retarderData, 2.0);
var nextRequest = new MockTnOutPort();
@@ -132,7 +132,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[TestMethod]
public void RetarderDeclarationTest()
{
- var retarderData = RetarderLossMap.ReadFromFile(RetarderLossMapFile);
+ var retarderData = RetarderLossMapReader.ReadFromFile(RetarderLossMapFile);
var declVehicle = new VehicleContainer(ExecutionMode.Declaration, null, null);
var retarder = new Retarder(declVehicle, retarderData, 2.0);
var nextRequest = new MockTnOutPort();
@@ -161,7 +161,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("Retarder Speed [rpm],Loss Torque [Nm]",
retarderEntries));
var vehicle = new VehicleContainer(ExecutionMode.Engineering, null, null);
- var retarderData = RetarderLossMap.Create(retarderTbl);
+ var retarderData = RetarderLossMapReader.Create(retarderTbl);
var retarder = new Retarder(vehicle, retarderData, 2.0);
var nextRequest = new MockTnOutPort();
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
index 5bdcb328d59b28af963a373bef7ae582cc1eef18..e05927a576d35002002ad32dfaf7f4c3ecc2377c 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestMethod]
public void AccelerationTest()
{
- Data = AccelerationCurveData.ReadFromFile(@"TestData\Components\Coach.vacc");
+ Data = AccelerationCurveReader.ReadFromFile(@"TestData\Components\Coach.vacc");
// FIXED POINTS
EqualAcceleration(0, 1.01570922360353, -0.231742702878269);
@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestMethod]
public void ComputeAccelerationDistanceTest()
{
- Data = AccelerationCurveData.ReadFromFile(@"TestData\Components\Truck.vacc");
+ Data = AccelerationCurveReader.ReadFromFile(@"TestData\Components\Truck.vacc");
// in this part the deceleration is constant
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
index 5cfafad6cc275ec843806e1a168d666d3806ae1c..cbb7c430a25dc70ccc1950c8c72bef7f4051bb06 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
@@ -223,14 +223,14 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
var gearboxData = new GearboxData();
gearboxData.Gears[1] = new GearData {
- LossMap = TransmissionLossMap.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
Ratio = 1
};
var axleGearData = new AxleGearData() {
AxleGear = new GearData {
Ratio = 1,
- LossMap = TransmissionLossMap.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
}
};
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
index a94951be88c8d4015d419ab71f6783821d130f9a..2439bc19abaaf21d749a9c437134307a7d17710a 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
@@ -119,7 +119,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
data.Rows.Add("100", "0", "10"); // | \ |
data.Rows.Add("100", "100", "10"); // (0,0):10 ----- (100,10):10
- var map = TransmissionLossMap.Create(data, 1.0, "1");
+ var map = TransmissionLossMapReader.Create(data, 1.0, "1");
// test inside the triangles
AssertHelper.AreRelativeEqual(10, map.GetTorqueLoss(25.RPMtoRad(), 25.SI<NewtonMeter>()).Value);
@@ -163,7 +163,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
data.Rows.Add("100", "0", "10"); // | \ |
data.Rows.Add("100", "100", "10"); // (0,0):10 ----- (100,10):10
- var map = TransmissionLossMap.Create(data, 1.0, "1");
+ var map = TransmissionLossMapReader.Create(data, 1.0, "1");
// test inside the triangles
AssertHelper.AreRelativeEqual(15, map.GetOutTorque(25.RPMtoRad(), 25.SI<NewtonMeter>(), true));
@@ -207,7 +207,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
data.Rows.Add("100", "10", "10"); // | \ |
data.Rows.Add("100", "140", "40"); // (0,0):0 ----- (100,10):10
- var map = TransmissionLossMap.Create(data, 1.0, "1");
+ var map = TransmissionLossMapReader.Create(data, 1.0, "1");
// test inside the triangles
AssertHelper.AreRelativeEqual(5, map.GetTorqueLoss(25.RPMtoRad(), 25.SI<NewtonMeter>()).Value);
@@ -251,7 +251,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
data.Rows.Add("100", "0", "10"); // | \ |
data.Rows.Add("100", "100", "40"); // (0,0):0 ----- (100,0):10
- var map = TransmissionLossMap.Create(data, 1.0, "1");
+ var map = TransmissionLossMapReader.Create(data, 1.0, "1");
// test inside the triangles
AssertHelper.AreRelativeEqual(20, map.GetOutTorque(25.RPMtoRad(), 25.SI<NewtonMeter>()));
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
index 0e305dcc184d150f9b5dbed482297f48f469ca37..4bc51dcc34ac81d250b09388c11f002cf7e9f928 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
@@ -183,14 +183,14 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
var gearboxData = new GearboxData();
gearboxData.Gears[1] = new GearData {
- LossMap = TransmissionLossMap.ReadFromFile(@"TestData\Components\Direct Gear.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\Direct Gear.vtlm", 1, "1"),
Ratio = 1
};
var axleGearData = new AxleGearData {
AxleGear = new GearData {
Ratio = 1,
- LossMap = TransmissionLossMap.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
}
};