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

Merge pull request #1755 from JoePfeiffer/fix-1728

Browse Source 
Improve progress bar reporting
This commit is contained in:
Sibo Van Gool 2022-10-23 20:18:15 +02:00 committed by GitHub
commit 0668f03d38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
View File

@ -79,6 +79,7 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
} }
// but don't let it get *too* small // but don't let it get *too* small
timeStep = Math.max(timeStep, MIN_TIME_STEP); timeStep = Math.max(timeStep, MIN_TIME_STEP);
log.debug("timeStep is " + timeStep);
// Perform Euler integration // Perform Euler integration
Coordinate newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)). Coordinate newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).
@ -94,6 +95,7 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
// The new timestep is the solution of // The new timestep is the solution of
// 1/2 at^2 + vt + z0 = 0 // 1/2 at^2 + vt + z0 = 0
timeStep = (-v - Math.sqrt(v*v - 2*a*z0))/a; timeStep = (-v - Math.sqrt(v*v - 2*a*z0))/a;
log.debug("ground hit changes timeStep to " + timeStep);
newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)). newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).
add(linearAcceleration.multiply(MathUtil.pow2(timeStep) / 2)); add(linearAcceleration.multiply(MathUtil.pow2(timeStep) / 2));
@ -114,7 +116,6 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
w = status.getSimulationConditions().getGeodeticComputation().addCoordinate(w, status.getRocketPosition()); w = status.getSimulationConditions().getGeodeticComputation().addCoordinate(w, status.getRocketPosition());
status.setRocketWorldPosition(w); status.setRocketWorldPosition(w);
// Store data // Store data
FlightDataBranch data = status.getFlightData(); FlightDataBranch data = status.getFlightData();
boolean extra = status.getSimulationConditions().isCalculateExtras(); boolean extra = status.getSimulationConditions().isCalculateExtras();

50
swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java
View File

@ -270,13 +270,15 @@ public class SimulationRunDialog extends JDialog {
private final int index; private final int index;
private final double burnoutTimeEstimate; private final double burnoutTimeEstimate;
private volatile double burnoutVelocity; private volatile double burnoutVelocity;
private volatile double apogeeAltitude;
private final CustomExpressionSimulationListener exprListener; private final CustomExpressionSimulationListener exprListener;
/* /*
* -2 = time from 0 ... burnoutTimeEstimate -1 = velocity from * Keep track of current phase ("stage") of simulation
* v(burnoutTimeEstimate) ... 0 0 ... n = stages from alt(max) ... 0 * -2: Boost. Estimate progress using time from 0 to burnoutTimeEstimate
* -1: Coast. Estimate progress using velocity from v(burnoutTimeEstimate) to 0
* 0 ... n: Landing. Estimate progress using altitude from alt(max) ... 0
* (it appears as if the idea is to use values above 0 to support multiple stages, but this is not implemented)
*/ */
private volatile int simulationStage = -2; private volatile int simulationStage = -2;
@ -322,50 +324,57 @@ public class SimulationRunDialog extends JDialog {
@Override @Override
protected void process(List<SimulationStatus> chunks) { protected void process(List<SimulationStatus> chunks) {
// Update max. altitude and velocity // Update max. altitude and velocity of sustainer. Because parts of the simulation may be run more than once
// in order to calculate things like optimal coast time, we'll keep updating max altitude
// whenever we see that the rocket is going upwards. The last apogee found is the real one.
for (SimulationStatus s : chunks) { for (SimulationStatus s : chunks) {
simulationMaxAltitude[index] = Math.max(simulationMaxAltitude[index], s.getRocketPosition().z); if (s.getConfiguration().isStageActive(0) && (s.getRocketVelocity().z > 0)) {
simulationMaxVelocity[index] = Math.max(simulationMaxVelocity[index], s.getRocketVelocity().length()); log.debug("updating simulationMaxAltitude[" + index + "] to " + s.getRocketPosition().z);
simulationMaxAltitude[index] = s.getRocketPosition().z;
simulationMaxVelocity[index] = Math.max(simulationMaxVelocity[index], s.getRocketVelocity().length());
}
} }
// Calculate the progress // Calculate the progress
SimulationStatus status = chunks.get(chunks.size() - 1); SimulationStatus status = chunks.get(chunks.size() - 1);
simulationStatuses[index] = status; simulationStatuses[index] = status;
// 1. time = 0 ... burnoutTimeEstimate // -2: Boost. time = 0 ... burnoutTimeEstimate
if (simulationStage == -2 && status.getSimulationTime() < burnoutTimeEstimate) { if (simulationStage == -2 && status.getSimulationTime() < burnoutTimeEstimate) {
log.debug("Method 1: t=" + status.getSimulationTime() + " est=" + burnoutTimeEstimate); log.debug("simulationStage boost: t=" + status.getSimulationTime() + " est=" + burnoutTimeEstimate);
setSimulationProgress( setSimulationProgress(
MathUtil.map(status.getSimulationTime(), 0, burnoutTimeEstimate, 0.0, BURNOUT_PROGRESS)); MathUtil.map(status.getSimulationTime(), 0, burnoutTimeEstimate, 0.0, BURNOUT_PROGRESS));
updateProgress(); updateProgress();
return; return;
} }
// Past burnout time estimate, switch to coast.
if (simulationStage == -2) { if (simulationStage == -2) {
simulationStage++; simulationStage++;
burnoutVelocity = MathUtil.max(status.getRocketVelocity().z, 0.1); burnoutVelocity = MathUtil.max(status.getRocketVelocity().z, 0.1);
log.debug("CHANGING to Method 2, vel=" + burnoutVelocity); log.debug("CHANGING to simulationStage " + simulationStage + ", vel=" + burnoutVelocity);
} }
// 2. z-velocity from burnout velocity to zero // -1: Coast. z-velocity from burnout velocity to zero
if (simulationStage == -1 && status.getRocketVelocity().z >= 0) { if (simulationStage == -1 && status.getRocketVelocity().z >= 0) {
log.debug("Method 2: vel=" + status.getRocketVelocity().z + " burnout=" + burnoutVelocity); log.debug("simulationStage coast: vel=" + status.getRocketVelocity().z + " burnout=" + burnoutVelocity);
setSimulationProgress(MathUtil.map(status.getRocketVelocity().z, burnoutVelocity, 0, BURNOUT_PROGRESS, setSimulationProgress(MathUtil.map(status.getRocketVelocity().z, burnoutVelocity, 0, BURNOUT_PROGRESS,
APOGEE_PROGRESS)); APOGEE_PROGRESS));
updateProgress(); updateProgress();
return; return;
} }
// Past apogee, switch to landing
if (simulationStage == -1 && status.getRocketVelocity().z < 0) { if (simulationStage == -1 && status.getRocketVelocity().z < 0) {
simulationStage++; simulationStage++;
apogeeAltitude = MathUtil.max(status.getRocketPosition().z, 1); log.debug("CHANGING to simulationStage " + simulationStage + ", apogee=" + simulationMaxAltitude[index]);
log.debug("CHANGING to Method 3, apogee=" + apogeeAltitude);
} }
// 3. z-position from apogee to zero // >= 0 Landing. z-position from apogee to zero
// TODO: MEDIUM: several stages // TODO: MEDIUM: several stages
log.debug("Method 3: alt=" + status.getRocketPosition().z + " apogee=" + apogeeAltitude); System.out.flush();
setSimulationProgress(MathUtil.map(status.getRocketPosition().z, apogeeAltitude, 0, APOGEE_PROGRESS, 1.0)); log.debug("simulationStage landing (" + simulationStage + "): alt=" + status.getRocketPosition().z + " apogee=" + simulationMaxAltitude[index]);
setSimulationProgress(MathUtil.map(status.getRocketPosition().z, simulationMaxAltitude[index], 0, APOGEE_PROGRESS, 1.0));
updateProgress(); updateProgress();
} }
@ -439,10 +448,7 @@ public class SimulationRunDialog extends JDialog {
public boolean handleFlightEvent(SimulationStatus status, FlightEvent event) { public boolean handleFlightEvent(SimulationStatus status, FlightEvent event) {
switch (event.getType()) { switch (event.getType()) {
case APOGEE: case APOGEE:
simulationStage = 0; log.debug("APOGEE");
apogeeAltitude = status.getRocketPosition().z;
log.debug("APOGEE, setting progress");
setSimulationProgress(APOGEE_PROGRESS);
publish(status); publish(status);
break; break;
@ -451,8 +457,8 @@ public class SimulationRunDialog extends JDialog {
break; break;
case SIMULATION_END: case SIMULATION_END:
log.debug("END, setting progress"); log.debug("END");
setSimulationProgress(1.0); publish(status);
break; break;
default: default: