hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#1868] Set apogee time step at apogee instead of one sample after

Browse Source 
Currently, the apogee event is added at one simulation time step AFTER the actual apogee, instead of the apogee time step itself
This commit is contained in:
SiboVG 2022-12-11 23:43:58 +01:00
parent 9a51bda56d
commit 7b714d129c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
View File

@ -139,6 +139,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
currentStepper = flightStepper;
currentStatus = currentStepper.initialize(currentStatus);
double previousSimulationTime = currentStatus.getSimulationTime();
// Get originating position (in case listener has modified launch position)
Coordinate origin = currentStatus.getRocketPosition();
@ -219,8 +220,8 @@ public class BasicEventSimulationEngine implements SimulationEngine {
// Check for apogee
if (!currentStatus.isApogeeReached() && currentStatus.getRocketPosition().z < currentStatus.getMaxAlt() - 0.01) {
currentStatus.setMaxAltTime(currentStatus.getSimulationTime());
addEvent(new FlightEvent(FlightEvent.Type.APOGEE, currentStatus.getSimulationTime(),
currentStatus.setMaxAltTime(previousSimulationTime);
addEvent(new FlightEvent(FlightEvent.Type.APOGEE, previousSimulationTime,
currentStatus.getConfiguration().getRocket()));
}
@ -258,6 +259,8 @@ public class BasicEventSimulationEngine implements SimulationEngine {
// If I'm on the ground and have no events in the queue, I'm done
if (currentStatus.isLanded() && currentStatus.getEventQueue().isEmpty())
addEvent(new FlightEvent(FlightEvent.Type.SIMULATION_END, currentStatus.getSimulationTime()));
previousSimulationTime = currentStatus.getSimulationTime();
}
} catch (SimulationException e) {