From cbbc662e811226b01f027c18512ed868150d337b Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Fri, 10 Dec 2021 15:11:07 +0100
Subject: [PATCH] reformated code for easier debugging
---
.../EngineeringDataAdapter.cs | 24 ++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index e803c63d34..5eec148e9a 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -330,17 +330,19 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var gear = gearbox.Gears[(int)i];
var lossMap = CreateGearLossMap(gear, i, true, VehicleCategory.Unknown, gearbox.Type);
- var shiftPolygon = gear.ShiftPolygon != null && gear.ShiftPolygon.SourceType != DataSourceType.Missing
- ? ShiftPolygonReader.Create(gear.ShiftPolygon)
- : shiftPolygonCalc != null
- ? shiftPolygonCalc.ComputeDeclarationShiftPolygon(
- gearbox.Type, (int)i, engineData?.FullLoadCurves[i + 1], gearbox.Gears,
- engineData,
- axlegearRatio, dynamicTyreRadius, runData.ElectricMachinesData?.FirstOrDefault()?.Item2)
- : DeclarationData.Gearbox.ComputeShiftPolygon(
- gearbox.Type, (int)i, engineData?.FullLoadCurves[i + 1], gearbox.Gears,
- engineData,
- axlegearRatio, dynamicTyreRadius, runData.ElectricMachinesData?.FirstOrDefault()?.Item2);
+ ShiftPolygon shiftPolygon;
+ if (gear.ShiftPolygon != null && gear.ShiftPolygon.SourceType != DataSourceType.Missing) {
+ shiftPolygon = ShiftPolygonReader.Create(gear.ShiftPolygon);
+ } else if (shiftPolygonCalc != null) {
+ shiftPolygon = shiftPolygonCalc.ComputeDeclarationShiftPolygon(gearbox.Type, (int)i,
+ engineData?.FullLoadCurves[i + 1], gearbox.Gears, engineData, axlegearRatio,
+ dynamicTyreRadius, runData.ElectricMachinesData?.FirstOrDefault()?.Item2);
+ } else {
+ shiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(gearbox.Type, (int)i,
+ engineData?.FullLoadCurves[i + 1], gearbox.Gears, engineData, axlegearRatio,
+ dynamicTyreRadius, runData.ElectricMachinesData?.FirstOrDefault()?.Item2);
+ }
+
var gearData = new GearData {
ShiftPolygon = shiftPolygon,
MaxSpeed = gear.MaxInputSpeed,
--
GitLab