halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring and cleanup

Browse Source
This commit is contained in:
Fabian Becker 2015-12-26 18:37:26 +01:00
parent 28f442af50
commit 669fa71030
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eva2/gui/MainFrame.java
View File

@ -865,14 +865,7 @@ public class MainFrame extends JFrame implements OptimizationStateListener {
LOGGER.info(msg); LOGGER.info(msg);
} }
if (this.progressBar != null) { if (this.progressBar != null) {
Runnable doSetProgressBarValue = new Runnable() { SwingUtilities.invokeLater(() -> progressBar.setValue(percent));
@Override
public void run() {
progressBar.setValue(percent);
}
};
SwingUtilities.invokeLater(doSetProgressBarValue);
} }
} }
} }

54
src/main/java/eva2/optimization/Processor.java
View File

@ -233,7 +233,7 @@ public class Processor extends Thread implements InterfaceProcessor, InterfacePo
* the number of multiple runs has been reached. * the number of multiple runs has been reached.
*/ */
while (isOptimizationRunning() && (runCounter < statistics.getStatisticsParameters().getMultiRuns())) { while (isOptimizationRunning() && (runCounter < statistics.getStatisticsParameters().getMultiRuns())) {
LOGGER.info(String.format("Starting Optimization %d/%d", runCounter + 1, statistics.getStatisticsParameters().getMultiRuns())); LOGGER.info(String.format("Starting Optimization %d/%d (%s)", runCounter + 1, statistics.getStatisticsParameters().getMultiRuns(), getInfoString()));
statistics.startOptimizationPerformed(getInfoString(), runCounter, optimizationParameters, getInformerList()); statistics.startOptimizationPerformed(getInfoString(), runCounter, optimizationParameters, getInformerList());
problem.initializeProblem(); problem.initializeProblem();
@ -315,32 +315,58 @@ public class Processor extends Thread implements InterfaceProcessor, InterfacePo
} }
} }
private void maybeInitParamCtrl(InterfaceOptimizationParameters goParams) { private void maybeInitParamCtrl(InterfaceOptimizationParameters optimizationParameters) {
iterateParamCtrl(goParams.getOptimizer(), "initialize", new Object[]{goParams.getOptimizer(), goParams.getOptimizer().getPopulation()}); iterateParamCtrl(
iterateParamCtrl(goParams.getProblem(), "initialize", new Object[]{goParams.getProblem(), goParams.getOptimizer().getPopulation()}); optimizationParameters.getOptimizer(),
"initialize",
new Object[]{optimizationParameters.getOptimizer(), optimizationParameters.getOptimizer().getPopulation()}
);
iterateParamCtrl(
optimizationParameters.getProblem(),
"initialize",
new Object[]{optimizationParameters.getProblem(), optimizationParameters.getOptimizer().getPopulation()}
);
} }
private void maybeFinishParamCtrl(InterfaceOptimizationParameters goParams) { private void maybeFinishParamCtrl(InterfaceOptimizationParameters optimizationParameters) {
iterateParamCtrl(goParams.getOptimizer(), "finish", new Object[]{goParams.getOptimizer(), goParams.getOptimizer().getPopulation()}); iterateParamCtrl(
iterateParamCtrl(goParams.getProblem(), "finish", new Object[]{goParams.getProblem(), goParams.getOptimizer().getPopulation()}); optimizationParameters.getOptimizer(),
"finish",
new Object[]{optimizationParameters.getOptimizer(), optimizationParameters.getOptimizer().getPopulation()}
);
iterateParamCtrl(
optimizationParameters.getProblem(),
"finish",
new Object[]{optimizationParameters.getProblem(), optimizationParameters.getOptimizer().getPopulation()}
);
} }
private void maybeUpdateParamCtrl(InterfaceOptimizationParameters goParams) { private void maybeUpdateParamCtrl(InterfaceOptimizationParameters optimizationParameters) {
Object[] args; Object[] args;
InterfaceTerminator terminator = goParams.getTerminator(); InterfaceTerminator terminator = optimizationParameters.getTerminator();
InterfaceOptimizer optimizer = goParams.getOptimizer(); InterfaceOptimizer optimizer = optimizationParameters.getOptimizer();
if (terminator instanceof GenerationTerminator) { if (terminator instanceof GenerationTerminator) {
args = new Object[]{optimizer, optimizer.getPopulation(), optimizer.getPopulation().getGeneration(), ((GenerationTerminator) terminator).getGenerations()}; args = new Object[]{
optimizer,
optimizer.getPopulation(),
optimizer.getPopulation().getGeneration(),
((GenerationTerminator) terminator).getGenerations()
};
} else if (terminator instanceof EvaluationTerminator) { } else if (terminator instanceof EvaluationTerminator) {
args = new Object[]{optimizer, optimizer.getPopulation(), optimizer.getPopulation().getFunctionCalls(), ((EvaluationTerminator) terminator).getFitnessCalls()}; args = new Object[]{
optimizer,
optimizer.getPopulation(),
optimizer.getPopulation().getFunctionCalls(),
((EvaluationTerminator) terminator).getFitnessCalls()
};
} else { } else {
args = new Object[]{optimizer}; args = new Object[]{optimizer};
} }
// only if iteration counting is available // only if iteration counting is available
iterateParamCtrl(optimizer, "updateParameters", args); iterateParamCtrl(optimizer, "updateParameters", args);
args[0] = goParams.getProblem(); args[0] = optimizationParameters.getProblem();
iterateParamCtrl(goParams.getProblem(), "updateParameters", args); iterateParamCtrl(optimizationParameters.getProblem(), "updateParameters", args);
} }
/** /**