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

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

extrapolate if lookahead (for acceleration estimation) goes beyond cycle

parent 3d1c74e0
No related branches found
No related tags found
No related merge requests found
...@@ -401,12 +401,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -401,12 +401,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var myIterator = CycleIntervalIterator.Clone(); var myIterator = CycleIntervalIterator.Clone();
if (absDistance > _data.Entries.Last().Distance) { if (absDistance > _data.Entries.Last().Distance) {
return InterpolateCycleEntry(absDistance, _data.Entries.Last()); return ExtrapolateCycleEntry(absDistance, _data.Entries.Last());
} }
while (myIterator.RightSample.Distance < absDistance) { while (myIterator.RightSample.Distance < absDistance) {
myIterator.MoveNext(); myIterator.MoveNext();
} }
;
return InterpolateCycleEntry(absDistance, myIterator.RightSample); return InterpolateCycleEntry(absDistance, myIterator.RightSample);
} }
...@@ -425,6 +425,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -425,6 +425,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return retVal; return retVal;
} }
private DrivingCycleData.DrivingCycleEntry ExtrapolateCycleEntry(Meter absDistance,
DrivingCycleData.DrivingCycleEntry lookahead)
{
var retVal = new DrivingCycleData.DrivingCycleEntry(lookahead)
{
Distance = absDistance,
Altitude = lookahead.Altitude + lookahead.RoadGradient * (absDistance - lookahead.Distance),
//VectoMath.Interpolate(CurrentState.Distance, lookahead.Distance, CurrentState.Altitude,lookahead.Altitude, absDistance)
};
retVal.RoadGradient =
((retVal.Altitude - CurrentState.Altitude) / (absDistance - CurrentState.Distance)).Value().SI<Radian>();
return retVal;
}
public Meter Altitude public Meter Altitude
{ {
get { return PreviousState.Altitude; } get { return PreviousState.Altitude; }
......
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