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

Create new SimulationStatus.addWarning() and SimulationStatus.addWarnings() methods. addWarning() adds a warning to the WarningSet, and adds a SIM_WARN FlightEvent to the data branch. addWarnings() uses addWarning() to merge two WarningSets.

Browse Source 
Replace instances of status.getWarnings().add() (and similar code) with status.addWarning()
This commit is contained in:
JoePfeiffer 2024-07-22 10:55:28 -06:00
parent bbf38dd239
commit 47e7e017bb
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java
View File

@ -108,7 +108,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
// No recovery device // No recovery device
if (!simulationConfig.hasRecoveryDevice()) { if (!simulationConfig.hasRecoveryDevice()) {
currentStatus.getWarnings().add(Warning.NO_RECOVERY_DEVICE); currentStatus.addWarning(Warning.NO_RECOVERY_DEVICE);
} }
currentStatus.getEventQueue().add(new FlightEvent(FlightEvent.Type.LAUNCH, 0, simulationConditions.getRocket())); currentStatus.getEventQueue().add(new FlightEvent(FlightEvent.Type.LAUNCH, 0, simulationConditions.getRocket()));
@ -315,7 +315,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
if (currentStatus.isLanded() && if (currentStatus.isLanded() &&
(event.getType() != FlightEvent.Type.ALTITUDE) && (event.getType() != FlightEvent.Type.ALTITUDE) &&
(event.getType() != FlightEvent.Type.SIMULATION_END)) (event.getType() != FlightEvent.Type.SIMULATION_END))
currentStatus.getWarnings().add(new Warning.EventAfterLanding(event)); currentStatus.addWarning(new Warning.EventAfterLanding(event));
// Check for motor ignition events, add ignition events to queue // Check for motor ignition events, add ignition events to queue
for (MotorClusterState state : currentStatus.getActiveMotors() ){ for (MotorClusterState state : currentStatus.getActiveMotors() ){
@ -500,12 +500,12 @@ public class BasicEventSimulationEngine implements SimulationEngine {
} }
} }
if (numActiveBelow != 1) { if (numActiveBelow != 1) {
currentStatus.getWarnings().add(Warning.SEPARATION_ORDER); currentStatus.addWarning(Warning.SEPARATION_ORDER);
} }
// If I haven't cleared the rail yet, flag a warning // If I haven't cleared the rail yet, flag a warning
if (!currentStatus.isLaunchRodCleared()) { if (!currentStatus.isLaunchRodCleared()) {
currentStatus.getWarnings().add(Warning.EARLY_SEPARATION); currentStatus.addWarning(Warning.EARLY_SEPARATION);
} }
// Create a new simulation branch for the booster // Create a new simulation branch for the booster
@ -565,12 +565,12 @@ public class BasicEventSimulationEngine implements SimulationEngine {
// Check for launch rod // Check for launch rod
if (!currentStatus.isLaunchRodCleared()) { if (!currentStatus.isLaunchRodCleared()) {
currentStatus.getWarnings().add(Warning.RECOVERY_LAUNCH_ROD); currentStatus.addWarning(Warning.RECOVERY_LAUNCH_ROD);
} }
// Check current velocity // Check current velocity
if (currentStatus.getRocketVelocity().length() > 20) { if (currentStatus.getRocketVelocity().length() > 20) {
currentStatus.getWarnings().add(new Warning.HighSpeedDeployment(currentStatus.getRocketVelocity().length())); currentStatus.addWarning(new Warning.HighSpeedDeployment(currentStatus.getRocketVelocity().length()));
} }
currentStatus.setLiftoff(true); currentStatus.setLiftoff(true);

6
core/src/main/java/info/openrocket/core/simulation/RK4SimulationStepper.java
View File

@ -403,7 +403,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
* launch rod or 0.25 seconds after departure, and when the velocity has dropped * launch rod or 0.25 seconds after departure, and when the velocity has dropped
* below 20% of the max. velocity. * below 20% of the max. velocity.
*/ */
WarningSet warnings = status.getWarnings(); WarningSet warnings = new WarningSet();
store.maxZvelocity = MathUtil.max(store.maxZvelocity, status.getRocketVelocity().z); store.maxZvelocity = MathUtil.max(store.maxZvelocity, status.getRocketVelocity().z);
if (!status.isLaunchRodCleared()) { if (!status.isLaunchRodCleared()) {
@ -423,7 +423,9 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
// Calculate aerodynamic forces // Calculate aerodynamic forces
store.forces = status.getSimulationConditions().getAerodynamicCalculator() store.forces = status.getSimulationConditions().getAerodynamicCalculator()
.getAerodynamicForces(status.getConfiguration(), store.flightConditions, warnings); .getAerodynamicForces(status.getConfiguration(), store.flightConditions, warnings);
if (null != warnings) {
status.addWarnings(warnings);
}
// Add very small randomization to yaw & pitch moments to prevent over-perfect flight // Add very small randomization to yaw & pitch moments to prevent over-perfect flight
// TODO: HIGH: This should rather be performed as a listener // TODO: HIGH: This should rather be performed as a listener

18
core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java
View File

@ -9,6 +9,7 @@ import java.util.Set;
import info.openrocket.core.aerodynamics.FlightConditions; import info.openrocket.core.aerodynamics.FlightConditions;
import info.openrocket.core.logging.SimulationAbort; import info.openrocket.core.logging.SimulationAbort;
import info.openrocket.core.logging.Warning;
import info.openrocket.core.logging.WarningSet; import info.openrocket.core.logging.WarningSet;
import info.openrocket.core.motor.MotorConfiguration; import info.openrocket.core.motor.MotorConfiguration;
import info.openrocket.core.motor.MotorConfigurationId; import info.openrocket.core.motor.MotorConfigurationId;
@ -420,6 +421,23 @@ public class SimulationStatus implements Cloneable, Monitorable {
this.warnings = warnings; this.warnings = warnings;
} }
public void addWarning(Warning warning) {
if (null == warnings) {
setWarnings(new WarningSet());
}
if (!warnings.contains(warning)) {
log.trace("Add warning: \"" + warning + "\"");
getFlightDataBranch().addEvent(new FlightEvent(FlightEvent.Type.SIM_WARN, getSimulationTime(), null, warning));
warnings.add(warning);
}
}
public void addWarnings(WarningSet warnings) {
for (Warning warning : warnings) {
addWarning(warning);
}
}
public WarningSet getWarnings() { public WarningSet getWarnings() {
return warnings; return warnings;
} }

2
core/src/main/java/info/openrocket/core/simulation/listeners/SimulationListenerHelper.java
View File

@ -636,7 +636,7 @@ public class SimulationListenerHelper {
private static void warn(SimulationStatus status, SimulationListener listener) { private static void warn(SimulationStatus status, SimulationListener listener) {
if (!listener.isSystemListener()) { if (!listener.isSystemListener()) {
log.info("Non-system listener " + listener + " affected the simulation"); log.info("Non-system listener " + listener + " affected the simulation");
status.getWarnings().add(Warning.LISTENERS_AFFECTED); status.addWarning(Warning.LISTENERS_AFFECTED);
} }
} }
} }