Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit aa237723 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

SumFile: Corrected Bug with Cruise Time Share. Added invariant to check that...

SumFile: Corrected Bug with Cruise Time Share. Added invariant to check that timeshares always add up to 100%
parent da44af68
No related branches found
No related tags found
No related merge requests found
......@@ -200,7 +200,7 @@ namespace TUGraz.VectoCore.OutputData
public static Scalar CruiseTimeShare(this MeterPerSquareSecond[] acceleration3SecondAverage)
{
if (acceleration3SecondAverage.Length > 0) {
return 100.SI<Scalar>() * acceleration3SecondAverage.Count(x => x.IsBetween(-0.125, -0.125)) /
return 100.SI<Scalar>() * acceleration3SecondAverage.Count(x => x.IsBetween(-0.125, 0.125)) /
acceleration3SecondAverage.Length;
}
return null;
......
......@@ -275,10 +275,21 @@ namespace TUGraz.VectoCore.OutputData
row[ACC] = modData.AccelerationAverage();
row[ACC_POS] = acc.AccelerationsPositive();
row[ACC_NEG] = acc.AccelerationsNegative();
row[ACC_TIMESHARE] = acc.AccelerationTimeShare();
row[DEC_TIMESHARE] = acc.DecelerationTimeShare();
row[CRUISE_TIMESHARE] = acc.CruiseTimeShare();
var accTimeShare = acc.AccelerationTimeShare();
row[ACC_TIMESHARE] = accTimeShare;
var decTimeShare = acc.DecelerationTimeShare();
row[DEC_TIMESHARE] = decTimeShare;
var cruiseTimeShare = acc.CruiseTimeShare();
row[CRUISE_TIMESHARE] = cruiseTimeShare;
row[STOP_TIMESHARE] = modData.StopTimeShare();
var shareSum = accTimeShare + decTimeShare + cruiseTimeShare;
if (!shareSum.IsEqual(100)) {
Log.Error(
"Sumfile Error: driving behavior timeshares must sum up to 100%: acc: {0}%, dec: {1}%, cruise: {2}%, sum: {3}%",
accTimeShare.ToOutputFormat(1, null, false), decTimeShare.ToOutputFormat(1, null, false),
cruiseTimeShare.ToOutputFormat(1, null, false), shareSum.ToOutputFormat(1, null, false));
}
}
private static string ReplaceNotAllowedCharacters(string text)
......
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