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

[rm][refactor] Optimization Dialog now allows optimizing only on existing, defined simulations

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-08-23 21:41:35 -04:00
parent 73e8caa0e5
commit d3a66294d1
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
View File

@ -48,6 +48,9 @@ import javax.swing.table.TableColumnModel;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import net.sf.openrocket.optimization.rocketoptimization.modifiers.GenericComponentModifier;
import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.FlightConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -635,13 +638,9 @@ public class GeneralOptimizationDialog extends JDialog {
updating = false; updating = false;
// Create a copy of the simulation (we're going to modify the original in the current thread) // Create a copy of the simulation (we'll modify the copy here)
Simulation simulation = getSelectedSimulation(); final Simulation simulation = getSelectedSimulation();
Rocket rocketCopy = simulation.getRocket().copyWithOriginalID(); final OptimizableParameter parameter = getSelectedParameter();
simulation = simulation.duplicateSimulation(rocketCopy);
OptimizableParameter parameter = getSelectedParameter();
OptimizationGoal goal; OptimizationGoal goal;
String value = (String) optimizationGoalCombo.getSelectedItem(); String value = (String) optimizationGoalCombo.getSelectedItem();
if (GOAL_MAXIMIZE.equals(value)) { if (GOAL_MAXIMIZE.equals(value)) {
@ -701,7 +700,6 @@ public class GeneralOptimizationDialog extends JDialog {
SimulationModifier[] modifiers = selectedModifiers.toArray(new SimulationModifier[0]); SimulationModifier[] modifiers = selectedModifiers.toArray(new SimulationModifier[0]);
for (SimulationModifier mod : modifiers) { for (SimulationModifier mod : modifiers) {
try { try {
mod.initialize(simulation); mod.initialize(simulation);
} catch (OptimizationException ex) { } catch (OptimizationException ex) {
@ -784,8 +782,8 @@ public class GeneralOptimizationDialog extends JDialog {
try { try {
selectedModifiers.get(i).modify(sim, newPoint.get(i)); selectedModifiers.get(i).modify(sim, newPoint.get(i));
} catch (OptimizationException e) { } catch (OptimizationException e) {
throw new BugException("Simulation modifier failed to modify the base simulation " + throw new BugException( "Simulation modifier failed to modify the base simulation " +
"modifier=" + selectedModifiers.get(i), e); "modifier=" + selectedModifiers.get(i), e);
} }
} }
figure.updateFigure(); figure.updateFigure();
@ -916,30 +914,12 @@ public class GeneralOptimizationDialog extends JDialog {
} }
List<Named<Simulation>> simulations = new ArrayList<>(); List<Named<Simulation>> simulations = new ArrayList<>();
Rocket rocket = documentCopy.getRocket(); for (Simulation s : documentCopy.getSimulations()){
final FlightConfiguration config = s.getActiveConfiguration();
for (Simulation s : documentCopy.getSimulations()) { final String optionName = createSimulationName(s.getName(), config.getName() );
FlightConfigurationId id = new FlightConfigurationId( "stub id value - General Optimizer"); simulations.add(new Named<>(s, optionName));
String name = createSimulationName(s.getName(), descriptor.format(rocket, id));
simulations.add(new Named<>(s, name));
} }
for (FlightConfigurationId curId: rocket.getIds() ){
if ( curId== null) {
// this is now *extremely* unlikely
throw new NullPointerException(" flightconfiguration has a null id... bug.");
}
Simulation sim = new Simulation(rocket);
String name = createSimulationName(trans.get("basicSimulationName"), descriptor.format(rocket, curId));
simulations.add(new Named<>(sim, name));
}
Simulation sim = new Simulation(rocket);
String name = createSimulationName(trans.get("noSimulationName"), descriptor.format(rocket, null));
simulations.add(new Named<>(sim, name));
simulationSelectionCombo.setModel(new DefaultComboBoxModel<>(new Vector<>(simulations))); simulationSelectionCombo.setModel(new DefaultComboBoxModel<>(new Vector<>(simulations)));
simulationSelectionCombo.setSelectedIndex(0); simulationSelectionCombo.setSelectedIndex(0);
if (current != null) { if (current != null) {
@ -1229,8 +1209,9 @@ public class GeneralOptimizationDialog extends JDialog {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Simulation getSelectedSimulation() { private Simulation getSelectedSimulation() {
/* This is to debug a NPE where the returned selected item is null. */
Object item = simulationSelectionCombo.getSelectedItem(); Object item = simulationSelectionCombo.getSelectedItem();
/* This is to debug a NPE where the returned selected item is null. */
if (item == null) { if (item == null) {
StringBuilder s = new StringBuilder("Selected simulation is null:"); StringBuilder s = new StringBuilder("Selected simulation is null:");
s.append(" item count=").append(simulationSelectionCombo.getItemCount()); s.append(" item count=").append(simulationSelectionCombo.getItemCount());
@ -1239,6 +1220,7 @@ public class GeneralOptimizationDialog extends JDialog {
} }
throw new BugException(s.toString()); throw new BugException(s.toString());
} }
return ((Named<Simulation>) item).get(); return ((Named<Simulation>) item).get();
} }