Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

Merge branch 'feature/CodeEU-51_Extend-ADC-lossmap-declaration-mode' into 'amdm2/develop'

regression update for extending ADC loss map. negative torques were not...

See merge request !38
parents 2644db8f 560705ac
No related branches found
No related tags found
No related merge requests found
...@@ -126,10 +126,21 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData ...@@ -126,10 +126,21 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
torqueLoss: -row.ParseDouble(Fields.TorqeLoss).SI<NewtonMeter>())) torqueLoss: -row.ParseDouble(Fields.TorqeLoss).SI<NewtonMeter>()))
.ToList(); .ToList();
if (!extendLossMap) { entries = (from DataRow row in data.Rows
return new TransmissionLossMap(entries, gearRatio, gearName); select new TransmissionLossMap.GearLossMapEntry(
} inputSpeed: row.ParseDouble(Fields.InputSpeed).RPMtoRad(),
inputTorque: row.ParseDouble(Fields.InputTorque).SI<NewtonMeter>(),
torqueLoss: row.ParseDouble(Fields.TorqeLoss).SI<NewtonMeter>()))
.ToList();
if (extendLossMap) {
entries = ExtendLossMap(entries); entries = ExtendLossMap(entries);
}
entries = entries.Select(x => new TransmissionLossMap.GearLossMapEntry(
inputSpeed: x.InputSpeed,
inputTorque: -x.InputTorque,
torqueLoss: -x.TorqueLoss)).ToList();
return new TransmissionLossMap(entries, gearRatio, gearName); return new TransmissionLossMap(entries, gearRatio, gearName);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment