From ecfd7ec7397fca79f37ac3a233a3d09ede72b6bc Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Fri, 13 Apr 2012 09:27:45 +0000 Subject: [PATCH] refs #8 Lots of code cleanup. Removed unused imports, empty catch blocks, etc. --- src/eva2/OptimizerRunnable.java | 15 ++---- src/eva2/examples/TerminatorExample.java | 10 +++- src/eva2/gui/ComponentFilter.java | 7 +-- src/eva2/gui/GenericFilePathEditor.java | 15 +++--- .../gui/GenericSelectableArrayEditor.java | 47 +++--------------- src/eva2/gui/HtmlDemo.java | 10 +--- src/eva2/gui/JClassTree.java | 9 ++-- src/eva2/gui/JEFrame.java | 4 +- src/eva2/gui/JTextoutputFrame.java | 25 ++-------- src/eva2/server/ModuleServer.java | 15 ++---- src/eva2/server/go/GOStandaloneVersion.java | 38 +++++---------- src/eva2/server/go/IndividualInterface.java | 14 +++--- src/eva2/server/go/MOCCOStandalone.java | 42 +++++----------- ...IOBGAIndividualIntegerPermutationData.java | 3 -- .../go/mocco/MOCCOInitialPopulationSize.java | 16 +++---- src/eva2/server/go/mocco/MOCCOPhase.java | 10 +--- .../go/mocco/MOCCOProblemInitialization.java | 16 ++----- src/eva2/server/go/mocco/MOCCOState.java | 9 +--- .../archiving/AbstractArchiving.java | 1 - .../operators/archiving/ArchivingMaxiMin.java | 3 -- .../go/operators/archiving/ArchivingNSGA.java | 7 +-- .../operators/archiving/ArchivingNSGAII.java | 9 +--- .../archiving/ArchivingNSGAIISMeasure.java | 5 +- .../operators/archiving/ArchivingPESAII.java | 10 ++-- .../operators/archiving/ArchivingSPEAII.java | 9 +--- .../ClassificationSelfOrganizingMaps.java | 2 - .../operators/cluster/ClusteringKMeans.java | 6 +-- .../constraint/ConstraintCollection.java | 2 - .../operators/constraint/DummyConstraint.java | 1 - .../server/go/operators/crossover/CM2.java | 4 +- .../operators/crossover/CrossoverESSPX.java | 3 -- .../crossover/CrossoverGINPointVL.java | 5 +- .../distancemetric/DoubleIntegralMetric.java | 8 ++-- .../distancemetric/GenotypeMetricBitSet.java | 4 +- .../migration/MOClusteringSeparation.java | 10 +--- .../operators/migration/MOConeSeparation.java | 10 +--- .../moso/MOSODynamicallyWeightedFitness.java | 1 - .../operators/moso/MOSOEpsilonConstraint.java | 1 - .../go/operators/moso/MOSOMOGARankBased.java | 1 - .../server/go/operators/moso/MOSOMaxiMin.java | 4 -- .../go/operators/moso/MOSORankbased.java | 1 - .../go/operators/mutation/CMAParamSet.java | 9 ++-- .../MutateESCovarianceMatrixAdaption.java | 5 +- .../mutation/MutateGAGISwapBits.java | 5 +- .../ImprovementDeactivationStrategy.java | 7 +-- .../paretofrontmetrics/MetricErrorRatio.java | 6 +-- .../go/operators/postprocess/PostProcess.java | 18 ++----- .../go/operators/selection/SelectAll.java | 1 - .../selection/SelectHomologousMate.java | 5 +- .../operators/selection/SelectMOMaxiMin.java | 1 - .../terminators/DiversityTerminator.java | 6 +-- ...bstractSynchronousOptimizationProblem.java | 3 -- src/eva2/server/go/problems/F11Problem.java | 3 -- src/eva2/server/go/problems/F12Problem.java | 7 +-- src/eva2/server/go/problems/F21Problem.java | 4 +- src/eva2/server/go/problems/F3Problem.java | 1 - src/eva2/server/go/problems/F4Problem.java | 8 +--- src/eva2/server/go/problems/F5Problem.java | 8 +--- src/eva2/server/go/problems/F6Problem.java | 5 +- src/eva2/server/go/problems/F7Problem.java | 5 +- src/eva2/server/go/problems/F9Problem.java | 1 - src/eva2/server/go/problems/FM0Problem.java | 6 +-- .../server/go/problems/MatlabProblem.java | 23 +++------ src/eva2/server/go/problems/TF1Problem.java | 12 ++--- src/eva2/server/go/strategies/ANPSO.java | 8 ++-- .../go/strategies/BinaryScatterSearch.java | 1 - src/eva2/server/go/strategies/NichePSO.java | 22 +++++---- .../strategies/ParticleSwarmOptimization.java | 21 ++------ .../go/strategies/WingedMultiObjectiveEA.java | 5 -- .../server/go/tools/AbstractObjectEditor.java | 8 +--- src/eva2/server/modules/DEModuleAdapter.java | 1 - src/eva2/server/modules/EPParameters.java | 6 +-- src/eva2/server/modules/GAParameters.java | 8 +--- src/eva2/server/modules/HCParameters.java | 6 +-- src/eva2/server/modules/MCParameters.java | 8 +--- .../server/modules/MOEAModuleAdapter.java | 11 +---- src/eva2/server/modules/MOEAParameters.java | 10 +--- src/eva2/server/modules/PBILParameters.java | 4 +- src/eva2/server/modules/SAParameters.java | 6 +-- src/eva2/server/modules/SSGAParameters.java | 7 +-- src/eva2/server/stat/AbstractStatistics.java | 18 +++---- src/eva2/tools/EVAHELP.java | 48 ++++++++++--------- src/eva2/tools/JPasswordDialog.java | 12 ++--- src/eva2/tools/LogProxy.java | 20 -------- src/eva2/tools/jproxy/ThreadWrapper.java | 10 +--- src/eva2/tools/math/BayNet.java | 2 - src/eva2/tools/math/SpecialFunction.java | 2 - src/eva2/tools/math/StatisticUtils.java | 10 ++-- 88 files changed, 219 insertions(+), 596 deletions(-) diff --git a/src/eva2/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java index bf86958c..162e8237 100644 --- a/src/eva2/OptimizerRunnable.java +++ b/src/eva2/OptimizerRunnable.java @@ -1,12 +1,7 @@ package eva2; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.BitSet; - import eva2.server.go.IndividualInterface; import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.InterfaceNotifyOnInformers; import eva2.server.go.InterfaceTerminator; import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.individuals.InterfaceDataTypeDouble; @@ -17,13 +12,11 @@ import eva2.server.go.populations.Population; import eva2.server.go.populations.SolutionSet; import eva2.server.modules.GOParameters; import eva2.server.modules.Processor; -import eva2.server.stat.AbstractStatistics; -import eva2.server.stat.InterfaceStatistics; -import eva2.server.stat.InterfaceTextListener; -import eva2.server.stat.StatisticsDummy; -import eva2.server.stat.StatisticsStandalone; -import eva2.server.stat.StatsParameter; +import eva2.server.stat.*; import eva2.tools.jproxy.RemoteStateListener; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.BitSet; /** diff --git a/src/eva2/examples/TerminatorExample.java b/src/eva2/examples/TerminatorExample.java index d0ab85c5..4e5e14d9 100644 --- a/src/eva2/examples/TerminatorExample.java +++ b/src/eva2/examples/TerminatorExample.java @@ -1,8 +1,14 @@ package eva2.examples; + import eva2.OptimizerFactory; +import eva2.server.go.operators.terminators.CombinedTerminator; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; +import eva2.server.go.operators.terminators.PhenotypeConvergenceTerminator; +import eva2.server.go.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; +import eva2.server.go.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; +import eva2.server.go.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; import eva2.server.go.problems.F1Problem; -import eva2.server.go.operators.terminators.*; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.*; public class TerminatorExample { public static void main(String[] args) { diff --git a/src/eva2/gui/ComponentFilter.java b/src/eva2/gui/ComponentFilter.java index 93ce3b22..cf939ce9 100644 --- a/src/eva2/gui/ComponentFilter.java +++ b/src/eva2/gui/ComponentFilter.java @@ -9,9 +9,6 @@ package eva2.gui; * $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $ * $Author: streiche $ */ -/*==========================================================================* - * IMPORTS - *==========================================================================*/ -public interface ComponentFilter{ - public boolean accept(java.awt.Component c); +public interface ComponentFilter { + public boolean accept(java.awt.Component component); } diff --git a/src/eva2/gui/GenericFilePathEditor.java b/src/eva2/gui/GenericFilePathEditor.java index 97547264..2b86f09f 100644 --- a/src/eva2/gui/GenericFilePathEditor.java +++ b/src/eva2/gui/GenericFilePathEditor.java @@ -1,15 +1,16 @@ package eva2.gui; -import javax.swing.*; -import java.beans.PropertyEditor; -import java.beans.PropertyChangeSupport; -import java.beans.PropertyChangeListener; import java.awt.*; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import java.awt.event.ComponentListener; +import java.awt.event.ActionListener; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.beans.PropertyEditor; import java.io.File; -import java.beans.PropertyChangeEvent; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.SwingConstants; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/GenericSelectableArrayEditor.java b/src/eva2/gui/GenericSelectableArrayEditor.java index 9a4c3718..76bdbb5c 100644 --- a/src/eva2/gui/GenericSelectableArrayEditor.java +++ b/src/eva2/gui/GenericSelectableArrayEditor.java @@ -8,49 +8,14 @@ package eva2.gui; * @version: $Revision: 235 $ * $Date: 2007-11-08 13:53:51 +0100 (Thu, 08 Nov 2007) $ * $Author: mkron $ + * */ -/*==========================================================================* - * IMPORTS - *==========================================================================*/ - - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Insets; -import java.awt.Rectangle; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.beans.PropertyEditor; -import java.lang.reflect.Array; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.DefaultListModel; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.ListCellRenderer; -import javax.swing.SwingConstants; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import eva2.tools.EVAHELP; import eva2.tools.SelectedTag; -/*==========================================================================* - * CLASS DECLARATION - *==========================================================================*/ +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.JCheckBox; + public class GenericSelectableArrayEditor extends GenericArrayEditor { protected JCheckBox[] m_BlackCheck; @@ -62,7 +27,7 @@ public class GenericSelectableArrayEditor extends GenericArrayEditor { GenericArrayEditor editor = new GenericArrayEditor(); - int[] initial = { 3,45, 7}; + int[] initial = {3, 45, 7}; editor.setValue(initial); PropertyDialog pd = new PropertyDialog(editor,EVAHELP.cutClassName(editor.getClass().getName()) , 100, 100); diff --git a/src/eva2/gui/HtmlDemo.java b/src/eva2/gui/HtmlDemo.java index 4a3e9ad0..030d0def 100644 --- a/src/eva2/gui/HtmlDemo.java +++ b/src/eva2/gui/HtmlDemo.java @@ -9,16 +9,14 @@ package eva2.gui; * $Date: 2007-10-23 16:58:12 +0200 (Tue, 23 Oct 2007) $ * $Author: mkron $ */ -/*==========================================================================* - * IMPORTS - *==========================================================================*/ +import eva2.EvAInfo; +import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Toolkit; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; - import javax.swing.JEditorPane; import javax.swing.JFrame; import javax.swing.JScrollPane; @@ -27,10 +25,6 @@ import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.text.html.HTMLDocument; import javax.swing.text.html.HTMLFrameHyperlinkEvent; - -import eva2.EvAInfo; -import eva2.client.EvAClient; -import eva2.tools.BasicResourceLoader; /** * */ diff --git a/src/eva2/gui/JClassTree.java b/src/eva2/gui/JClassTree.java index b9d21fa1..0997e69e 100644 --- a/src/eva2/gui/JClassTree.java +++ b/src/eva2/gui/JClassTree.java @@ -9,14 +9,11 @@ package eva2.gui; * $Date: 2007-10-25 16:11:23 +0200 (Thu, 25 Oct 2007) $ * $Author: mkron $ */ -/*==========================================================================* - * IMPORTS - *==========================================================================*/ -import javax.swing.*; -import javax.swing.tree.*; import java.awt.*; import java.awt.event.*; -import java.util.Enumeration; +import javax.swing.*; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.TreePath; /** * diff --git a/src/eva2/gui/JEFrame.java b/src/eva2/gui/JEFrame.java index 8d545db2..38890fdc 100644 --- a/src/eva2/gui/JEFrame.java +++ b/src/eva2/gui/JEFrame.java @@ -14,8 +14,10 @@ import javax.swing.JFrame; import javax.swing.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.awt.event.*; import java.awt.*; +import java.awt.event.KeyEvent; +import java.awt.event.ActionEvent; +import java.awt.event.WindowListener; public class JEFrame extends JFrame { private boolean closeAllOnClose=false; diff --git a/src/eva2/gui/JTextoutputFrame.java b/src/eva2/gui/JTextoutputFrame.java index 22838635..757da9a7 100644 --- a/src/eva2/gui/JTextoutputFrame.java +++ b/src/eva2/gui/JTextoutputFrame.java @@ -12,33 +12,18 @@ package eva2.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ +import eva2.EvAInfo; +import eva2.server.go.tools.FileTools; +import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Frame; import java.awt.Point; import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; +import java.awt.event.*; import java.io.Serializable; - -import javax.swing.BorderFactory; -import javax.swing.JFrame; -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JViewport; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; - -import eva2.EvAInfo; -import eva2.server.go.tools.FileTools; -import eva2.tools.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/server/ModuleServer.java b/src/eva2/server/ModuleServer.java index edcab2c8..d0e8a955 100644 --- a/src/eva2/server/ModuleServer.java +++ b/src/eva2/server/ModuleServer.java @@ -10,14 +10,6 @@ package eva2.server; * $Date: 2007-12-06 16:05:11 +0100 (Thu, 06 Dec 2007) $ * $Author: mkron $ */ -/*==========================================================================* - * IMPORTS - *==========================================================================*/ -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Properties; - import eva2.server.go.InterfaceGOParameters; import eva2.server.modules.GOModuleAdapter; import eva2.server.modules.ModuleAdapter; @@ -25,10 +17,11 @@ import eva2.tools.EVAERROR; import eva2.tools.ReflectPackage; import eva2.tools.jproxy.MainAdapterClient; import eva2.tools.jproxy.RMIProxyLocal; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Properties; -/*==========================================================================* - * CLASS DECLARATION - *==========================================================================*/ /** * Collect available ModuleAdapter implementations and load them on request. */ diff --git a/src/eva2/server/go/GOStandaloneVersion.java b/src/eva2/server/go/GOStandaloneVersion.java index 30a907db..5a9ee999 100644 --- a/src/eva2/server/go/GOStandaloneVersion.java +++ b/src/eva2/server/go/GOStandaloneVersion.java @@ -1,31 +1,5 @@ package eva2.server.go; -import java.awt.BorderLayout; -import java.awt.List; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.BufferedWriter; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.net.InetAddress; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; - -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.JTabbedPane; -import javax.swing.SwingUtilities; - -import eva2.client.EvAClient; import eva2.gui.BeanInspector; import eva2.gui.JParaPanel; import eva2.server.go.individuals.AbstractEAIndividual; @@ -47,6 +21,18 @@ import eva2.server.modules.GOParameters; import eva2.tools.TokenHolder; import eva2.tools.jproxy.ThreadProxy; import eva2.tools.math.RNG; +import java.awt.BorderLayout; +import java.awt.List; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.*; +import java.net.InetAddress; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/IndividualInterface.java b/src/eva2/server/go/IndividualInterface.java index fd7541d9..c26b2684 100644 --- a/src/eva2/server/go/IndividualInterface.java +++ b/src/eva2/server/go/IndividualInterface.java @@ -22,21 +22,21 @@ public interface IndividualInterface { * * @return a clone of the individual instance */ - public IndividualInterface getClone(); + IndividualInterface getClone(); /** * Get the fitness array of the individual which may be null if none has been set. * * @return the fitness array of the individual */ - public double[] getFitness(); + double[] getFitness(); /** * Set the fitness array to the given array. * * @param fit new fitness of the individual */ - public void SetFitness (double[] fit); + void SetFitness (double[] fit); /** * Check whether the instance is dominating the given other individual and return @@ -45,7 +45,7 @@ public interface IndividualInterface { * @param other a second individual of the same type * @return true if the instance dominates the other individual, else false */ - public boolean isDominant(double[] fitness); + boolean isDominant(double[] fitness); /** * Check whether the instance is dominating the given other individual and return @@ -56,18 +56,18 @@ public interface IndividualInterface { * @param other a second individual of the same type * @return true if the instance dominates the other individual, else false */ - public boolean isDominant(IndividualInterface other); + boolean isDominant(IndividualInterface other); /** * Perform a standard mutation operation on the individual. The exact implementation * depends on the implemented genotype. */ - public void defaultMutate(); + void defaultMutate(); /** * Initialize the genotype randomly, usually in a uniform distribution. Make sure, * if the problem has an initial range (it implements InterfaceHasInitialRange), that this * initial range is used. */ - public void defaultInit(InterfaceOptimizationProblem prob); + void defaultInit(InterfaceOptimizationProblem prob); } \ No newline at end of file diff --git a/src/eva2/server/go/MOCCOStandalone.java b/src/eva2/server/go/MOCCOStandalone.java index 383b052c..fe715b48 100644 --- a/src/eva2/server/go/MOCCOStandalone.java +++ b/src/eva2/server/go/MOCCOStandalone.java @@ -1,43 +1,25 @@ package eva2.server.go; - -import javax.swing.*; - -import eva2.gui.*; +import eva2.gui.JParaPanel; +import eva2.gui.PropertyDoubleArray; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.mocco.InterfaceProcessElement; -import eva2.server.go.mocco.MOCCOChooseMOStrategy; -import eva2.server.go.mocco.MOCCOChooseReferencePoint; -import eva2.server.go.mocco.MOCCOChooseReferenceSolution; -import eva2.server.go.mocco.MOCCOInitialPopulationSize; -import eva2.server.go.mocco.MOCCOParameterizeGDF; -import eva2.server.go.mocco.MOCCOParameterizeMO; -import eva2.server.go.mocco.MOCCOParameterizeRefPoint; -import eva2.server.go.mocco.MOCCOParameterizeSO; -import eva2.server.go.mocco.MOCCOParameterizeSTEP; -import eva2.server.go.mocco.MOCCOParameterizeTchebycheff; -import eva2.server.go.mocco.MOCCOProblemInitialization; -import eva2.server.go.mocco.MOCCOProblemRedefinition; -import eva2.server.go.mocco.MOCCOState; +import eva2.server.go.mocco.*; import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; import eva2.server.go.operators.moso.InterfaceMOSOConverter; import eva2.server.go.operators.moso.MOSOWeightedFitness; import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.problems.TF1Problem; +import eva2.server.go.problems.*; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.server.go.strategies.IslandModelEA; -import eva2.server.go.tools.GeneralGOEProperty; -import eva2.tools.jproxy.ThreadProxy; - +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.Serializable; import java.io.*; -import java.awt.*; -import java.awt.event.*; -import java.util.ArrayList; +import javax.swing.*; /** * Created by IntelliJ IDEA. @@ -46,7 +28,7 @@ import java.util.ArrayList; * Time: 14:31:56 * To change this template use File | Settings | File Templates. */ -public class MOCCOStandalone implements InterfaceGOStandalone, InterfacePopulationChangedEventListener, java.io.Serializable { +public class MOCCOStandalone implements InterfaceGOStandalone, InterfacePopulationChangedEventListener, Serializable { public volatile MOCCOState m_State; private SwingWorker worker; diff --git a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java index ac2cfa58..8337dcbb 100644 --- a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java +++ b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java @@ -1,8 +1,5 @@ package eva2.server.go.individuals; - -import java.util.BitSet; - import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java b/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java index 77d096bf..a2eda29d 100644 --- a/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java +++ b/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java @@ -1,15 +1,15 @@ package eva2.server.go.mocco; - -import javax.swing.*; - -import eva2.gui.JParaPanel; import eva2.server.go.MOCCOStandalone; -import eva2.server.go.problems.InterfaceOptimizationProblem; - -import java.awt.*; -import java.awt.event.ActionListener; +import java.awt.BorderLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/mocco/MOCCOPhase.java b/src/eva2/server/go/mocco/MOCCOPhase.java index ef6274f3..32ca19be 100644 --- a/src/eva2/server/go/mocco/MOCCOPhase.java +++ b/src/eva2/server/go/mocco/MOCCOPhase.java @@ -1,23 +1,15 @@ package eva2.server.go.mocco; +import eva2.server.go.MOCCOStandalone; import java.awt.BorderLayout; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - - import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JTextArea; -import eva2.gui.PropertyBoolSelector; -import eva2.gui.PropertyPanel; -import eva2.gui.PropertyText; -import eva2.gui.PropertyValueSelector; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.tools.GeneralGOEProperty; - /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/eva2/server/go/mocco/MOCCOProblemInitialization.java b/src/eva2/server/go/mocco/MOCCOProblemInitialization.java index ec60dfea..86dadeae 100644 --- a/src/eva2/server/go/mocco/MOCCOProblemInitialization.java +++ b/src/eva2/server/go/mocco/MOCCOProblemInitialization.java @@ -1,21 +1,15 @@ package eva2.server.go.mocco; - -import javax.swing.*; - -import eva2.gui.GenericObjectEditor; import eva2.gui.JParaPanel; import eva2.server.go.MOCCOStandalone; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.tools.GeneralGOEProperty; import eva2.tools.ReflectPackage; - -import java.awt.event.ActionListener; +import java.awt.BorderLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; import java.awt.event.ActionEvent; -import java.awt.*; -import java.beans.PropertyEditorManager; -import java.util.Vector; +import java.awt.event.ActionListener; +import javax.swing.*; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/mocco/MOCCOState.java b/src/eva2/server/go/mocco/MOCCOState.java index 1732d795..0a5c6020 100644 --- a/src/eva2/server/go/mocco/MOCCOState.java +++ b/src/eva2/server/go/mocco/MOCCOState.java @@ -1,8 +1,5 @@ package eva2.server.go.mocco; - -import javax.swing.*; - import eva2.server.go.InterfaceTerminator; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingAllDominating; @@ -12,14 +9,10 @@ import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.server.go.problems.InterfaceOptimizationObjective; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.GeneticAlgorithm; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.server.go.strategies.MultiObjectiveEA; - +import java.awt.Color; import java.util.ArrayList; -import java.awt.*; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/archiving/AbstractArchiving.java b/src/eva2/server/go/operators/archiving/AbstractArchiving.java index 3f720907..977aab24 100644 --- a/src/eva2/server/go/operators/archiving/AbstractArchiving.java +++ b/src/eva2/server/go/operators/archiving/AbstractArchiving.java @@ -2,7 +2,6 @@ package eva2.server.go.operators.archiving; import eva2.gui.*; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java index 75f8a8e5..e84d0763 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java +++ b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java @@ -1,8 +1,5 @@ package eva2.server.go.operators.archiving; - -import java.util.ArrayList; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.moso.MOSOMaxiMin; import eva2.server.go.operators.selection.InterfaceSelection; diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGA.java b/src/eva2/server/go/operators/archiving/ArchivingNSGA.java index d59484e7..be9361c6 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGA.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGA.java @@ -1,8 +1,5 @@ package eva2.server.go.operators.archiving; - -import java.util.ArrayList; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; @@ -17,11 +14,11 @@ public class ArchivingNSGA extends AbstractArchiving implements java.io.Serializ public InterfaceRemoveSurplusIndividuals m_Cleaner = new RemoveSurplusIndividualsDynamicHyperCube(); - public ArchivingNSGA() { + public ArchivingNSGA() { } public ArchivingNSGA(ArchivingNSGA a) { - this.m_Cleaner = (InterfaceRemoveSurplusIndividuals)a.m_Cleaner.clone(); + this.m_Cleaner = (InterfaceRemoveSurplusIndividuals) a.m_Cleaner.clone(); } public Object clone() { diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java index 642d53c5..2c88ccac 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java @@ -1,17 +1,10 @@ package eva2.server.go.operators.archiving; - -import java.util.ArrayList; - -import eva2.gui.*; -import eva2.server.go.IndividualInterface; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCross; -import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; -import eva2.tools.math.RNG; +import java.util.ArrayList; /** The secon verison of the non dominace sorting GA. diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGAIISMeasure.java b/src/eva2/server/go/operators/archiving/ArchivingNSGAIISMeasure.java index b10e981e..de85763c 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGAIISMeasure.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGAIISMeasure.java @@ -1,12 +1,9 @@ package eva2.server.go.operators.archiving; -import java.util.Arrays; -import java.util.Collections; -import java.util.Vector; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.AbstractEAIndividualComparator; import eva2.server.go.populations.Population; +import java.util.Arrays; public class ArchivingNSGAIISMeasure extends ArchivingNSGAII { diff --git a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java index 2c9f5da9..c4d3d0ce 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java @@ -1,19 +1,15 @@ package eva2.server.go.operators.archiving; - -import java.util.ArrayList; -import java.awt.*; - -import eva2.gui.*; -import eva2.server.go.IndividualInterface; +import eva2.gui.GraphPointSet; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DLine; import eva2.tools.chart2d.DPoint; -import eva2.tools.chart2d.DPointIcon; import eva2.tools.math.RNG; +import java.awt.Color; +import java.util.ArrayList; /** The Pareto envelope sorting algorithm using a hybergrid and * the so called squezze factor. diff --git a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java index 2486b4ca..270f1cfe 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java @@ -1,20 +1,15 @@ package eva2.server.go.operators.archiving; -import java.awt.*; - -import eva2.gui.*; +import eva2.gui.GraphPointSet; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; import eva2.server.go.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; -import eva2.tools.chart2d.DPointIcon; +import java.awt.Color; /** The strength Pareto EA in it's second version, which is based on * dominance counts. diff --git a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java index edccb8bc..9c0dfa24 100644 --- a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java +++ b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java @@ -275,7 +275,6 @@ public class ClassificationSelfOrganizingMaps implements java.io.Serializable, I public void drikelWinnerTo(int[] w, double[] d, double a) { double[] vec = new double[this.m_SOM[w[0]][w[1]].length]; double[] nec = new double[this.m_SOM[w[0]][w[1]].length]; - double dist; for (int i = 0; i < this.m_SOM[w[0]][w[1]].length; i++) { vec[i] = (d[i] - this.m_Range[i][2])/(1+this.m_Range[i][3]) - this.m_SOM[w[0]][w[1]][i]; @@ -288,7 +287,6 @@ public class ClassificationSelfOrganizingMaps implements java.io.Serializable, I // not outside the array if ((this.m_SOM.length > w[0]+i) && (w[0]+i>= 0) && (this.m_SOM[0].length > w[1]+j) && (w[1]+j>= 0)) { - dist = Math.sqrt(i*i + j*j); for (int k = 0; k < this.m_SOM[0][0].length; k++) { nec[k] += (d[k] - this.m_Range[k][2])/(1+this.m_Range[k][3]) - this.m_SOM[w[0]+i][w[1]+j][k]; } diff --git a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java index 1a694a70..e58b3407 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java +++ b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.cluster; -import java.util.Arrays; - import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -14,7 +12,7 @@ import eva2.server.go.problems.F1Problem; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; -import eva2.tools.math.RNG; +import java.util.Arrays; /** The k-mean clustering algorithms. I guess it is not a hierachical * clustering method. @@ -434,4 +432,4 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab public String minClustSizeTipText() { return "Require a cluster to be at least of this size. Smaller ones are assigned to the unclustered set."; } -} \ No newline at end of file +} diff --git a/src/eva2/server/go/operators/constraint/ConstraintCollection.java b/src/eva2/server/go/operators/constraint/ConstraintCollection.java index d47b2adf..3c523e68 100644 --- a/src/eva2/server/go/operators/constraint/ConstraintCollection.java +++ b/src/eva2/server/go/operators/constraint/ConstraintCollection.java @@ -1,7 +1,5 @@ package eva2.server.go.operators.constraint; -import eva2.server.go.individuals.AbstractEAIndividual; - /** * To handle a set of constraints with a single parameter adaption mechanism. * Single constraints are diff --git a/src/eva2/server/go/operators/constraint/DummyConstraint.java b/src/eva2/server/go/operators/constraint/DummyConstraint.java index 2bd6b973..0cfaad40 100644 --- a/src/eva2/server/go/operators/constraint/DummyConstraint.java +++ b/src/eva2/server/go/operators/constraint/DummyConstraint.java @@ -1,7 +1,6 @@ package eva2.server.go.operators.constraint; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.AbstractEAIndividual; /** * This constraint is always satisfied. diff --git a/src/eva2/server/go/operators/crossover/CM2.java b/src/eva2/server/go/operators/crossover/CM2.java index 5aea16ce..5129c49b 100644 --- a/src/eva2/server/go/operators/crossover/CM2.java +++ b/src/eva2/server/go/operators/crossover/CM2.java @@ -1,13 +1,11 @@ package eva2.server.go.operators.crossover; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.BinaryScatterSearch; import eva2.tools.math.RNG; +import java.util.BitSet; /** * This crossover-Method performs an \"intersection\" of the selected Individuals diff --git a/src/eva2/server/go/operators/crossover/CrossoverESSPX.java b/src/eva2/server/go/operators/crossover/CrossoverESSPX.java index 5b702d2f..c1165d41 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESSPX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESSPX.java @@ -1,8 +1,5 @@ package eva2.server.go.operators.crossover; - -import java.util.ArrayList; - import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; diff --git a/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java b/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java index 726f86c2..18e78e5a 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java @@ -1,14 +1,11 @@ package eva2.server.go.operators.crossover; - -import java.util.BitSet; -import java.util.ArrayList; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGIIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/distancemetric/DoubleIntegralMetric.java b/src/eva2/server/go/operators/distancemetric/DoubleIntegralMetric.java index 99d83f17..52fa6795 100644 --- a/src/eva2/server/go/operators/distancemetric/DoubleIntegralMetric.java +++ b/src/eva2/server/go/operators/distancemetric/DoubleIntegralMetric.java @@ -1,11 +1,9 @@ package eva2.server.go.operators.distancemetric; -import java.io.Serializable; - import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSwarmOptimization; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; +import java.io.Serializable; /** * Calculate the euclidean difference between discrete integrals, which is @@ -19,13 +17,13 @@ import eva2.tools.math.Mathematics; * */ public class DoubleIntegralMetric implements InterfaceDistanceMetric, Serializable { - boolean oneNormed=true; // if true, the vectors are normed to unity sum before comparison. + boolean oneNormed = true; // if true, the vectors are normed to unity sum before comparison. // String indyDataKey=null; public DoubleIntegralMetric() {} public DoubleIntegralMetric(boolean normed) { - oneNormed=normed; + oneNormed = normed; } public Object clone() { diff --git a/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java b/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java index 5eeadc55..2ac82f24 100644 --- a/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java +++ b/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java @@ -1,11 +1,9 @@ package eva2.server.go.operators.distancemetric; -import java.util.BitSet; - import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.individuals.InterfaceGAIndividual; +import java.util.BitSet; /** Distance based on a bit-set if any. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java index 9de44f50..11228458 100644 --- a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java +++ b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java @@ -1,28 +1,22 @@ package eva2.server.go.operators.migration; - -import java.io.*; - import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.archiving.InterfaceArchiving; import eva2.server.go.operators.cluster.ClusteringKMeans; import eva2.server.go.operators.constraint.ConstBelongsToDifferentClass; -import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; -import eva2.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; import eva2.server.go.operators.selection.InterfaceSelection; import eva2.server.go.operators.selection.SelectRandom; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MultiObjectiveEA; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; +import java.io.BufferedWriter; +import java.io.IOException; /** This method implements the clustering based subdivision * scheme, this method rearanges the populations and may diff --git a/src/eva2/server/go/operators/migration/MOConeSeparation.java b/src/eva2/server/go/operators/migration/MOConeSeparation.java index 646fb9f4..6175c182 100644 --- a/src/eva2/server/go/operators/migration/MOConeSeparation.java +++ b/src/eva2/server/go/operators/migration/MOConeSeparation.java @@ -1,31 +1,25 @@ package eva2.server.go.operators.migration; - -import java.io.*; -import java.util.ArrayList; - import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.operators.archiving.InterfaceArchiving; -import eva2.server.go.operators.cluster.ClusteringKMeans; import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanSurface; import eva2.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; import eva2.server.go.operators.constraint.ConstObjectivesInEqualitySmallerThanSurface; import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectMOMaxiMin; import eva2.server.go.operators.selection.SelectRandom; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MultiObjectiveEA; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; +import java.io.BufferedWriter; +import java.io.IOException; /** This method implements the cone separation subdivision * scheme, this method rearanges the populations and may diff --git a/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java index 8ccbaae8..d849b212 100644 --- a/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java +++ b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java @@ -1,6 +1,5 @@ package eva2.server.go.operators.moso; -import eva2.gui.PropertyDoubleArray; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; diff --git a/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java index 23620fa9..b79be416 100644 --- a/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java +++ b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java @@ -1,7 +1,6 @@ package eva2.server.go.operators.moso; import eva2.gui.PropertyEpsilonConstraint; -import eva2.gui.PropertyEpsilonThreshold; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; diff --git a/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java index 2a761386..6375559f 100644 --- a/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java +++ b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java @@ -1,7 +1,6 @@ package eva2.server.go.operators.moso; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.populations.Population; /** diff --git a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java index 3e56073b..bdfae9e4 100644 --- a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java +++ b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java @@ -1,11 +1,7 @@ package eva2.server.go.operators.moso; -import eva2.gui.GraphPointSet; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/moso/MOSORankbased.java b/src/eva2/server/go/operators/moso/MOSORankbased.java index e06cbb95..eefb277e 100644 --- a/src/eva2/server/go/operators/moso/MOSORankbased.java +++ b/src/eva2/server/go/operators/moso/MOSORankbased.java @@ -3,7 +3,6 @@ package eva2.server.go.operators.moso; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/CMAParamSet.java b/src/eva2/server/go/operators/mutation/CMAParamSet.java index 528a5c49..aae496f0 100644 --- a/src/eva2/server/go/operators/mutation/CMAParamSet.java +++ b/src/eva2/server/go/operators/mutation/CMAParamSet.java @@ -1,17 +1,14 @@ package eva2.server.go.operators.mutation; -import java.io.Serializable; -import java.util.Arrays; - -import eva2.gui.BeanInspector; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.selection.probability.SelProbNonLinearRanking; import eva2.server.go.populations.Population; import eva2.server.go.strategies.EvolutionStrategies; import eva2.tools.EVAERROR; -import eva2.tools.math.Mathematics; import eva2.tools.math.Jama.Matrix; +import eva2.tools.math.Mathematics; +import java.io.Serializable; +import java.util.Arrays; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java index bc226595..403d5c6b 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java @@ -1,14 +1,13 @@ package eva2.server.go.operators.mutation; -import eva2.gui.BeanInspector; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.tools.math.Mathematics; -import eva2.tools.math.RNG; import eva2.tools.math.Jama.EigenvalueDecomposition; import eva2.tools.math.Jama.Matrix; +import eva2.tools.math.Mathematics; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/MutateGAGISwapBits.java b/src/eva2/server/go/operators/mutation/MutateGAGISwapBits.java index f24c844e..9c3b8e61 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAGISwapBits.java +++ b/src/eva2/server/go/operators/mutation/MutateGAGISwapBits.java @@ -1,15 +1,12 @@ package eva2.server.go.operators.mutation; - -import java.util.BitSet; - -import eva2.gui.BeanInspector; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; import eva2.server.go.individuals.InterfaceGIIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; +import java.util.BitSet; /** * Swap random pairs of values of a GA/GI individual. If preferPairs is true, unequal pairs diff --git a/src/eva2/server/go/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java b/src/eva2/server/go/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java index 61d14f82..e08dffbc 100644 --- a/src/eva2/server/go/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java +++ b/src/eva2/server/go/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java @@ -1,15 +1,12 @@ package eva2.server.go.operators.nichepso.deactivation; -import java.util.List; -import java.util.Vector; - -import eva2.server.go.InterfaceTerminator; import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.terminators.HistoryConvergenceTerminator; import eva2.server.go.populations.Population; import eva2.server.go.strategies.NichePSO; import eva2.server.go.strategies.ParticleSubSwarmOptimization; import eva2.tools.EVAERROR; +import java.util.List; +import java.util.Vector; /** * A subswarm is deactivated if all its particles are converged. diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java index b12bff16..b89495f1 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java @@ -1,17 +1,13 @@ package eva2.server.go.operators.paretofrontmetrics; -import java.io.ByteArrayInputStream; -import java.util.Properties; -import java.util.ArrayList; - import eva2.gui.PropertyFilePath; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingAllDominating; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.tools.FileTools; -import eva2.tools.ResourceLoader; +import java.util.ArrayList; /** The error ratio metric only suited for small discrete diff --git a/src/eva2/server/go/operators/postprocess/PostProcess.java b/src/eva2/server/go/operators/postprocess/PostProcess.java index 7041af0c..b1f1c643 100644 --- a/src/eva2/server/go/operators/postprocess/PostProcess.java +++ b/src/eva2/server/go/operators/postprocess/PostProcess.java @@ -1,10 +1,5 @@ package eva2.server.go.operators.postprocess; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Vector; - import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; @@ -31,14 +26,7 @@ import eva2.server.go.operators.mutation.MutateESRankMuCMA; import eva2.server.go.operators.selection.SelectBestIndividuals; import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiModalProblemKnown; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.FM0Problem; -import eva2.server.go.problems.Interface2DBorderProblem; -import eva2.server.go.problems.InterfaceHasSolutionViewer; -import eva2.server.go.problems.InterfaceInterestingHistogram; -import eva2.server.go.problems.InterfaceMultimodalProblemKnown; -import eva2.server.go.problems.InterfaceSolutionViewer; +import eva2.server.go.problems.*; import eva2.server.go.strategies.EvolutionStrategies; import eva2.server.go.strategies.GradientDescentAlgorithm; import eva2.server.go.strategies.HillClimbing; @@ -48,6 +36,10 @@ import eva2.server.stat.InterfaceTextListener; import eva2.server.stat.StatsParameter; import eva2.tools.Pair; import eva2.tools.math.Mathematics; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Vector; /** diff --git a/src/eva2/server/go/operators/selection/SelectAll.java b/src/eva2/server/go/operators/selection/SelectAll.java index bb8d4c6b..a969a690 100644 --- a/src/eva2/server/go/operators/selection/SelectAll.java +++ b/src/eva2/server/go/operators/selection/SelectAll.java @@ -2,7 +2,6 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; /** Simple method to selecet all. * In case of multiple fitness values the selection diff --git a/src/eva2/server/go/operators/selection/SelectHomologousMate.java b/src/eva2/server/go/operators/selection/SelectHomologousMate.java index d7ee6d3c..34fcd646 100644 --- a/src/eva2/server/go/operators/selection/SelectHomologousMate.java +++ b/src/eva2/server/go/operators/selection/SelectHomologousMate.java @@ -1,14 +1,11 @@ package eva2.server.go.operators.selection; -import java.util.ArrayList; - import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; -/** An experimential implementation for mating restriction. +/** An experimental implementation for mating restriction. * Possibly defunct. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java index 73c1d477..bb27ddbf 100644 --- a/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java +++ b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java @@ -3,7 +3,6 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.moso.MOSOMaxiMin; import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; /** A multi-objective selection criterion based on the maximin * method. diff --git a/src/eva2/server/go/operators/terminators/DiversityTerminator.java b/src/eva2/server/go/operators/terminators/DiversityTerminator.java index d3e08baa..716edfa9 100644 --- a/src/eva2/server/go/operators/terminators/DiversityTerminator.java +++ b/src/eva2/server/go/operators/terminators/DiversityTerminator.java @@ -1,15 +1,11 @@ package eva2.server.go.operators.terminators; -import java.io.Serializable; - import eva2.server.go.InterfaceTerminator; import eva2.server.go.PopulationInterface; import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.populations.InterfaceSolutionSet; import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.tools.SelectedTag; +import java.io.Serializable; /** * The diversity terminator uses the distance of individuals diff --git a/src/eva2/server/go/problems/AbstractSynchronousOptimizationProblem.java b/src/eva2/server/go/problems/AbstractSynchronousOptimizationProblem.java index 56344a4f..9c2459a2 100644 --- a/src/eva2/server/go/problems/AbstractSynchronousOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractSynchronousOptimizationProblem.java @@ -3,10 +3,7 @@ */ package eva2.server.go.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; /** * A synchronous problem changes in equal intervals. As the EA takes notice of the diff --git a/src/eva2/server/go/problems/F11Problem.java b/src/eva2/server/go/problems/F11Problem.java index 13caa913..0b5c6817 100644 --- a/src/eva2/server/go/problems/F11Problem.java +++ b/src/eva2/server/go/problems/F11Problem.java @@ -1,9 +1,6 @@ package eva2.server.go.problems; -import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F12Problem.java b/src/eva2/server/go/problems/F12Problem.java index 5054de6d..39fc5807 100644 --- a/src/eva2/server/go/problems/F12Problem.java +++ b/src/eva2/server/go/problems/F12Problem.java @@ -1,9 +1,6 @@ package eva2.server.go.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; +import java.io.Serializable; /** * Created by IntelliJ IDEA. @@ -12,7 +9,7 @@ import eva2.server.go.populations.Population; * Time: 14:59:33 * To change this template use File | Settings | File Templates. */ -public class F12Problem extends AbstractProblemDoubleOffset implements java.io.Serializable { +public class F12Problem extends AbstractProblemDoubleOffset implements Serializable { private final static double f12range = 5.; public F12Problem() { diff --git a/src/eva2/server/go/problems/F21Problem.java b/src/eva2/server/go/problems/F21Problem.java index 96099062..65038fdd 100644 --- a/src/eva2/server/go/problems/F21Problem.java +++ b/src/eva2/server/go/problems/F21Problem.java @@ -1,9 +1,7 @@ package eva2.server.go.problems; -import java.util.Random; - -import eva2.gui.BeanInspector; import eva2.server.go.operators.postprocess.SolutionHistogram; +import java.util.Random; /** * Langerman function: A non-separable function built from random peaks each of which is surrounded by circular ridges. diff --git a/src/eva2/server/go/problems/F3Problem.java b/src/eva2/server/go/problems/F3Problem.java index de258c2d..50128676 100644 --- a/src/eva2/server/go/problems/F3Problem.java +++ b/src/eva2/server/go/problems/F3Problem.java @@ -1,6 +1,5 @@ package eva2.server.go.problems; -import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; /** diff --git a/src/eva2/server/go/problems/F4Problem.java b/src/eva2/server/go/problems/F4Problem.java index 700654f7..e2063209 100644 --- a/src/eva2/server/go/problems/F4Problem.java +++ b/src/eva2/server/go/problems/F4Problem.java @@ -1,10 +1,6 @@ package eva2.server.go.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; +import java.io.Serializable; /** * Created by IntelliJ IDEA. @@ -13,7 +9,7 @@ import eva2.tools.math.RNG; * Time: 19:28:33 * To change this template use File | Settings | File Templates. */ -public class F4Problem extends AbstractProblemDoubleOffset implements java.io.Serializable { +public class F4Problem extends AbstractProblemDoubleOffset implements Serializable { final static double f4range = 1.28; public F4Problem() { diff --git a/src/eva2/server/go/problems/F5Problem.java b/src/eva2/server/go/problems/F5Problem.java index 34c7188c..7bf81e50 100644 --- a/src/eva2/server/go/problems/F5Problem.java +++ b/src/eva2/server/go/problems/F5Problem.java @@ -1,10 +1,6 @@ package eva2.server.go.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.tools.math.RNG; +import java.io.Serializable; /** * Created by IntelliJ IDEA. @@ -13,7 +9,7 @@ import eva2.tools.math.RNG; * Time: 19:30:52 * To change this template use File | Settings | File Templates. */ -public class F5Problem extends AbstractProblemDoubleOffset implements java.io.Serializable { +public class F5Problem extends AbstractProblemDoubleOffset implements Serializable { final static double f5range = 65.536; public F5Problem() { diff --git a/src/eva2/server/go/problems/F6Problem.java b/src/eva2/server/go/problems/F6Problem.java index 1f2aaf6a..bc9cdb08 100644 --- a/src/eva2/server/go/problems/F6Problem.java +++ b/src/eva2/server/go/problems/F6Problem.java @@ -1,18 +1,17 @@ package eva2.server.go.problems; import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.tools.math.Mathematics; import eva2.server.go.operators.postprocess.SolutionHistogram; import eva2.server.go.populations.Population; import eva2.server.go.strategies.GradientDescentAlgorithm; -import eva2.tools.math.Jama.Matrix; +import java.io.Serializable; /** * Generalized Rastrigin's function. * */ public class F6Problem extends AbstractProblemDoubleOffset -implements InterfaceMultimodalProblem, InterfaceFirstOrderDerivableProblem, InterfaceLocalSearchable, java.io.Serializable, InterfaceInterestingHistogram { +implements InterfaceMultimodalProblem, InterfaceFirstOrderDerivableProblem, InterfaceLocalSearchable, Serializable, InterfaceInterestingHistogram { private double m_A = 10; private double m_Omega = 2*Math.PI; private transient GradientDescentAlgorithm localSearchOptimizer=null; diff --git a/src/eva2/server/go/problems/F7Problem.java b/src/eva2/server/go/problems/F7Problem.java index c3956187..d457d484 100644 --- a/src/eva2/server/go/problems/F7Problem.java +++ b/src/eva2/server/go/problems/F7Problem.java @@ -2,11 +2,10 @@ package eva2.server.go.problems; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.populations.Population; import eva2.tools.SelectedTag; import eva2.tools.Tag; -import eva2.tools.math.RNG; +import java.io.Serializable; /** * Created by IntelliJ IDEA. @@ -15,7 +14,7 @@ import eva2.tools.math.RNG; * Time: 13:23:43 * To change this template use File | Settings | File Templates. */ -public class F7Problem extends AbstractProblemDoubleOffset implements java.io.Serializable { +public class F7Problem extends AbstractProblemDoubleOffset implements Serializable { private double m_t = 250; private double m_Change = 4; diff --git a/src/eva2/server/go/problems/F9Problem.java b/src/eva2/server/go/problems/F9Problem.java index 3071f920..72bc38fc 100644 --- a/src/eva2/server/go/problems/F9Problem.java +++ b/src/eva2/server/go/problems/F9Problem.java @@ -1,6 +1,5 @@ package eva2.server.go.problems; -import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; public class F9Problem extends AbstractProblemDoubleOffset implements java.io.Serializable { diff --git a/src/eva2/server/go/problems/FM0Problem.java b/src/eva2/server/go/problems/FM0Problem.java index 5f28c57b..5a4616c6 100644 --- a/src/eva2/server/go/problems/FM0Problem.java +++ b/src/eva2/server/go/problems/FM0Problem.java @@ -1,11 +1,7 @@ package eva2.server.go.problems; -import java.io.Serializable; - import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.strategies.InterfaceOptimizer; - -import eva2.server.go.problems.Interface2DBorderProblem; +import java.io.Serializable; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/MatlabProblem.java b/src/eva2/server/go/problems/MatlabProblem.java index 8c7600f2..382dd8e2 100644 --- a/src/eva2/server/go/problems/MatlabProblem.java +++ b/src/eva2/server/go/problems/MatlabProblem.java @@ -1,23 +1,9 @@ package eva2.server.go.problems; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.PrintStream; -import java.io.Serializable; -import java.util.Arrays; -import java.util.BitSet; - import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.individuals.GIIndividualIntegerData; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.individuals.InterfaceDataTypeInteger; +import eva2.server.go.individuals.*; import eva2.server.go.operators.postprocess.InterfacePostProcessParams; import eva2.server.go.operators.postprocess.PostProcess; import eva2.server.go.operators.postprocess.PostProcessParams; @@ -29,7 +15,12 @@ import eva2.server.go.operators.terminators.PopulationMeasureTerminator.Stagnati import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.server.stat.InterfaceTextListener; -import eva2.tools.ToolBox; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.io.Serializable; +import java.util.Arrays; +import java.util.BitSet; /** * Interface problem class for Matlab(TM). Towards EvA2 this behaves like any other double valued diff --git a/src/eva2/server/go/problems/TF1Problem.java b/src/eva2/server/go/problems/TF1Problem.java index 35f21d60..af1942c5 100644 --- a/src/eva2/server/go/problems/TF1Problem.java +++ b/src/eva2/server/go/problems/TF1Problem.java @@ -1,11 +1,5 @@ package eva2.server.go.problems; -import java.awt.Color; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.util.ArrayList; - -import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.gui.PropertyFilePath; import eva2.server.go.individuals.AbstractEAIndividual; @@ -15,10 +9,10 @@ import eva2.server.go.operators.moso.InterfaceMOSOConverter; import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.util.ArrayList; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/strategies/ANPSO.java b/src/eva2/server/go/strategies/ANPSO.java index a19c9b9b..0f1bbebb 100644 --- a/src/eva2/server/go/strategies/ANPSO.java +++ b/src/eva2/server/go/strategies/ANPSO.java @@ -1,10 +1,5 @@ package eva2.server.go.strategies; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.Vector; - import eva2.OptimizerFactory; import eva2.gui.GenericObjectEditor; import eva2.server.go.InterfaceTerminator; @@ -24,6 +19,9 @@ import eva2.server.modules.GOParameters; import eva2.tools.ToolBox; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; /** * The Adaptive Niching PSO(ANPSO)[1] extends the particle swarm optimizer (PSO) diff --git a/src/eva2/server/go/strategies/BinaryScatterSearch.java b/src/eva2/server/go/strategies/BinaryScatterSearch.java index e565311d..6f4fb067 100644 --- a/src/eva2/server/go/strategies/BinaryScatterSearch.java +++ b/src/eva2/server/go/strategies/BinaryScatterSearch.java @@ -240,7 +240,6 @@ public class BinaryScatterSearch implements InterfaceOptimizer, java.io.Serializ * @return the new Population */ private Population generateG1(int numToInit){ - boolean method1 = true; Population pop = generateG1Pop(numToInit, this.template); for (int i=0; i=0; j--){ if(data.get(parId[j])){ prob += (int) Math.pow(2, j); } - cnt++; } return this.nodes[next].getProbability(prob); } diff --git a/src/eva2/tools/math/SpecialFunction.java b/src/eva2/tools/math/SpecialFunction.java index c4427e8c..d4cc5f60 100644 --- a/src/eva2/tools/math/SpecialFunction.java +++ b/src/eva2/tools/math/SpecialFunction.java @@ -1,7 +1,5 @@ package eva2.tools.math; -import java.lang.Math; -import java.lang.ArithmeticException; /* ************************************************************************** diff --git a/src/eva2/tools/math/StatisticUtils.java b/src/eva2/tools/math/StatisticUtils.java index 4a2c665d..6b16eb88 100644 --- a/src/eva2/tools/math/StatisticUtils.java +++ b/src/eva2/tools/math/StatisticUtils.java @@ -1,3 +1,4 @@ +package eva2.tools.math; /////////////////////////////////////////////////////////////////////////////// // Filename: $RCSfile: StatisticUtils.java,v $ // Purpose: Interface definition for calling external programs from JOELib. @@ -11,15 +12,10 @@ // Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany // /////////////////////////////////////////////////////////////////////////////// - -package eva2.tools.math; - -import java.util.ArrayList; -import java.util.Collections; - -import eva2.gui.BeanInspector; import eva2.server.go.problems.AbstractProblemDouble; import eva2.tools.math.Jama.Matrix; +import java.util.ArrayList; +import java.util.Collections; /** * Statistic utils.