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

Don't have SimulationEngine return flight data. Add getFlightData() method

Browse Source 
to obtain that after simulation completes
This commit is contained in:
JoePfeiffer 2024-04-22 09:01:59 -06:00
parent 51af956330
commit bcfa73eb21
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/info/openrocket/core/document/Simulation.java
View File

@ -399,14 +399,14 @@ public class Simulation implements ChangeSource, Cloneable {
public void simulate(SimulationListener... additionalListeners) public void simulate(SimulationListener... additionalListeners)
throws SimulationException { throws SimulationException {
mutex.lock("simulate"); mutex.lock("simulate");
SimulationEngine simulator = null;
simulatedData = null;
try { try {
if (this.status == Status.EXTERNAL) { if (this.status == Status.EXTERNAL) {
throw new SimulationException("Cannot simulate imported simulation."); throw new SimulationException("Cannot simulate imported simulation.");
} }
SimulationEngine simulator;
try { try {
simulator = simulationEngineClass.getConstructor().newInstance(); simulator = simulationEngineClass.getConstructor().newInstance();
} catch (InstantiationException e) { } catch (InstantiationException e) {
@ -430,18 +430,20 @@ public class Simulation implements ChangeSource, Cloneable {
long t1, t2; long t1, t2;
log.debug("Simulation: calling simulator"); log.debug("Simulation: calling simulator");
t1 = System.currentTimeMillis(); t1 = System.currentTimeMillis();
simulatedData = simulator.simulate(simulationConditions); simulator.simulate(simulationConditions);
t2 = System.currentTimeMillis(); t2 = System.currentTimeMillis();
log.debug("Simulation: returning from simulator, simulation took " + (t2 - t1) + "ms"); log.debug("Simulation: returning from simulator, simulation took " + (t2 - t1) + "ms");
} catch (SimulationException e) { } catch (SimulationException e) {
simulatedData = e.getFlightData();
throw e; throw e;
} finally { } finally {
// Set simulated info after simulation // Set simulated info after simulation
simulatedConditions = options.clone(); simulatedConditions = options.clone();
simulatedConfigurationDescription = descriptor.format(this.rocket, getId()); simulatedConfigurationDescription = descriptor.format(this.rocket, getId());
simulatedConfigurationID = getActiveConfiguration().getModID(); simulatedConfigurationID = getActiveConfiguration().getModID();
if (simulator != null) {
simulatedData = simulator.getFlightData();
}
status = Status.UPTODATE; status = Status.UPTODATE;
fireChangeEvent(); fireChangeEvent();

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

@ -62,7 +62,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
FlightData flightData; FlightData flightData;
@Override @Override
public FlightData simulate(SimulationConditions simulationConditions) throws SimulationException { public void simulate(SimulationConditions simulationConditions) throws SimulationException {
// Set up flight data // Set up flight data
flightData = new FlightData(); flightData = new FlightData();
@ -148,7 +148,6 @@ public class BasicEventSimulationEngine implements SimulationEngine {
} }
flightData.calculateInterestingValues(); flightData.calculateInterestingValues();
return flightData;
} }
private void simulateLoop() throws SimulationException { private void simulateLoop() throws SimulationException {
@ -740,10 +739,10 @@ public class BasicEventSimulationEngine implements SimulationEngine {
try { try {
SimulationConditions conds = currentStatus.getSimulationConditions().clone(); SimulationConditions conds = currentStatus.getSimulationConditions().clone();
conds.getSimulationListenerList().add(OptimumCoastListener.INSTANCE); conds.getSimulationListenerList().add(OptimumCoastListener.INSTANCE);
BasicEventSimulationEngine e = new BasicEventSimulationEngine(); BasicEventSimulationEngine coastEngine = new BasicEventSimulationEngine();
FlightData d = e.simulate(conds); coastEngine.simulate(conds);
return d; return coastEngine.getFlightData();
} catch (SimulationException e) { } catch (SimulationException e) {
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
@ -751,4 +750,8 @@ public class BasicEventSimulationEngine implements SimulationEngine {
return null; return null;
} }
} }
public FlightData getFlightData() {
return flightData;
}
} }

10
core/src/main/java/info/openrocket/core/simulation/SimulationEngine.java
View File

@ -17,10 +17,16 @@ public interface SimulationEngine {
* Simulate the flight of a rocket. * Simulate the flight of a rocket.
* *
* @param simulation the simulation conditions which to simulate. * @param simulation the simulation conditions which to simulate.
* @return a FlightData object containing the simulated data.
* @throws SimulationException if an error occurs during simulation * @throws SimulationException if an error occurs during simulation
*/ */
public FlightData simulate(SimulationConditions simulation) public void simulate(SimulationConditions simulation)
throws SimulationException; throws SimulationException;
/**
* Obtain data generated by simulation
*
* @return flight data
*/
public FlightData getFlightData();
} }