Reformatted several files, code cleanup

This commit is contained in:
Fabian Becker 2013-02-25 16:18:04 +01:00
parent 6edf5a50f6
commit 88d6c93931
4 changed files with 79 additions and 78 deletions

View File

@ -11,6 +11,7 @@ import eva2.optimization.operators.terminators.PopulationMeasureTerminator.Stagn
import eva2.optimization.problems.F1Problem; import eva2.optimization.problems.F1Problem;
public class TerminatorExample { public class TerminatorExample {
public static void main(String[] args) { public static void main(String[] args) {
F1Problem f1 = new F1Problem(); F1Problem f1 = new F1Problem();
double[] sol; double[] sol;
@ -31,9 +32,10 @@ public class TerminatorExample {
+ " evals performed. " + " evals performed. "
+ OptimizerFactory.terminatedBecause() + OptimizerFactory.terminatedBecause()
+ " Found solution: "); + " Found solution: ");
for (int i=0; i<f1.getProblemDimension(); i++) { for (int i = 0; i < f1.getProblemDimension(); i++) {
System.out.print(sol[i] + " "); System.out.print(sol[i] + " ");
} }
System.out.println(); System.out.println();
}; }
;
} }

View File

@ -1,17 +1,19 @@
package eva2.examples; package eva2.examples;
import eva2.OptimizerFactory; import eva2.OptimizerFactory;
import eva2.optimization.problems.F1Problem; import eva2.optimization.problems.F1Problem;
public class TestingF1PSO { public class TestingF1PSO {
public static void main(String[] args) { public static void main(String[] args) {
F1Problem f1 = new F1Problem(); F1Problem f1 = new F1Problem();
// start a PSO with a runtime of 50000 evaluations // start a PSO with a runtime of 50000 evaluations
OptimizerFactory.setEvaluationTerminator(50000); OptimizerFactory.setEvaluationTerminator(50000);
double[] sol = OptimizerFactory.optimizeToDouble(OptimizerFactory.PSO, f1, null); double[] sol = OptimizerFactory.optimizeToDouble(OptimizerFactory.PSO, f1, null);
System.out.println(OptimizerFactory.terminatedBecause() + "\nFound solution: "); System.out.println(OptimizerFactory.terminatedBecause() + "\nFound solution: ");
for (int i=0; i<f1.getProblemDimension(); i++) { for (int i = 0; i < f1.getProblemDimension(); i++) {
System.out.print(sol[i] + " "); System.out.print(sol[i] + " ");
} }
System.out.println(); System.out.println();
}; }
} }

View File

@ -1,4 +1,5 @@
package eva2.examples; package eva2.examples;
import eva2.OptimizerFactory; import eva2.OptimizerFactory;
import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.operators.crossover.CrossoverESDefault; import eva2.optimization.operators.crossover.CrossoverESDefault;
@ -9,6 +10,7 @@ import eva2.optimization.strategies.EvolutionStrategies;
import eva2.optimization.modules.GOParameters; import eva2.optimization.modules.GOParameters;
public class TestingPlusCmaEs { public class TestingPlusCmaEs {
public static void main(String[] args) { public static void main(String[] args) {
// a simple bimodal target function, two optima near (1.7,0) and (-1.44/0) // a simple bimodal target function, two optima near (1.7,0) and (-1.44/0)
FM0Problem fm0 = new FM0Problem(); FM0Problem fm0 = new FM0Problem();
@ -26,15 +28,16 @@ public class TestingPlusCmaEs {
new CrossoverESDefault(), 0.1); new CrossoverESDefault(), 0.1);
// access the ES // access the ES
EvolutionStrategies es = (EvolutionStrategies)esParams.getOptimizer(); EvolutionStrategies es = (EvolutionStrategies) esParams.getOptimizer();
// set a (1+5) selection strategy // set a (1+5) selection strategy
es.setMu(1); es.setMu(1);
es.setLambda(5); es.setLambda(5);
es.setPlusStrategy(true); es.setPlusStrategy(true);
// run optimization and retrieve winner individual // run optimization and retrieve winner individual
bestIndy = (AbstractEAIndividual)OptimizerFactory.optimizeToInd(esParams, null); bestIndy = (AbstractEAIndividual) OptimizerFactory.optimizeToInd(esParams, null);
System.out.println(esParams.getTerminator().lastTerminationMessage() + "\nFound solution: " System.out.println(esParams.getTerminator().lastTerminationMessage() + "\nFound solution: "
+ AbstractEAIndividual.getDefaultDataString(bestIndy)); + AbstractEAIndividual.getDefaultDataString(bestIndy));
}; }
;
} }

View File

@ -1,16 +1,11 @@
package eva2.optimization.tools; package eva2.optimization.tools;
import eva2.tools.chart2d.*; import eva2.tools.chart2d.*;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;
/** /**
* Created by IntelliJ IDEA. *
* User: streiche
* Date: 06.05.2004
* Time: 13:17:55
* To change this template use File | Settings | File Templates.
*/ */
public class TestingDArea { public class TestingDArea {
@ -24,16 +19,15 @@ public class TestingDArea {
frame.getContentPane().add(panel); frame.getContentPane().add(panel);
DArea area = new DArea(); DArea area = new DArea();
area = new DArea();
area.setBackground(Color.white); area.setBackground(Color.white);
area.setPreferredSize( new Dimension(600,500) ); area.setPreferredSize(new Dimension(600, 500));
area.setVisibleRectangle( 1, 1, 100000, 1000 ); area.setVisibleRectangle(1, 1, 100000, 1000);
area.setVisibleRectangle( 0,-3, 10, 10 );//m_PlotArea.setAutoFocus(true); area.setVisibleRectangle(0, -3, 10, 10);//m_PlotArea.setAutoFocus(true);
area.setMinRectangle(0,0,1,1); area.setMinRectangle(0, 0, 1, 1);
ScaledBorder myBorder = new ScaledBorder(); ScaledBorder myBorder = new ScaledBorder();
myBorder.x_label = "x";//"App. " + Name + " func. calls"; myBorder.x_label = "x";//"App. " + Name + " func. calls";
myBorder.y_label = "y";//"fitness"; myBorder.y_label = "y";//"fitness";
area.setBorder( myBorder ); area.setBorder(myBorder);
area.setAutoGrid(true); area.setAutoGrid(true);
area.setGridVisible(true); area.setGridVisible(true);
DRectangle rect = new DRectangle(1, 1, 2, 2); DRectangle rect = new DRectangle(1, 1, 2, 2);