Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 7215e287 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

make sure to use '.' as decimal separator when generating generic maps (completed bus)

(cherry picked from commit fc7b82c6)
parent 5fbe2d54
No related branches found
No related tags found
No related merge requests found
......@@ -193,9 +193,9 @@ namespace TUGraz.VectoCore.Models.Declaration
var fc = (row.ParseDouble("FC_norm") * ratedPower.Value() / 1000).SI(Unit.SI.Gramm.Per.Hour) .Cast<KilogramPerSecond>();
var newRow = result.NewRow();
newRow[FuelConsumptionMapReader.Fields.EngineSpeed] = Math.Round(engineSpeed.AsRPM,2, MidpointRounding.AwayFromZero);
newRow[FuelConsumptionMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero);
newRow[FuelConsumptionMapReader.Fields.FuelConsumption] = Math.Round(fc.ConvertToGrammPerHour().Value, 2, MidpointRounding.AwayFromZero);
newRow[FuelConsumptionMapReader.Fields.EngineSpeed] = Math.Round(engineSpeed.AsRPM,2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
newRow[FuelConsumptionMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
newRow[FuelConsumptionMapReader.Fields.FuelConsumption] = Math.Round(fc.ConvertToGrammPerHour().Value, 2, MidpointRounding.AwayFromZero).ToXMLFormat();
result.Rows.Add(newRow);
}
......
......@@ -3,6 +3,7 @@ using System.Data;
using System.ServiceModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
......@@ -46,9 +47,9 @@ namespace TUGraz.VectoCore.Models.Declaration
for (int i = 0; i < genericRetarderLosses.Length; i++)
{
var newRow = torqueLoss.NewRow();
newRow[RetarderLossMapReader.Fields.RetarderSpeed] = Math.Round(retarderSpeeds[i], 2, MidpointRounding.AwayFromZero);
newRow[RetarderLossMapReader.Fields.RetarderSpeed] = Math.Round(retarderSpeeds[i], 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
newRow[RetarderLossMapReader.Fields.TorqueLoss] = Math.Round(genericRetarderLosses[i] *
Constants.GenericLossMapSettings.RetarderGenericFactor, 2, MidpointRounding.AwayFromZero);
Constants.GenericLossMapSettings.RetarderGenericFactor, 2, MidpointRounding.AwayFromZero).ToXMLFormat();
torqueLoss.Rows.Add(newRow);
}
......
......@@ -103,9 +103,9 @@ namespace TUGraz.VectoCore.Models.GenericModelData
: outputSpeed;
var newRow = lossMap.NewRow();
newRow[lossMap.Columns[0]] = outputSpeed;
newRow[lossMap.Columns[1]] = torque;
newRow[lossMap.Columns[2]] = CalculateOutputTorqueLoss(td0_, td150_, td_n, calculationSpeed, torque, efficiency);
newRow[lossMap.Columns[0]] = outputSpeed.ToXMLFormat(2);
newRow[lossMap.Columns[1]] = torque.ToXMLFormat(2);
newRow[lossMap.Columns[2]] = CalculateOutputTorqueLoss(td0_, td150_, td_n, calculationSpeed, torque, efficiency).ToXMLFormat(2);
lossMap.Rows.Add(newRow);
}
......@@ -138,9 +138,9 @@ namespace TUGraz.VectoCore.Models.GenericModelData
var outputLoss = row[2].ToString().ToDouble();
var newRow = inputLossMap.NewRow();
newRow[0] = Math.Round(GetInputSpeed(outputSpeed, axleRatio), 2, MidpointRounding.AwayFromZero);
newRow[1] = Math.Round(GetInputTorque(outputTorque, outputLoss, axleRatio), 2, MidpointRounding.AwayFromZero);
newRow[2] = Math.Round(GetInputTorqueLoss(outputLoss, axleRatio, lossCorrectionFactor), 2, MidpointRounding.AwayFromZero);
newRow[0] = Math.Round(GetInputSpeed(outputSpeed, axleRatio), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
newRow[1] = Math.Round(GetInputTorque(outputTorque, outputLoss, axleRatio), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
newRow[2] = Math.Round(GetInputTorqueLoss(outputLoss, axleRatio, lossCorrectionFactor), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
inputLossMap.Rows.Add(newRow);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment