Organise imports

This commit is contained in:
2015-12-31 01:30:18 +01:00
parent 62ddb5480f
commit 004e35ebc6
40 changed files with 42 additions and 50 deletions

View File

@@ -6,8 +6,8 @@ import eva2.optimization.OptimizationParameters;
import eva2.optimization.Processor; import eva2.optimization.Processor;
import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.individuals.IndividualInterface;
import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.statistics.*; import eva2.optimization.statistics.*;
import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.problems.InterfaceAdditionalPopulationInformer;

View File

@@ -7,7 +7,10 @@ import eva2.tools.Tag;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import eva2.util.annotation.Parameter; import eva2.util.annotation.Parameter;
import java.beans.*; import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;

View File

@@ -1,7 +1,6 @@
package eva2.gui; package eva2.gui;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

View File

@@ -10,10 +10,6 @@ import eva2.tools.StringSelection;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager; import java.beans.PropertyEditorManager;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class PropertyEditorProvider { public class PropertyEditorProvider {
// if true, we use the GenericObjectEditor whenever no specific one is registered, so keep it true // if true, we use the GenericObjectEditor whenever no specific one is registered, so keep it true

View File

@@ -4,7 +4,6 @@ import eva2.gui.editor.GenericObjectEditor;
import eva2.tools.StringTools; import eva2.tools.StringTools;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import eva2.util.annotation.Hidden; import eva2.util.annotation.Hidden;
import eva2.util.annotation.Parameter;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.*; import javax.swing.table.*;
@@ -13,7 +12,7 @@ import java.awt.event.MouseEvent;
import java.beans.*; import java.beans.*;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.*; import java.util.EventObject;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;

View File

@@ -9,7 +9,6 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import java.awt.*; import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

View File

@@ -8,7 +8,10 @@ import eva2.tools.chart2d.*;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.*; import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;

View File

@@ -11,11 +11,8 @@ import javax.imageio.ImageIO;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent; import javax.swing.event.InternalFrameEvent;
import javax.swing.plaf.IconUIResource;
import javax.swing.plaf.metal.MetalIconFactory; import javax.swing.plaf.metal.MetalIconFactory;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.util.Formatter; import java.util.Formatter;

View File

@@ -9,8 +9,8 @@ import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem;
import eva2.problems.InterfaceOptimizationObjective; import eva2.problems.InterfaceOptimizationObjective;
import eva2.tools.chart2d.DPointContentSelectable;
import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointContentSelectable;
import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.ScaledBorder; import eva2.tools.chart2d.ScaledBorder;

View File

@@ -8,8 +8,8 @@ import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem;
import eva2.problems.InterfaceOptimizationObjective; import eva2.problems.InterfaceOptimizationObjective;
import eva2.tools.chart2d.DPointContentSelectable;
import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointContentSelectable;
import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.ScaledBorder; import eva2.tools.chart2d.ScaledBorder;

View File

@@ -1,9 +1,9 @@
package eva2.optimization.modules; package eva2.optimization.modules;
import eva2.gui.JParaPanel;
import eva2.gui.ModuleButtonPanelMaker; import eva2.gui.ModuleButtonPanelMaker;
import eva2.gui.TabbedFrameMaker; import eva2.gui.TabbedFrameMaker;
import eva2.gui.JParaPanel;
import eva2.gui.editor.GenericObjectEditor; import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.InterfaceOptimizationParameters;
import eva2.optimization.Processor; import eva2.optimization.Processor;

View File

@@ -4,9 +4,9 @@ import eva2.gui.plot.GraphPointSet;
import eva2.gui.plot.Plot; import eva2.gui.plot.Plot;
import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.tools.chart2d.DPointIconCross;
import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.DPointIconCross;
/** /**
* This is an abstract archiving strategy giving default implementation of determining * This is an abstract archiving strategy giving default implementation of determining

View File

@@ -4,8 +4,8 @@ import eva2.optimization.operator.moso.MOSOMaxiMin;
import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.InterfaceSelection;
import eva2.optimization.operator.selection.SelectBestIndividuals; import eva2.optimization.operator.selection.SelectBestIndividuals;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.tools.chart2d.DPointIconCross;
import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.DPointIconCross;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;

View File

@@ -1,8 +1,8 @@
package eva2.optimization.operator.archiving; package eva2.optimization.operator.archiving;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.tools.chart2d.DPointIconCross;
import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.DPointIcon;
import eva2.tools.chart2d.DPointIconCross;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import java.util.ArrayList; import java.util.ArrayList;

View File

@@ -7,9 +7,9 @@ import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric;
import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric; import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
/** /**

View File

@@ -9,9 +9,9 @@ import eva2.optimization.operator.distancemetric.EuclideanMetric;
import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.problems.F1Problem; import eva2.problems.F1Problem;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import java.util.Arrays; import java.util.Arrays;

View File

@@ -6,9 +6,9 @@ import eva2.optimization.individuals.ESIndividualDoubleData;
import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.problems.F1Problem; import eva2.problems.F1Problem;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;

View File

@@ -12,9 +12,9 @@ import eva2.optimization.population.Population;
import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.AbstractMultiObjectiveOptimizationProblem;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import java.io.BufferedWriter; import java.io.BufferedWriter;

View File

@@ -15,9 +15,9 @@ import eva2.optimization.population.Population;
import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.AbstractMultiObjectiveOptimizationProblem;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import java.io.BufferedWriter; import java.io.BufferedWriter;

View File

@@ -13,9 +13,9 @@ import eva2.optimization.population.Population;
import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.AbstractMultiObjectiveOptimizationProblem;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import java.io.BufferedWriter; import java.io.BufferedWriter;

View File

@@ -1,11 +1,11 @@
package eva2.optimization.operator.mutation; package eva2.optimization.operator.mutation;
import Jama.Matrix;
import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.InterfacePopulationChangedEventListener;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.strategies.EvolutionStrategies; import eva2.optimization.strategies.EvolutionStrategies;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import Jama.Matrix;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;
import java.io.Serializable; import java.io.Serializable;

View File

@@ -1,11 +1,11 @@
package eva2.optimization.operator.mutation; package eva2.optimization.operator.mutation;
import Jama.EigenvalueDecomposition;
import Jama.Matrix;
import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.individuals.InterfaceESIndividual;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import Jama.EigenvalueDecomposition;
import Jama.Matrix;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;

View File

@@ -3,8 +3,8 @@ package eva2.optimization.operator.mutation;
import eva2.optimization.enums.MutateESCrossoverType; import eva2.optimization.enums.MutateESCrossoverType;
import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.individuals.InterfaceESIndividual;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.problems.InterfaceAdditionalPopulationInformer;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;

View File

@@ -1,5 +1,6 @@
package eva2.optimization.operator.mutation; package eva2.optimization.operator.mutation;
import Jama.EigenvalueDecomposition;
import eva2.gui.editor.GenericObjectEditor; import eva2.gui.editor.GenericObjectEditor;
import eva2.optimization.enums.ESMutationInitialSigma; import eva2.optimization.enums.ESMutationInitialSigma;
import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
@@ -11,7 +12,6 @@ import eva2.optimization.strategies.EvolutionStrategies;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.Pair; import eva2.tools.Pair;
import Jama.EigenvalueDecomposition;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;

View File

@@ -5,9 +5,9 @@ import eva2.gui.plot.Plot;
import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.operator.archiving.ArchivingSPEAII; import eva2.optimization.operator.archiving.ArchivingSPEAII;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
/** /**

View File

@@ -1,7 +1,7 @@
package eva2.optimization.operator.terminators; package eva2.optimization.operator.terminators;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.PopulationInterface;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import eva2.util.annotation.Parameter; import eva2.util.annotation.Parameter;

View File

@@ -3,9 +3,9 @@ package eva2.optimization.operator.terminators;
import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.individuals.EAIndividualComparator; import eva2.optimization.individuals.EAIndividualComparator;
import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric; import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;

View File

@@ -3,11 +3,10 @@ package eva2.optimization.operator.terminators;
import eva2.gui.BeanInspector; import eva2.gui.BeanInspector;
import eva2.optimization.operator.paretofrontmetrics.InterfaceParetoFrontMetric; import eva2.optimization.operator.paretofrontmetrics.InterfaceParetoFrontMetric;
import eva2.optimization.operator.paretofrontmetrics.MetricS; import eva2.optimization.operator.paretofrontmetrics.MetricS;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.AbstractMultiObjectiveOptimizationProblem;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.tools.EVAERROR;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import eva2.util.annotation.Parameter; import eva2.util.annotation.Parameter;

View File

@@ -1,7 +1,7 @@
package eva2.optimization.operator.terminators; package eva2.optimization.operator.terminators;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.PopulationInterface;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;
import eva2.util.annotation.Parameter; import eva2.util.annotation.Parameter;

View File

@@ -7,8 +7,8 @@ import eva2.optimization.operator.paramcontrol.CbpsoFitnessThresholdBasedAdaptio
import eva2.optimization.operator.paramcontrol.LinearParamAdaption; import eva2.optimization.operator.paramcontrol.LinearParamAdaption;
import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.paramcontrol.ParamAdaption;
import eva2.optimization.operator.paramcontrol.SinusoidalParamAdaption; import eva2.optimization.operator.paramcontrol.SinusoidalParamAdaption;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.SolutionSet; import eva2.optimization.population.SolutionSet;
import eva2.problems.AbstractProblemDouble; import eva2.problems.AbstractProblemDouble;
import eva2.problems.InterfaceInterestingHistogram; import eva2.problems.InterfaceInterestingHistogram;

View File

@@ -18,9 +18,9 @@ import eva2.optimization.operator.paramcontrol.ParamAdaption;
import eva2.optimization.operator.paramcontrol.ParameterControlManager; import eva2.optimization.operator.paramcontrol.ParameterControlManager;
import eva2.optimization.operator.terminators.HistoryConvergenceTerminator; import eva2.optimization.operator.terminators.HistoryConvergenceTerminator;
import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.InterfacePopulationChangedEventListener;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.SolutionSet; import eva2.optimization.population.SolutionSet;
import eva2.problems.*; import eva2.problems.*;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;

View File

@@ -5,7 +5,6 @@ import eva2.optimization.operator.mutation.InterfaceMutation;
import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.SolutionSet; import eva2.optimization.population.SolutionSet;
import eva2.problems.B1Problem;
import eva2.problems.InterfaceOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;

View File

@@ -22,8 +22,8 @@ import eva2.optimization.operator.paramcontrol.ParamAdaption;
import eva2.optimization.operator.paramcontrol.ParameterControlManager; import eva2.optimization.operator.paramcontrol.ParameterControlManager;
import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.EvaluationTerminator;
import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.SolutionSet; import eva2.optimization.population.SolutionSet;
import eva2.problems.*; import eva2.problems.*;
import eva2.tools.chart2d.*; import eva2.tools.chart2d.*;

View File

@@ -1,5 +1,6 @@
package eva2.optimization.strategies; package eva2.optimization.strategies;
import Jama.Matrix;
import eva2.gui.BeanInspector; import eva2.gui.BeanInspector;
import eva2.gui.editor.GenericObjectEditor; import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.plot.Plot; import eva2.gui.plot.Plot;
@@ -11,16 +12,15 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.optimization.operator.distancemetric.PhenotypeMetric; import eva2.optimization.operator.distancemetric.PhenotypeMetric;
import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.paramcontrol.ParamAdaption;
import eva2.optimization.operator.paramcontrol.ParameterControlManager; import eva2.optimization.operator.paramcontrol.ParameterControlManager;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.SolutionSet; import eva2.optimization.population.SolutionSet;
import eva2.problems.Interface2DBorderProblem; import eva2.problems.Interface2DBorderProblem;
import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.problems.InterfaceAdditionalPopulationInformer;
import eva2.problems.InterfaceProblemDouble; import eva2.problems.InterfaceProblemDouble;
import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointSet; import eva2.tools.chart2d.DPointSet;
import Jama.Matrix;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import eva2.util.annotation.Description; import eva2.util.annotation.Description;

View File

@@ -7,7 +7,6 @@ import eva2.gui.PropertyEditorProvider;
import eva2.gui.PropertySheetPanel; import eva2.gui.PropertySheetPanel;
import eva2.gui.editor.GenericObjectEditor; import eva2.gui.editor.GenericObjectEditor;
import eva2.tools.StringTools; import eva2.tools.StringTools;
import eva2.util.annotation.Parameter;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

View File

@@ -6,8 +6,8 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric;
import eva2.optimization.operator.distancemetric.PhenotypeMetric; import eva2.optimization.operator.distancemetric.PhenotypeMetric;
import eva2.optimization.operator.postprocess.PostProcess; import eva2.optimization.operator.postprocess.PostProcess;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.ToolBox; import eva2.tools.ToolBox;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;

View File

@@ -14,9 +14,9 @@ import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.PopulationInterface;
import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.tools.ToolBox; import eva2.tools.ToolBox;
import eva2.tools.chart2d.DPoint;
import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconCircle;
import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPointIconText;
import eva2.tools.chart2d.DPoint;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

View File

@@ -1,5 +1,6 @@
package eva2.problems; package eva2.problems;
import Jama.Matrix;
import eva2.gui.editor.GenericObjectEditor; import eva2.gui.editor.GenericObjectEditor;
import eva2.gui.plot.TopoPlot; import eva2.gui.plot.TopoPlot;
import eva2.optimization.enums.PostProcessMethod; import eva2.optimization.enums.PostProcessMethod;
@@ -13,13 +14,12 @@ import eva2.optimization.operator.terminators.FitnessConvergenceTerminator;
import eva2.optimization.operator.terminators.PopulationMeasureTerminator.ChangeTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.ChangeTypeEnum;
import eva2.optimization.operator.terminators.PopulationMeasureTerminator.DirectionTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.DirectionTypeEnum;
import eva2.optimization.operator.terminators.PopulationMeasureTerminator.StagnationTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.StagnationTypeEnum;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.tools.Pair; import eva2.tools.Pair;
import eva2.tools.ToolBox; import eva2.tools.ToolBox;
import eva2.tools.diagram.ColorBarCalculator; import eva2.tools.diagram.ColorBarCalculator;
import Jama.Matrix;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import eva2.util.annotation.Parameter; import eva2.util.annotation.Parameter;

View File

@@ -3,8 +3,8 @@ package eva2.problems;
import eva2.gui.plot.Plot; import eva2.gui.plot.Plot;
import eva2.optimization.individuals.*; import eva2.optimization.individuals.*;
import eva2.optimization.individuals.codings.gp.*; import eva2.optimization.individuals.codings.gp.*;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInterface;
import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.problems.regression.InterfaceRegressionFunction; import eva2.problems.regression.InterfaceRegressionFunction;
import eva2.problems.regression.RFKoza_GPI_7_3; import eva2.problems.regression.RFKoza_GPI_7_3;

View File

@@ -3,7 +3,6 @@ package eva2.yaml;
import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric;
import eva2.optimization.population.Population; import eva2.optimization.population.Population;
import eva2.optimization.population.PopulationInitMethod; import eva2.optimization.population.PopulationInitMethod;
import eva2.tools.Pair;
import org.yaml.snakeyaml.constructor.AbstractConstruct; import org.yaml.snakeyaml.constructor.AbstractConstruct;
import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.MappingNode;