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

Huge commit to refactor package name eva2.server.go to eva2.optimization.

Browse Source
This commit is contained in:
Fabian Becker 2013-02-15 15:12:34 +01:00
parent effd0d9313
commit 8263d18a21
577 changed files with 2640 additions and 2559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/eva2/OptimizerFactory.java
View File

@ -1,39 +1,61 @@
package eva2; package eva2;
import eva2.server.go.IndividualInterface; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.optimization.operators.mutation.NoMutation;
import eva2.server.go.InterfaceTerminator; import eva2.optimization.operators.mutation.MutateESFixedStepSize;
import eva2.server.go.enums.DETypeEnum; import eva2.optimization.operators.mutation.MutateESCovarianceMatrixAdaption;
import eva2.server.go.enums.MutateESCrossoverTypeEnum; import eva2.optimization.operators.mutation.MutateESGlobal;
import eva2.server.go.enums.PSOTopologyEnum; import eva2.optimization.operators.mutation.MutateESRankMuCMA;
import eva2.server.go.enums.PostProcessMethod; import eva2.optimization.strategies.ParticleSwarmOptimization;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.strategies.EvolutionStrategyIPOP;
import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.optimization.strategies.GradientDescentAlgorithm;
import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.optimization.strategies.NelderMeadSimplex;
import eva2.server.go.individuals.InterfaceESIndividual; import eva2.optimization.strategies.DifferentialEvolution;
import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.optimization.strategies.EsDpiNiching;
import eva2.server.go.operators.archiving.InformationRetrievalInserting; import eva2.optimization.strategies.HillClimbing;
import eva2.server.go.operators.archiving.InterfaceArchiving; import eva2.optimization.strategies.EvolutionStrategies;
import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; import eva2.optimization.strategies.PopulationBasedIncrementalLearning;
import eva2.server.go.operators.cluster.ClusteringDensityBased; import eva2.optimization.strategies.EsDpiNichingCma;
import eva2.server.go.operators.cluster.InterfaceClustering; import eva2.optimization.strategies.MultiObjectiveEA;
import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.optimization.strategies.GeneticAlgorithm;
import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.server.go.operators.crossover.NoCrossover; import eva2.optimization.strategies.Tribes;
import eva2.server.go.operators.distancemetric.IndividualDataMetric; import eva2.optimization.strategies.SimulatedAnnealing;
import eva2.server.go.operators.mutation.*; import eva2.optimization.strategies.ClusteringHillClimbing;
import eva2.server.go.operators.postprocess.InterfacePostProcessParams; import eva2.optimization.strategies.ClusterBasedNichingEA;
import eva2.server.go.operators.postprocess.PostProcessParams; import eva2.optimization.strategies.MonteCarloSearch;
import eva2.server.go.operators.selection.InterfaceSelection; import eva2.optimization.go.IndividualInterface;
import eva2.server.go.operators.selection.SelectBestIndividuals; import eva2.optimization.go.InterfacePopulationChangedEventListener;
import eva2.server.go.operators.terminators.CombinedTerminator; import eva2.optimization.go.InterfaceTerminator;
import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.optimization.enums.DETypeEnum;
import eva2.server.go.populations.PBILPopulation; import eva2.optimization.enums.MutateESCrossoverTypeEnum;
import eva2.server.go.populations.Population; import eva2.optimization.enums.PSOTopologyEnum;
import eva2.server.go.problems.AbstractOptimizationProblem; import eva2.optimization.enums.PostProcessMethod;
import eva2.server.go.strategies.*; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.modules.GOParameters; import eva2.optimization.individuals.InterfaceDataTypeBinary;
import eva2.server.stat.InterfaceStatistics; import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.optimization.individuals.InterfaceESIndividual;
import eva2.optimization.operators.archiving.ArchivingNSGAII;
import eva2.optimization.operators.archiving.InformationRetrievalInserting;
import eva2.optimization.operators.archiving.InterfaceArchiving;
import eva2.optimization.operators.archiving.InterfaceInformationRetrieval;
import eva2.optimization.operators.cluster.ClusteringDensityBased;
import eva2.optimization.operators.cluster.InterfaceClustering;
import eva2.optimization.operators.crossover.CrossoverESDefault;
import eva2.optimization.operators.crossover.InterfaceCrossover;
import eva2.optimization.operators.crossover.NoCrossover;
import eva2.optimization.operators.distancemetric.IndividualDataMetric;
import eva2.optimization.operators.postprocess.InterfacePostProcessParams;
import eva2.optimization.operators.postprocess.PostProcessParams;
import eva2.optimization.operators.selection.InterfaceSelection;
import eva2.optimization.operators.selection.SelectBestIndividuals;
import eva2.optimization.operators.terminators.CombinedTerminator;
import eva2.optimization.operators.terminators.EvaluationTerminator;
import eva2.optimization.populations.PBILPopulation;
import eva2.optimization.populations.Population;
import eva2.optimization.problems.AbstractOptimizationProblem;
import eva2.optimization.modules.GOParameters;
import eva2.optimization.stat.InterfaceStatistics;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.BitSet; import java.util.BitSet;

31
src/eva2/OptimizerRunnable.java
View File

@ -1,19 +1,24 @@
package eva2; package eva2;
import eva2.optimization.stat.StatisticsDummy;
import eva2.optimization.stat.InterfaceStatistics;
import eva2.optimization.stat.StatisticsParameter;
import eva2.optimization.stat.AbstractStatistics;
import eva2.optimization.stat.StatisticsStandalone;
import eva2.optimization.stat.InterfaceTextListener;
import eva2.optimization.OptimizationStateListener; import eva2.optimization.OptimizationStateListener;
import eva2.server.go.IndividualInterface; import eva2.optimization.go.IndividualInterface;
import eva2.server.go.InterfaceGOParameters; import eva2.optimization.go.InterfaceGOParameters;
import eva2.server.go.InterfaceTerminator; import eva2.optimization.go.InterfaceTerminator;
import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.optimization.individuals.InterfaceDataTypeBinary;
import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.server.go.individuals.InterfaceDataTypeInteger; import eva2.optimization.individuals.InterfaceDataTypeInteger;
import eva2.server.go.operators.postprocess.InterfacePostProcessParams; import eva2.optimization.operators.postprocess.InterfacePostProcessParams;
import eva2.server.go.operators.postprocess.PostProcessParams; import eva2.optimization.operators.postprocess.PostProcessParams;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.populations.SolutionSet; import eva2.optimization.populations.SolutionSet;
import eva2.server.modules.GOParameters; import eva2.optimization.modules.GOParameters;
import eva2.server.modules.Processor; import eva2.optimization.modules.Processor;
import eva2.server.stat.*;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.BitSet; import java.util.BitSet;

8
src/eva2/client/ClassPreloader.java
View File

@ -3,14 +3,15 @@ package eva2.client;
import eva2.gui.GenericObjectEditor; import eva2.gui.GenericObjectEditor;
/** /**
* This Runnable just requests a number of classes as does the GenericObjectEditor * This Runnable just requests a number of classes as does the
* so that they are loaded into the system cache. It can be done at startup time and * GenericObjectEditor so that they are loaded into the system cache. It can be
* accelerates later reloading. * done at startup time and accelerates later reloading.
* *
* @author mkron * @author mkron
* *
*/ */
public class ClassPreloader implements Runnable { public class ClassPreloader implements Runnable {
/** /**
* List of classes to load when ClassPreloader is started. * List of classes to load when ClassPreloader is started.
*/ */
@ -36,5 +37,4 @@ public class ClassPreloader implements Runnable {
} }
} }
} }
} }

16
src/eva2/client/EvAClient.java
View File

@ -14,14 +14,14 @@ package eva2.client;
import eva2.EvAInfo; import eva2.EvAInfo;
import eva2.gui.*; import eva2.gui.*;
import eva2.optimization.OptimizationStateListener; import eva2.optimization.OptimizationStateListener;
import eva2.server.go.InterfaceGOParameters; import eva2.optimization.go.InterfaceGOParameters;
import eva2.server.modules.AbstractModuleAdapter; import eva2.optimization.modules.AbstractModuleAdapter;
import eva2.server.modules.GOParameters; import eva2.optimization.modules.GOParameters;
import eva2.server.modules.GenericModuleAdapter; import eva2.optimization.modules.GenericModuleAdapter;
import eva2.server.modules.ModuleAdapter; import eva2.optimization.modules.ModuleAdapter;
import eva2.server.stat.AbstractStatistics; import eva2.optimization.stat.AbstractStatistics;
import eva2.server.stat.InterfaceStatisticsListener; import eva2.optimization.stat.InterfaceStatisticsListener;
import eva2.server.stat.InterfaceStatisticsParameter; import eva2.optimization.stat.InterfaceStatisticsParameter;
import eva2.tools.BasicResourceLoader; import eva2.tools.BasicResourceLoader;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.ReflectPackage; import eva2.tools.ReflectPackage;

8
src/eva2/client/EvAComAdapter.java
View File

@ -12,10 +12,10 @@ package eva2.client;
*/ */
import eva2.EvAInfo; import eva2.EvAInfo;
import eva2.gui.LoggingPanel; import eva2.gui.LoggingPanel;
import eva2.server.EvAMainAdapter; import eva2.optimization.EvAMainAdapter;
import eva2.server.EvAMainAdapterImpl; import eva2.optimization.EvAMainAdapterImpl;
import eva2.server.go.InterfaceGOParameters; import eva2.optimization.go.InterfaceGOParameters;
import eva2.server.modules.ModuleAdapter; import eva2.optimization.modules.ModuleAdapter;
import java.rmi.RemoteException; import java.rmi.RemoteException;
/** /**

16
src/eva2/examples/TerminatorExample.java
View File

@ -1,14 +1,14 @@
package eva2.examples; package eva2.examples;
import eva2.OptimizerFactory; import eva2.OptimizerFactory;
import eva2.server.go.operators.terminators.CombinedTerminator; import eva2.optimization.operators.terminators.CombinedTerminator;
import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.optimization.operators.terminators.EvaluationTerminator;
import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; import eva2.optimization.operators.terminators.FitnessConvergenceTerminator;
import eva2.server.go.operators.terminators.PhenotypeConvergenceTerminator; import eva2.optimization.operators.terminators.PhenotypeConvergenceTerminator;
import eva2.server.go.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; import eva2.optimization.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum;
import eva2.server.go.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; import eva2.optimization.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum;
import eva2.server.go.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; import eva2.optimization.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum;
import eva2.server.go.problems.F1Problem; import eva2.optimization.problems.F1Problem;
public class TerminatorExample { public class TerminatorExample {
public static void main(String[] args) { public static void main(String[] args) {

10
src/eva2/examples/TestingCbnPostProc.java
View File

@ -1,10 +1,10 @@
package eva2.examples; package eva2.examples;
import eva2.OptimizerFactory; import eva2.OptimizerFactory;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.operators.postprocess.PostProcessParams; import eva2.optimization.operators.postprocess.PostProcessParams;
import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.optimization.operators.terminators.EvaluationTerminator;
import eva2.server.go.problems.FM0Problem; import eva2.optimization.problems.FM0Problem;
import eva2.server.modules.GOParameters; import eva2.optimization.modules.GOParameters;
import java.util.List; import java.util.List;
public class TestingCbnPostProc { public class TestingCbnPostProc {

2
src/eva2/examples/TestingF1PSO.java
View File

@ -1,6 +1,6 @@
package eva2.examples; package eva2.examples;
import eva2.OptimizerFactory; import eva2.OptimizerFactory;
import eva2.server.go.problems.F1Problem; import eva2.optimization.problems.F1Problem;
public class TestingF1PSO { public class TestingF1PSO {
public static void main(String[] args) { public static void main(String[] args) {

12
src/eva2/examples/TestingGAB1.java
View File

@ -1,11 +1,11 @@
package eva2.examples; package eva2.examples;
import eva2.OptimizerFactory; import eva2.OptimizerFactory;
import eva2.server.go.operators.selection.SelectXProbRouletteWheel; import eva2.optimization.operators.selection.SelectXProbRouletteWheel;
import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.optimization.operators.terminators.EvaluationTerminator;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.problems.B1Problem; import eva2.optimization.problems.B1Problem;
import eva2.server.go.strategies.GeneticAlgorithm; import eva2.optimization.strategies.GeneticAlgorithm;
import eva2.server.modules.GOParameters; import eva2.optimization.modules.GOParameters;
import java.util.BitSet; import java.util.BitSet;
public class TestingGAB1 { public class TestingGAB1 {

14
src/eva2/examples/TestingPlusCmaEs.java
View File

@ -1,12 +1,12 @@
package eva2.examples; package eva2.examples;
import eva2.OptimizerFactory; import eva2.OptimizerFactory;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.optimization.operators.crossover.CrossoverESDefault;
import eva2.server.go.operators.mutation.MutateESCovarianceMatrixAdaption; import eva2.optimization.operators.mutation.MutateESCovarianceMatrixAdaption;
import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.optimization.operators.terminators.EvaluationTerminator;
import eva2.server.go.problems.FM0Problem; import eva2.optimization.problems.FM0Problem;
import eva2.server.go.strategies.EvolutionStrategies; import eva2.optimization.strategies.EvolutionStrategies;
import eva2.server.modules.GOParameters; import eva2.optimization.modules.GOParameters;
public class TestingPlusCmaEs { public class TestingPlusCmaEs {
public static void main(String[] args) { public static void main(String[] args) {

4
src/eva2/gui/BeanInspector.java
View File

@ -1,8 +1,8 @@
package eva2.gui; package eva2.gui;
import eva2.client.EvAClient; import eva2.client.EvAClient;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.strategies.GeneticAlgorithm; import eva2.optimization.strategies.GeneticAlgorithm;
import eva2.tools.Pair; import eva2.tools.Pair;
import eva2.tools.SelectedTag; import eva2.tools.SelectedTag;
import eva2.tools.StringTools; import eva2.tools.StringTools;

4
src/eva2/gui/EvAModuleButtonPanelMaker.java
View File

@ -10,8 +10,8 @@ package eva2.gui;
* $Author: mkron $ * $Author: mkron $
*/ */
import eva2.optimization.OptimizationStateListener; import eva2.optimization.OptimizationStateListener;
import eva2.server.modules.ModuleAdapter; import eva2.optimization.modules.ModuleAdapter;
import eva2.server.stat.EvAJob; import eva2.optimization.stat.EvAJob;
import eva2.tools.ToolBoxGui; import eva2.tools.ToolBoxGui;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;

4
src/eva2/gui/EvATabbedFrameMaker.java
View File

@ -5,8 +5,8 @@ package eva2.gui;
* $ $Date: 2007-11-21 18:06:36 +0100 (Wed, 21 Nov 2007) $ $Author: mkron $ * $ $Date: 2007-11-21 18:06:36 +0100 (Wed, 21 Nov 2007) $ $Author: mkron $
*/ */
import eva2.server.go.InterfaceNotifyOnInformers; import eva2.optimization.go.InterfaceNotifyOnInformers;
import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
import java.awt.*; import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
import java.io.Serializable; import java.io.Serializable;

4
src/eva2/gui/FunctionArea.java
View File

@ -11,8 +11,8 @@ package eva2.gui;
* IMPORTS * IMPORTS
*========================================================================== *==========================================================================
*/ */
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener;
import eva2.tools.ToolBoxGui; import eva2.tools.ToolBoxGui;
import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconCircle;
import eva2.tools.chart2d.Chart2DDPointIconContent; import eva2.tools.chart2d.Chart2DDPointIconContent;

2
src/eva2/gui/GOEPanel.java
View File

@ -1,6 +1,6 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.tools.FileTools; import eva2.optimization.tools.FileTools;
import eva2.tools.BasicResourceLoader; import eva2.tools.BasicResourceLoader;
import eva2.tools.EVAHELP; import eva2.tools.EVAHELP;
import eva2.tools.SerializedObject; import eva2.tools.SerializedObject;

4
src/eva2/gui/GenericAreaEditor.java
View File

@ -1,7 +1,7 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.optimization.individuals.codings.gp.AbstractGPNode;
import eva2.server.go.individuals.codings.gp.GPArea; import eva2.optimization.individuals.codings.gp.GPArea;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

8
src/eva2/gui/GenericOptimizationObjectivesEditor.java
View File

@ -1,10 +1,10 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.problems.InterfaceOptimizationObjective; import eva2.optimization.problems.InterfaceOptimizationObjective;
import eva2.server.go.problems.InterfaceOptimizationTarget; import eva2.optimization.problems.InterfaceOptimizationTarget;
import eva2.server.go.tools.AbstractObjectEditor; import eva2.optimization.tools.AbstractObjectEditor;
import eva2.server.go.tools.GeneralGOEProperty; import eva2.optimization.tools.GeneralGOEProperty;
import eva2.tools.BasicResourceLoader; import eva2.tools.BasicResourceLoader;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;

6
src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java
View File

@ -1,9 +1,9 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.problems.InterfaceOptimizationObjective; import eva2.optimization.problems.InterfaceOptimizationObjective;
import eva2.server.go.tools.AbstractObjectEditor; import eva2.optimization.tools.AbstractObjectEditor;
import eva2.server.go.tools.GeneralGOEProperty; import eva2.optimization.tools.GeneralGOEProperty;
import eva2.tools.BasicResourceLoader; import eva2.tools.BasicResourceLoader;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;

4
src/eva2/gui/InterfaceDPointWithContent.java
View File

@ -1,7 +1,7 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/eva2/gui/InterfaceSelectablePointIcon.java
View File

@ -1,7 +1,7 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/eva2/gui/JParaPanel.java
View File

@ -8,7 +8,7 @@ package eva2.gui;
* @author Holger Ulmer, Felix Streichert, Hannes Planatscher * @author Holger Ulmer, Felix Streichert, Hannes Planatscher
*/ */
import eva2.server.stat.EvAJobList; import eva2.optimization.stat.EvAJobList;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager; import java.beans.PropertyEditorManager;
import java.io.Serializable; import java.io.Serializable;

2
src/eva2/gui/JTextoutputFrame.java
View File

@ -6,7 +6,7 @@ package eva2.gui;
*/ */
import eva2.EvAInfo; import eva2.EvAInfo;
import eva2.server.go.tools.FileTools; import eva2.optimization.tools.FileTools;
import eva2.tools.BasicResourceLoader; import eva2.tools.BasicResourceLoader;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Point; import java.awt.Point;

2
src/eva2/gui/JTextoutputFrameInterface.java
View File

@ -1,6 +1,6 @@
package eva2.gui; package eva2.gui;
import eva2.server.stat.InterfaceTextListener; import eva2.optimization.stat.InterfaceTextListener;
/* /*
* Title: EvA2 * Title: EvA2

4
src/eva2/gui/Plot.java
View File

@ -7,8 +7,8 @@ package eva2.gui;
* +0100 (Tue, 11 Dec 2007) $ $Author: mkron $ * +0100 (Tue, 11 Dec 2007) $ $Author: mkron $
*/ */
import eva2.EvAInfo; import eva2.EvAInfo;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.tools.BasicResourceLoader; import eva2.tools.BasicResourceLoader;
import eva2.tools.chart2d.DPointSet; import eva2.tools.chart2d.DPointSet;
import java.awt.*; import java.awt.*;

4
src/eva2/gui/PropertyEditorProvider.java
View File

@ -1,7 +1,7 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.InterfaceTerminator; import eva2.optimization.go.InterfaceTerminator;
import eva2.server.go.individuals.codings.gp.GPArea; import eva2.optimization.individuals.codings.gp.GPArea;
import eva2.tools.SelectedTag; import eva2.tools.SelectedTag;
import eva2.tools.StringSelection; import eva2.tools.StringSelection;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;

2
src/eva2/gui/PropertyOptimizationObjectives.java
View File

@ -1,6 +1,6 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.problems.InterfaceOptimizationObjective; import eva2.optimization.problems.InterfaceOptimizationObjective;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/eva2/gui/PropertyOptimizationObjectivesWithParam.java
View File

@ -1,6 +1,6 @@
package eva2.gui; package eva2.gui;
import eva2.server.go.problems.InterfaceOptimizationObjective; import eva2.optimization.problems.InterfaceOptimizationObjective;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/eva2/gui/StatisticsEditor.java
View File

@ -9,7 +9,7 @@ package eva2.gui;
* $Date: 2007-10-23 13:43:24 +0200 (Tue, 23 Oct 2007) $ * $Date: 2007-10-23 13:43:24 +0200 (Tue, 23 Oct 2007) $
* $Author: mkron $ * $Author: mkron $
*/ */
import eva2.server.stat.GenericStatistics; import eva2.optimization.stat.GenericStatistics;
import java.awt.*; import java.awt.*;
import java.beans.*; import java.beans.*;
import javax.swing.*; import javax.swing.*;

4
src/eva2/gui/TopoPlot.java
View File

@ -12,8 +12,8 @@ package eva2.gui;
/*==========================================================================* /*==========================================================================*
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import eva2.server.go.problems.Interface2DBorderProblem; import eva2.optimization.problems.Interface2DBorderProblem;
import eva2.server.go.problems.InterfaceFirstOrderDerivableProblem; import eva2.optimization.problems.InterfaceFirstOrderDerivableProblem;
import eva2.tools.chart2d.DRectangle; import eva2.tools.chart2d.DRectangle;
import eva2.tools.diagram.ColorBarCalculator; import eva2.tools.diagram.ColorBarCalculator;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;

6
src/eva2/server/EvAMainAdapter.java → src/eva2/optimization/EvAMainAdapter.java
View File

@ -1,4 +1,4 @@
package eva2.server; package eva2.optimization;
/** /**
* Title: EvA2 * Title: EvA2
* Description: API for distributed and parallel computing. * Description: API for distributed and parallel computing.
@ -8,8 +8,8 @@ package eva2.server;
* $Date: 2007-11-16 17:25:09 +0100 (Fri, 16 Nov 2007) $ * $Date: 2007-11-16 17:25:09 +0100 (Fri, 16 Nov 2007) $
* $Author: mkron $ * $Author: mkron $
*/ */
import eva2.server.go.InterfaceGOParameters; import eva2.optimization.go.InterfaceGOParameters;
import eva2.server.modules.ModuleAdapter; import eva2.optimization.modules.ModuleAdapter;
/** /**
* *
*/ */

6
src/eva2/server/EvAMainAdapterImpl.java → src/eva2/optimization/EvAMainAdapterImpl.java
View File

@ -1,4 +1,4 @@
package eva2.server; package eva2.optimization;
/** /**
* Title: The JProxy Framework * Title: The JProxy Framework
@ -10,8 +10,8 @@ package eva2.server;
* $Author: mkron $ * $Author: mkron $
*/ */
import eva2.EvAInfo; import eva2.EvAInfo;
import eva2.server.go.InterfaceGOParameters; import eva2.optimization.go.InterfaceGOParameters;
import eva2.server.modules.ModuleAdapter; import eva2.optimization.modules.ModuleAdapter;
/** /**
* *
*/ */

8
src/eva2/server/ModuleServer.java → src/eva2/optimization/ModuleServer.java
View File

@ -1,4 +1,4 @@
package eva2.server; package eva2.optimization;
/* /*
* Title: EvA2 * Title: EvA2
@ -10,9 +10,9 @@ package eva2.server;
* $Date: 2007-12-06 16:05:11 +0100 (Thu, 06 Dec 2007) $ * $Date: 2007-12-06 16:05:11 +0100 (Thu, 06 Dec 2007) $
* $Author: mkron $ * $Author: mkron $
*/ */
import eva2.server.go.InterfaceGOParameters; import eva2.optimization.go.InterfaceGOParameters;
import eva2.server.modules.GOModuleAdapter; import eva2.optimization.modules.GOModuleAdapter;
import eva2.server.modules.ModuleAdapter; import eva2.optimization.modules.ModuleAdapter;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.ReflectPackage; import eva2.tools.ReflectPackage;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;

2
src/eva2/server/go/enums/BOAScoringMethods.java → src/eva2/optimization/enums/BOAScoringMethods.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.enums; package eva2.optimization.enums;
public enum BOAScoringMethods { public enum BOAScoringMethods {
BDM, K2, BIC; BDM, K2, BIC;

2
src/eva2/server/go/enums/DETypeEnum.java → src/eva2/optimization/enums/DETypeEnum.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.enums; package eva2.optimization.enums;
public enum DETypeEnum { public enum DETypeEnum {
DE1_Rand_1, DE2_CurrentToBest, DE_Best_2, TrigonometricDE,DE_CurrentToRand; DE1_Rand_1, DE2_CurrentToBest, DE_Best_2, TrigonometricDE,DE_CurrentToRand;

2
src/eva2/server/go/enums/ESMutationInitialSigma.java → src/eva2/optimization/enums/ESMutationInitialSigma.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.enums; package eva2.optimization.enums;
public enum ESMutationInitialSigma { public enum ESMutationInitialSigma {
halfRange, quarterRange, avgInitialDistance, userDefined; halfRange, quarterRange, avgInitialDistance, userDefined;

2
src/eva2/server/go/enums/MutateESCrossoverTypeEnum.java → src/eva2/optimization/enums/MutateESCrossoverTypeEnum.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.enums; package eva2.optimization.enums;
public enum MutateESCrossoverTypeEnum { public enum MutateESCrossoverTypeEnum {
none, intermediate, discrete; none, intermediate, discrete;

2
src/eva2/server/go/enums/PSOTopologyEnum.java → src/eva2/optimization/enums/PSOTopologyEnum.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.enums; package eva2.optimization.enums;
public enum PSOTopologyEnum { public enum PSOTopologyEnum {
/** /**

2
src/eva2/server/go/enums/PostProcessMethod.java → src/eva2/optimization/enums/PostProcessMethod.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.enums; package eva2.optimization.enums;
public enum PostProcessMethod { public enum PostProcessMethod {
hillClimber, nelderMead, cmaES; hillClimber, nelderMead, cmaES;

34
src/eva2/server/go/GOStandaloneVersion.java → src/eva2/optimization/go/GOStandaloneVersion.java
View File

@ -1,23 +1,23 @@
package eva2.server.go; package eva2.optimization.go;
import eva2.gui.BeanInspector; import eva2.gui.BeanInspector;
import eva2.gui.JParaPanel; import eva2.gui.JParaPanel;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.ESIndividualDoubleData;
import eva2.server.go.individuals.GAIndividualDoubleData; import eva2.optimization.individuals.GAIndividualDoubleData;
import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.optimization.individuals.InterfaceDataTypeDouble;
import eva2.server.go.operators.crossover.CrossoverGAGINPoint; import eva2.optimization.operators.crossover.CrossoverGAGINPoint;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateESFixedStepSize; import eva2.optimization.operators.mutation.MutateESFixedStepSize;
import eva2.server.go.operators.mutation.MutateESLocal; import eva2.optimization.operators.mutation.MutateESLocal;
import eva2.server.go.operators.selection.SelectTournament; import eva2.optimization.operators.selection.SelectTournament;
import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.optimization.operators.terminators.EvaluationTerminator;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.problems.F1Problem; import eva2.optimization.problems.F1Problem;
import eva2.server.go.strategies.EvolutionStrategies; import eva2.optimization.strategies.EvolutionStrategies;
import eva2.server.go.strategies.GeneticAlgorithm; import eva2.optimization.strategies.GeneticAlgorithm;
import eva2.server.go.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.server.modules.GOParameters; import eva2.optimization.modules.GOParameters;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.List; import java.awt.List;

4
src/eva2/server/go/IndividualInterface.java → src/eva2/optimization/go/IndividualInterface.java
View File

@ -1,6 +1,6 @@
package eva2.server.go; package eva2.optimization.go;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
/* /*
* Title: EvA2 * Title: EvA2

10
src/eva2/server/go/InterfaceGOParameters.java → src/eva2/optimization/go/InterfaceGOParameters.java
View File

@ -1,9 +1,9 @@
package eva2.server.go; package eva2.optimization.go;
import eva2.server.go.operators.postprocess.InterfacePostProcessParams; import eva2.optimization.operators.postprocess.InterfacePostProcessParams;
import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.server.go.strategies.InterfaceOptimizer; import eva2.optimization.strategies.InterfaceOptimizer;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/eva2/server/go/InterfaceGOStandalone.java → src/eva2/optimization/go/InterfaceGOStandalone.java
View File

@ -1,4 +1,4 @@
package eva2.server.go; package eva2.optimization.go;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/eva2/server/go/InterfaceNotifyOnInformers.java → src/eva2/optimization/go/InterfaceNotifyOnInformers.java
View File

@ -1,6 +1,6 @@
package eva2.server.go; package eva2.optimization.go;
import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
import java.util.List; import java.util.List;
public interface InterfaceNotifyOnInformers { public interface InterfaceNotifyOnInformers {

2
src/eva2/server/go/InterfacePopulationChangedEventListener.java → src/eva2/optimization/go/InterfacePopulationChangedEventListener.java
View File

@ -1,4 +1,4 @@
package eva2.server.go; package eva2.optimization.go;
/** /**

2
src/eva2/server/go/InterfaceProcessor.java → src/eva2/optimization/go/InterfaceProcessor.java
View File

@ -1,4 +1,4 @@
package eva2.server.go; package eva2.optimization.go;
import eva2.optimization.OptimizationStateListener; import eva2.optimization.OptimizationStateListener;

6
src/eva2/server/go/InterfaceTerminator.java → src/eva2/optimization/go/InterfaceTerminator.java
View File

@ -1,7 +1,7 @@
package eva2.server.go; package eva2.optimization.go;
import eva2.server.go.populations.InterfaceSolutionSet; import eva2.optimization.populations.InterfaceSolutionSet;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
/** /**
* Interface for a termination criterion. * Interface for a termination criterion.

39
src/eva2/server/go/MOCCOStandalone.java → src/eva2/optimization/go/MOCCOStandalone.java
View File

@ -1,17 +1,34 @@
package eva2.server.go; package eva2.optimization.go;
import eva2.optimization.mocco.MOCCOState;
import eva2.optimization.mocco.MOCCOParameterizeGDF;
import eva2.optimization.mocco.MOCCOParameterizeTchebycheff;
import eva2.optimization.mocco.MOCCOParameterizeRefPoint;
import eva2.optimization.mocco.MOCCOChooseReferenceSolution;
import eva2.optimization.mocco.MOCCOChooseReferencePoint;
import eva2.optimization.mocco.MOCCOParameterizeSTEP;
import eva2.optimization.mocco.MOCCOProblemInitialization;
import eva2.optimization.mocco.MOCCOProblemRedefinition;
import eva2.optimization.mocco.MOCCOParameterizeMO;
import eva2.optimization.mocco.MOCCOChooseMOStrategy;
import eva2.optimization.mocco.MOCCOInitialPopulationSize;
import eva2.optimization.mocco.MOCCOParameterizeSO;
import eva2.optimization.mocco.InterfaceProcessElement;
import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.optimization.problems.TF1Problem;
import eva2.optimization.problems.InterfaceOptimizationObjective;
import eva2.gui.JParaPanel; import eva2.gui.JParaPanel;
import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyDoubleArray;
import eva2.server.go.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.server.go.mocco.*; import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer;
import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; import eva2.optimization.operators.moso.InterfaceMOSOConverter;
import eva2.server.go.operators.moso.InterfaceMOSOConverter; import eva2.optimization.operators.moso.MOSOWeightedFitness;
import eva2.server.go.operators.moso.MOSOWeightedFitness; import eva2.optimization.operators.terminators.EvaluationTerminator;
import eva2.server.go.operators.terminators.EvaluationTerminator; import eva2.optimization.populations.Population;
import eva2.server.go.populations.Population; import eva2.optimization.strategies.InterfaceOptimizer;
import eva2.server.go.problems.*; import eva2.optimization.strategies.IslandModelEA;
import eva2.server.go.strategies.InterfaceOptimizer;
import eva2.server.go.strategies.IslandModelEA;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.GridLayout; import java.awt.GridLayout;

2
src/eva2/server/go/PopulationInterface.java → src/eva2/optimization/go/PopulationInterface.java
View File

@ -1,4 +1,4 @@
package eva2.server.go; package eva2.optimization.go;
/* /*
* Title: EvA2 * Title: EvA2
* Description: * Description:

2
src/eva2/server/go/SwingWorker.java → src/eva2/optimization/go/SwingWorker.java
View File

@ -1,4 +1,4 @@
package eva2.server.go; package eva2.optimization.go;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
/** /**

24
src/eva2/server/go/individuals/AbstractEAIndividual.java → src/eva2/optimization/individuals/AbstractEAIndividual.java
View File

@ -1,17 +1,17 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.gui.BeanInspector; import eva2.gui.BeanInspector;
import eva2.server.go.IndividualInterface; import eva2.optimization.go.IndividualInterface;
import eva2.server.go.individuals.codings.gp.InterfaceProgram; import eva2.optimization.individuals.codings.gp.InterfaceProgram;
import eva2.server.go.operators.constraint.InterfaceConstraint; import eva2.optimization.operators.constraint.InterfaceConstraint;
import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.optimization.operators.crossover.InterfaceCrossover;
import eva2.server.go.operators.crossover.NoCrossover; import eva2.optimization.operators.crossover.NoCrossover;
import eva2.server.go.operators.initialization.DefaultInitialization; import eva2.optimization.operators.initialization.DefaultInitialization;
import eva2.server.go.operators.initialization.InterfaceInitialization; import eva2.optimization.operators.initialization.InterfaceInitialization;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.NoMutation; import eva2.optimization.operators.mutation.NoMutation;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.*; import java.util.*;

2
src/eva2/server/go/individuals/AbstractEAIndividualComparator.java → src/eva2/optimization/individuals/AbstractEAIndividualComparator.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;

12
src/eva2/server/go/individuals/ESIndividualBinaryData.java → src/eva2/optimization/individuals/ESIndividualBinaryData.java
View File

@ -1,10 +1,10 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.optimization.operators.crossover.CrossoverESDefault;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateESGlobal; import eva2.optimization.operators.mutation.MutateESGlobal;
import eva2.server.go.problems.InterfaceHasInitRange; import eva2.optimization.problems.InterfaceHasInitRange;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.BitSet; import java.util.BitSet;

14
src/eva2/server/go/individuals/ESIndividualDoubleData.java → src/eva2/optimization/individuals/ESIndividualDoubleData.java
View File

@ -1,12 +1,12 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.enums.MutateESCrossoverTypeEnum; import eva2.optimization.enums.MutateESCrossoverTypeEnum;
import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.optimization.operators.crossover.CrossoverESDefault;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateESGlobal; import eva2.optimization.operators.mutation.MutateESGlobal;
import eva2.server.go.problems.InterfaceHasInitRange; import eva2.optimization.problems.InterfaceHasInitRange;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;

12
src/eva2/server/go/individuals/ESIndividualIntegerData.java → src/eva2/optimization/individuals/ESIndividualIntegerData.java
View File

@ -1,10 +1,10 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.optimization.operators.crossover.CrossoverESDefault;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateESGlobal; import eva2.optimization.operators.mutation.MutateESGlobal;
import eva2.server.go.problems.InterfaceHasInitRange; import eva2.optimization.problems.InterfaceHasInitRange;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
/** This individual uses a real-valued genotype to code for integer values. /** This individual uses a real-valued genotype to code for integer values.

12
src/eva2/server/go/individuals/ESIndividualPermutationData.java → src/eva2/optimization/individuals/ESIndividualPermutationData.java
View File

@ -1,10 +1,10 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.optimization.operators.crossover.CrossoverESDefault;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateESGlobal; import eva2.optimization.operators.mutation.MutateESGlobal;
import eva2.server.go.problems.InterfaceHasInitRange; import eva2.optimization.problems.InterfaceHasInitRange;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
/** /**

8
src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java → src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java
View File

@ -1,9 +1,9 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.BitSet; import java.util.BitSet;

12
src/eva2/server/go/individuals/GAIndividualBinaryData.java → src/eva2/optimization/individuals/GAIndividualBinaryData.java
View File

@ -1,11 +1,11 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.crossover.CrossoverGAGINPoint; import eva2.optimization.operators.crossover.CrossoverGAGINPoint;
import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.optimization.operators.crossover.InterfaceCrossover;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateGANBit; import eva2.optimization.operators.mutation.MutateGANBit;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.BitSet; import java.util.BitSet;

16
src/eva2/server/go/individuals/GAIndividualDoubleData.java → src/eva2/optimization/individuals/GAIndividualDoubleData.java
View File

@ -1,13 +1,13 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.individuals.codings.ga.GAStandardCodingDouble; import eva2.optimization.individuals.codings.ga.GAStandardCodingDouble;
import eva2.server.go.individuals.codings.ga.InterfaceGADoubleCoding; import eva2.optimization.individuals.codings.ga.InterfaceGADoubleCoding;
import eva2.server.go.operators.crossover.CrossoverGAGINPoint; import eva2.optimization.operators.crossover.CrossoverGAGINPoint;
import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.optimization.operators.crossover.InterfaceCrossover;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateGAUniform; import eva2.optimization.operators.mutation.MutateGAUniform;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.BitSet; import java.util.BitSet;

14
src/eva2/server/go/individuals/GAIndividualIntegerData.java → src/eva2/optimization/individuals/GAIndividualIntegerData.java
View File

@ -1,12 +1,12 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.individuals.codings.ga.GAStandardCodingInteger; import eva2.optimization.individuals.codings.ga.GAStandardCodingInteger;
import eva2.server.go.individuals.codings.ga.InterfaceGAIntegerCoding; import eva2.optimization.individuals.codings.ga.InterfaceGAIntegerCoding;
import eva2.server.go.operators.crossover.CrossoverGAGINPoint; import eva2.optimization.operators.crossover.CrossoverGAGINPoint;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateGANBit; import eva2.optimization.operators.mutation.MutateGANBit;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.BitSet; import java.util.BitSet;

10
src/eva2/server/go/individuals/GAPIndividualProgramData.java → src/eva2/optimization/individuals/GAPIndividualProgramData.java
View File

@ -1,10 +1,10 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.individuals.codings.gp.InterfaceProgram; import eva2.optimization.individuals.codings.gp.InterfaceProgram;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
/** This individual combines a real-valued phenotype with a tree-based phenotype. /** This individual combines a real-valued phenotype with a tree-based phenotype.

16
src/eva2/server/go/individuals/GEIndividualProgramData.java → src/eva2/optimization/individuals/GEIndividualProgramData.java
View File

@ -1,13 +1,13 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.optimization.individuals.codings.gp.AbstractGPNode;
import eva2.server.go.individuals.codings.gp.GPArea; import eva2.optimization.individuals.codings.gp.GPArea;
import eva2.server.go.individuals.codings.gp.InterfaceProgram; import eva2.optimization.individuals.codings.gp.InterfaceProgram;
import eva2.server.go.operators.crossover.CrossoverGADefault; import eva2.optimization.operators.crossover.CrossoverGADefault;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateDefault; import eva2.optimization.operators.mutation.MutateDefault;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.BitSet; import java.util.BitSet;

12
src/eva2/server/go/individuals/GIIndividualIntegerData.java → src/eva2/optimization/individuals/GIIndividualIntegerData.java
View File

@ -1,10 +1,10 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.crossover.CrossoverGIDefault; import eva2.optimization.operators.crossover.CrossoverGIDefault;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateDefault; import eva2.optimization.operators.mutation.MutateDefault;
import eva2.server.go.problems.InterfaceHasInitRange; import eva2.optimization.problems.InterfaceHasInitRange;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
/** This individual uses a integer genotype to code for integer values. /** This individual uses a integer genotype to code for integer values.

8
src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java → src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java
View File

@ -1,8 +1,8 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.populations.Population; import eva2.optimization.populations.Population;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
/** This individual combines a binary and a real-valued phenotype. /** This individual combines a binary and a real-valued phenotype.

16
src/eva2/server/go/individuals/GPIndividualProgramData.java → src/eva2/optimization/individuals/GPIndividualProgramData.java
View File

@ -1,14 +1,14 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.optimization.individuals.codings.gp.AbstractGPNode;
import eva2.server.go.individuals.codings.gp.GPArea; import eva2.optimization.individuals.codings.gp.GPArea;
import eva2.server.go.individuals.codings.gp.InterfaceProgram; import eva2.optimization.individuals.codings.gp.InterfaceProgram;
import eva2.server.go.operators.crossover.CrossoverGPDefault; import eva2.optimization.operators.crossover.CrossoverGPDefault;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateDefault; import eva2.optimization.operators.mutation.MutateDefault;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;

4
src/eva2/server/go/individuals/IndividualDistanceComparator.java → src/eva2/optimization/individuals/IndividualDistanceComparator.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator; import java.util.Comparator;

2
src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java → src/eva2/optimization/individuals/IndividualWeightedFitnessComparator.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import java.io.Serializable; import java.io.Serializable;

2
src/eva2/server/go/individuals/InterfaceDataTypeBinary.java → src/eva2/optimization/individuals/InterfaceDataTypeBinary.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import java.util.BitSet; import java.util.BitSet;

2
src/eva2/server/go/individuals/InterfaceDataTypeDouble.java → src/eva2/optimization/individuals/InterfaceDataTypeDouble.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
/** This interface gives access to a double phenotype and except /** This interface gives access to a double phenotype and except
* for problemspecific operators should only be used by the * for problemspecific operators should only be used by the

2
src/eva2/server/go/individuals/InterfaceDataTypeInteger.java → src/eva2/optimization/individuals/InterfaceDataTypeInteger.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
/** This interface gives access to a integer phenotype and except /** This interface gives access to a integer phenotype and except
* for problemspecific operators should only be used by the * for problemspecific operators should only be used by the

2
src/eva2/server/go/individuals/InterfaceDataTypePermutation.java → src/eva2/optimization/individuals/InterfaceDataTypePermutation.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
/** This interface gives access to a permutation phenotype and except /** This interface gives access to a permutation phenotype and except

4
src/eva2/server/go/individuals/InterfaceDataTypeProgram.java → src/eva2/optimization/individuals/InterfaceDataTypeProgram.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.individuals.codings.gp.InterfaceProgram; import eva2.optimization.individuals.codings.gp.InterfaceProgram;
/** This interface gives access to a program phenotype and except /** This interface gives access to a program phenotype and except
* for problemspecific operators should only be used by the * for problemspecific operators should only be used by the

2
src/eva2/server/go/individuals/InterfaceESIndividual.java → src/eva2/optimization/individuals/InterfaceESIndividual.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
/** This interface gives access to a real-valued genotype and should /** This interface gives access to a real-valued genotype and should
* only be used by mutation and crossover operators. Onyl exception are * only be used by mutation and crossover operators. Onyl exception are

2
src/eva2/server/go/individuals/InterfaceGAIndividual.java → src/eva2/optimization/individuals/InterfaceGAIndividual.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import java.util.BitSet; import java.util.BitSet;

2
src/eva2/server/go/individuals/InterfaceGIIndividual.java → src/eva2/optimization/individuals/InterfaceGIIndividual.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
/** This interface gives access to a integer genotype and should /** This interface gives access to a integer genotype and should

4
src/eva2/server/go/individuals/InterfaceGPIndividual.java → src/eva2/optimization/individuals/InterfaceGPIndividual.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.individuals.codings.gp.AbstractGPNode; import eva2.optimization.individuals.codings.gp.AbstractGPNode;
/** This interface gives access to a tree-based genotype and should /** This interface gives access to a tree-based genotype and should
* only be used by mutation and crossover operators. * only be used by mutation and crossover operators.

2
src/eva2/server/go/individuals/InterfaceOBGAIndividual.java → src/eva2/optimization/individuals/InterfaceOBGAIndividual.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
/** This interface gives access to a permutation genotype and should /** This interface gives access to a permutation genotype and should
* only be used by mutation and crossover operators. * only be used by mutation and crossover operators.

10
src/eva2/server/go/individuals/OBGAIndividualPermutationData.java → src/eva2/optimization/individuals/OBGAIndividualPermutationData.java
View File

@ -1,10 +1,10 @@
package eva2.server.go.individuals; package eva2.optimization.individuals;
import eva2.server.go.operators.crossover.CrossoverOBGAPMX; import eva2.optimization.operators.crossover.CrossoverOBGAPMX;
import eva2.server.go.operators.mutation.InterfaceMutation; import eva2.optimization.operators.mutation.InterfaceMutation;
import eva2.server.go.operators.mutation.MutateOBGAFlip; import eva2.optimization.operators.mutation.MutateOBGAFlip;
import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;
import java.util.ArrayList; import java.util.ArrayList;

2
src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java → src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.ga; package eva2.optimization.individuals.codings.ga;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;

2
src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java → src/eva2/optimization/individuals/codings/ga/GAGrayCodingInteger.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.ga; package eva2.optimization.individuals.codings.ga;
import java.util.BitSet; import java.util.BitSet;

2
src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java → src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.ga; package eva2.optimization.individuals.codings.ga;
import java.util.BitSet; import java.util.BitSet;

2
src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java → src/eva2/optimization/individuals/codings/ga/GAStandardCodingInteger.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.ga; package eva2.optimization.individuals.codings.ga;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;

2
src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java → src/eva2/optimization/individuals/codings/ga/InterfaceGADoubleCoding.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.ga; package eva2.optimization.individuals.codings.ga;
import java.util.BitSet; import java.util.BitSet;

2
src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java → src/eva2/optimization/individuals/codings/ga/InterfaceGAIntegerCoding.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.ga; package eva2.optimization.individuals.codings.ga;
import java.util.BitSet; import java.util.BitSet;

6
src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java → src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java
View File

@ -1,10 +1,10 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.gui.BeanInspector; import eva2.gui.BeanInspector;
import eva2.gui.GenericObjectEditor; import eva2.gui.GenericObjectEditor;
import eva2.server.go.problems.GPFunctionProblem; import eva2.optimization.problems.GPFunctionProblem;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.tools.Pair; import eva2.tools.Pair;
import eva2.tools.ReflectPackage; import eva2.tools.ReflectPackage;
import eva2.tools.math.Mathematics; import eva2.tools.math.Mathematics;

2
src/eva2/server/go/individuals/codings/gp/GPArea.java → src/eva2/optimization/individuals/codings/gp/GPArea.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.tools.math.RNG; import eva2.tools.math.RNG;

4
src/eva2/server/go/individuals/codings/gp/GPNodeAbs.java → src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** /**

4
src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java → src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java
View File

@ -1,8 +1,8 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** A simple add node with two arguments. /** A simple add node with two arguments.
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/eva2/server/go/individuals/codings/gp/GPNodeConst.java → src/eva2/optimization/individuals/codings/gp/GPNodeConst.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** /**
* A simple constant node with the value 1. * A simple constant node with the value 1.

4
src/eva2/server/go/individuals/codings/gp/GPNodeCos.java → src/eva2/optimization/individuals/codings/gp/GPNodeCos.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** A cos node with on argument. /** A cos node with on argument.
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java → src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** A division node with two arguments and secure division. If /** A division node with two arguments and secure division. If

4
src/eva2/server/go/individuals/codings/gp/GPNodeExp.java → src/eva2/optimization/individuals/codings/gp/GPNodeExp.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** An exponent node with one argument. /** An exponent node with one argument.
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java → src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** This nodes executes both arguments. /** This nodes executes both arguments.
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java → src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** This node executes all three arguments. /** This node executes all three arguments.
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/eva2/server/go/individuals/codings/gp/GPNodeInput.java → src/eva2/optimization/individuals/codings/gp/GPNodeInput.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** This node is able to read a sensor value from the environment (e.g. the /** This node is able to read a sensor value from the environment (e.g. the
* problem) the sensor to read is given by the identifier and has to be * problem) the sensor to read is given by the identifier and has to be

4
src/eva2/server/go/individuals/codings/gp/GPNodeMult.java → src/eva2/optimization/individuals/codings/gp/GPNodeMult.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** A multiplicator node taking two arguments. /** A multiplicator node taking two arguments.

4
src/eva2/server/go/individuals/codings/gp/GPNodeNeg.java → src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** A substraction node using two arguments. /** A substraction node using two arguments.

2
src/eva2/server/go/individuals/codings/gp/GPNodeOne.java → src/eva2/optimization/individuals/codings/gp/GPNodeOne.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
/** /**

4
src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java → src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** The node allows the program to give an output or to perform an action /** The node allows the program to give an output or to perform an action
* in the enviroment simulated in the problem. The type of action is given * in the enviroment simulated in the problem. The type of action is given

2
src/eva2/server/go/individuals/codings/gp/GPNodePi.java → src/eva2/optimization/individuals/codings/gp/GPNodePi.java
View File

@ -1,4 +1,4 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
/** /**

4
src/eva2/server/go/individuals/codings/gp/GPNodePow2.java → src/eva2/optimization/individuals/codings/gp/GPNodePow2.java
View File

@ -1,6 +1,6 @@
package eva2.server.go.individuals.codings.gp; package eva2.optimization.individuals.codings.gp;
import eva2.server.go.problems.InterfaceProgramProblem; import eva2.optimization.problems.InterfaceProgramProblem;
/** This node puts the argument to the power of two. /** This node puts the argument to the power of two.
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

Some files were not shown because too many files have changed in this diff Show More