|
|
@@ -183,16 +183,16 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
|
|
|
useFlexes.addActionListener(actionEvent -> algoUseFlexes = useFlexes.isSelected());
|
|
|
parameterPanel.add(useFlexes);
|
|
|
|
|
|
- JCheckBox useKillSwitches = new JCheckBox("KillSwitch");
|
|
|
- useKillSwitches.setSelected(algoUseFlexes);
|
|
|
- useKillSwitches.setBounds(900, 130, 185, 20);
|
|
|
- useKillSwitches.addActionListener(actionEvent ->
|
|
|
+ JCheckBox useSmartMeter = new JCheckBox("SmartMeter");
|
|
|
+ useSmartMeter.setSelected(algoUseFlexes);
|
|
|
+ useSmartMeter.setBounds(900, 130, 185, 20);
|
|
|
+ useSmartMeter.addActionListener(actionEvent ->
|
|
|
{
|
|
|
cancel();
|
|
|
reset();
|
|
|
- algoUseKillSwitch = useKillSwitches.isSelected();
|
|
|
+ algoUseKillSwitch = useSmartMeter.isSelected();
|
|
|
});
|
|
|
- parameterPanel.add(useKillSwitches);
|
|
|
+ parameterPanel.add(useSmartMeter);
|
|
|
|
|
|
String[] objectiveFunctionStrings = { "Normal", "Switch"};
|
|
|
JLabel fitnessLabel = new JLabel("FitnessFunction:");
|
|
|
@@ -232,7 +232,7 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
|
|
|
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
|
|
|
|
|
|
JButton resetButton = new JButton("Reset");
|
|
|
- resetButton.setToolTipText("Resets the State to before the Algorithm has runed.");
|
|
|
+ resetButton.setToolTipText("Resets the state to the initial grid configuration.");
|
|
|
resetButton.addActionListener(actionEvent -> reset());
|
|
|
buttonPanel.add(resetButton);
|
|
|
|
|
|
@@ -241,7 +241,7 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
|
|
|
buttonPanel.add(cancelButton);
|
|
|
|
|
|
JButton fitnessButton = new JButton("Evaluate");
|
|
|
- fitnessButton.setToolTipText("Fitness for the current state.");
|
|
|
+ fitnessButton.setToolTipText("Evaluate the current grid configuration.");
|
|
|
fitnessButton.addActionListener(actionEvent -> fitness());
|
|
|
buttonPanel.add(fitnessButton);
|
|
|
|
