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

Fix hard-coded namespace names in several files.

Browse Source
This commit is contained in:
Fabian Becker 2013-03-06 12:18:50 +01:00
parent 88d6c93931
commit bb1942055e
20 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/META-INF/EvA2.props
View File

@ -12,10 +12,10 @@ ServerList = localhost,134.2.172.14,ranode22
#################### Internals: Do not alter!
# base class for modules. Do not alter!
ModulePackage = eva2.server.modules
ModulePackage = eva2.optimization.modules
# filter class for modules. Do not alter!
ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter
ModuleFilterClass = eva2.optimization.modules.AbstractModuleAdapter
# Full EvA2 version number
EvA2Version = 3.0-rc1

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

@ -312,7 +312,7 @@ public class EvAClient extends JFrame implements OptimizationStateListener {
}
private void preloadClasses() {
ClassPreloader cp = new ClassPreloader("eva2.server.go.strategies.InterfaceOptimizer", "eva2.server.go.problems.InterfaceOptimizationProblem", "eva2.server.go.InterfaceTerminator");
ClassPreloader cp = new ClassPreloader("eva2.optimization.strategies.InterfaceOptimizer", "eva2.optimization.problems.InterfaceOptimizationProblem", "eva2.optimization.go.InterfaceTerminator");
new Thread(cp).start();
}

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

@ -3,8 +3,8 @@
//
//import javax.swing.*;
//
//import eva2.server.go.individuals.codings.gp.AbstractGPNode;
//import eva2.server.go.individuals.codings.gp.GPArea;
//import eva2.optimization.individuals.codings.gp.AbstractGPNode;
//import eva2.optimization.individuals.codings.gp.GPArea;
//
//import java.beans.PropertyEditor;
//import java.beans.PropertyChangeSupport;

2
src/eva2/optimization/mocco/MOCCOProblemInitialization.java
View File

@ -53,7 +53,7 @@ public class MOCCOProblemInitialization extends MOCCOPhase implements InterfaceP
Class[] altern = null;
try {
altern = ReflectPackage.getAssignableClassesInPackage("eva2.server.go.problems", Class.forName("eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem"), true, true);
altern = ReflectPackage.getAssignableClassesInPackage("eva2.optimization.problems", Class.forName("eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem"), true, true);
} catch (ClassNotFoundException e) {
e.printStackTrace();
}

6
src/eva2/optimization/operators/cluster/ClusterAll.java
View File

@ -54,7 +54,7 @@ public class ClusterAll implements InterfaceClustering, Serializable {
/*
* (non-Javadoc)
* @see eva2.server.go.operators.cluster.InterfaceClustering#cluster(eva2.server.go.populations.Population, eva2.server.go.populations.Population)
* @see eva2.optimization.operators.cluster.InterfaceClustering#cluster(eva2.optimization.populations.Population, eva2.optimization.populations.Population)
*/
@Override
public Population[] cluster(Population pop, Population referenceSet) {
@ -64,7 +64,7 @@ public class ClusterAll implements InterfaceClustering, Serializable {
/*
* (non-Javadoc)
* @see eva2.server.go.operators.cluster.InterfaceClustering#initClustering(eva2.server.go.populations.Population)
* @see eva2.optimization.operators.cluster.InterfaceClustering#initClustering(eva2.optimization.populations.Population)
*/
@Override
public String initClustering(Population pop) {
@ -73,7 +73,7 @@ public class ClusterAll implements InterfaceClustering, Serializable {
/*
* (non-Javadoc)
* @see eva2.server.go.operators.cluster.InterfaceClustering#mergingSpecies(eva2.server.go.populations.Population, eva2.server.go.populations.Population, eva2.server.go.populations.Population)
* @see eva2.optimization.operators.cluster.InterfaceClustering#mergingSpecies(eva2.optimization.populations.Population, eva2.optimization.populations.Population, eva2.optimization.populations.Population)
*/
@Override
public boolean mergingSpecies(Population species1, Population species2,

6
src/eva2/optimization/operators/mutation/MutateESGlobal.java
View File

@ -253,7 +253,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable,
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader()
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader()
*/
@Override
public String[] getAdditionalDataHeader() {
@ -262,7 +262,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable,
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo()
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo()
*/
@Override
public String[] getAdditionalDataInfo() {
@ -271,7 +271,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable,
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.server.go.PopulationInterface)
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface)
*/
@Override
public Object[] getAdditionalDataValue(PopulationInterface pop) {

6
src/eva2/optimization/operators/mutation/MutateESLocal.java
View File

@ -306,7 +306,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader()
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader()
*/
@Override
public String[] getAdditionalDataHeader() {
@ -315,7 +315,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo()
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo()
*/
@Override
public String[] getAdditionalDataInfo() {
@ -324,7 +324,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.server.go.PopulationInterface)
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface)
*/
@Override
public Object[] getAdditionalDataValue(PopulationInterface pop) {

12
src/eva2/optimization/operators/mutation/MutateESStandard.java
View File

@ -1,12 +1,12 @@
package eva2.optimization.operators.mutation;
//package eva2.server.go.operators.mutation;
//package eva2.optimization.operators.mutation;
//
//import eva2.server.go.individuals.AbstractEAIndividual;
//import eva2.server.go.individuals.InterfaceDataTypeDouble;
//import eva2.server.go.individuals.InterfaceESIndividual;
//import eva2.server.go.populations.Population;
//import eva2.server.go.problems.InterfaceOptimizationProblem;
//import eva2.optimization.individuals.AbstractEAIndividual;
//import eva2.optimization.individuals.InterfaceDataTypeDouble;
//import eva2.optimization.individuals.InterfaceESIndividual;
//import eva2.optimization.populations.Population;
//import eva2.optimization.problems.InterfaceOptimizationProblem;
//import eva2.tools.math.RNG;
//
///**

2
src/eva2/optimization/operators/paramcontrol/AbstractAdaptiveParameters.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.operators.paramcontrol;
//package eva2.server.go.operators.paramcontrol;
//package eva2.optimization.operators.paramcontrol;
//
//import java.io.Serializable;
//

2
src/eva2/optimization/operators/paramcontrol/AdaptivityEnum.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.operators.paramcontrol;
//package eva2.server.go.operators.paramcontrol;
//package eva2.optimization.operators.paramcontrol;
//
///**
// * An enum defining possible adaption types.

10
src/eva2/optimization/operators/paramcontrol/CbpsoFitnessThresholdBasedAdaption.java
View File

@ -63,7 +63,7 @@ public class CbpsoFitnessThresholdBasedAdaption implements ParamAdaption, Generi
/*
* (non-Javadoc)
* @see eva2.server.go.operators.paramcontrol.ParamAdaption#calcValue(java.lang.Object, eva2.server.go.populations.Population, int, int)
* @see eva2.optimization.operators.paramcontrol.ParamAdaption#calcValue(java.lang.Object, eva2.optimization.populations.Population, int, int)
*/
@Override
public Object calcValue(Object obj, Population pop, int iteration,
@ -126,7 +126,7 @@ public class CbpsoFitnessThresholdBasedAdaption implements ParamAdaption, Generi
/*
* (non-Javadoc)
* @see eva2.server.go.operators.paramcontrol.ParamAdaption#finish(java.lang.Object, eva2.server.go.populations.Population)
* @see eva2.optimization.operators.paramcontrol.ParamAdaption#finish(java.lang.Object, eva2.optimization.populations.Population)
*/
@Override
public void finish(Object obj, Population pop) {
@ -135,7 +135,7 @@ public class CbpsoFitnessThresholdBasedAdaption implements ParamAdaption, Generi
/*
* (non-Javadoc)
* @see eva2.server.go.operators.paramcontrol.ParamAdaption#getControlledParam()
* @see eva2.optimization.operators.paramcontrol.ParamAdaption#getControlledParam()
*/
@Override
public String getControlledParam() {
@ -144,7 +144,7 @@ public class CbpsoFitnessThresholdBasedAdaption implements ParamAdaption, Generi
/*
* (non-Javadoc)
* @see eva2.server.go.operators.paramcontrol.ParamAdaption#init(java.lang.Object, eva2.server.go.populations.Population, java.lang.Object[])
* @see eva2.optimization.operators.paramcontrol.ParamAdaption#init(java.lang.Object, eva2.optimization.populations.Population, java.lang.Object[])
*/
@Override
public void init(Object obj, Population pop, Object[] initialValues) {
@ -155,7 +155,7 @@ public class CbpsoFitnessThresholdBasedAdaption implements ParamAdaption, Generi
/*
* (non-Javadoc)
* @see eva2.server.go.operators.paramcontrol.GenericParamAdaption#setControlledParam(java.lang.String)
* @see eva2.optimization.operators.paramcontrol.GenericParamAdaption#setControlledParam(java.lang.String)
*/
@Override
public void setControlledParam(String prm) {

2
src/eva2/optimization/operators/paramcontrol/SingleParamAdaption.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.operators.paramcontrol;
//package eva2.server.go.operators.paramcontrol;
//package eva2.optimization.operators.paramcontrol;
//
//import java.io.Serializable;
//

4
src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java
View File

@ -548,7 +548,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract
/*
* (non-Javadoc)
* @see eva2.server.go.problems.AbstractOptimizationProblem#getAdditionalDataInfo(eva2.server.go.PopulationInterface)
* @see eva2.optimization.problems.AbstractOptimizationProblem#getAdditionalDataInfo(eva2.optimization.PopulationInterface)
*/
@Override
public String[] getAdditionalDataInfo() {
@ -559,7 +559,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceOptimizationProblem#getStringRepresentationForProblem(eva2.server.go.strategies.InterfaceOptimizer)
* @see eva2.optimization.problems.InterfaceOptimizationProblem#getStringRepresentationForProblem(eva2.optimization.strategies.InterfaceOptimizer)
*/
@Override
public String getStringRepresentationForProblem(InterfaceOptimizer opt) {

4
src/eva2/optimization/problems/F21Problem.java
View File

@ -94,7 +94,7 @@ public class F21Problem extends AbstractProblemDouble implements InterfaceMultim
/*
* (non-Javadoc)
* @see eva2.server.go.problems.AbstractOptimizationProblem#clone()
* @see eva2.optimization.problems.AbstractOptimizationProblem#clone()
*/
@Override
public Object clone() {
@ -103,7 +103,7 @@ public class F21Problem extends AbstractProblemDouble implements InterfaceMultim
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceInterestingHistogram#getHistogram()
* @see eva2.optimization.problems.InterfaceInterestingHistogram#getHistogram()
*/
@Override
public SolutionHistogram getHistogram() {

2
src/eva2/optimization/problems/FLensProblem.java
View File

@ -611,7 +611,7 @@ implements InterfaceOptimizationProblem, InterfaceHasSolutionViewer, java.io.Ser
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceHasSolutionViewer#getSolutionViewer()
* @see eva2.optimization.problems.InterfaceHasSolutionViewer#getSolutionViewer()
*/
@Override
public InterfaceSolutionViewer getSolutionViewer() {

6
src/eva2/optimization/strategies/EvolutionStrategyIPOP.java
View File

@ -393,7 +393,7 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader()
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader()
*/
@Override
public String[] getAdditionalDataHeader() {
@ -402,7 +402,7 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo()
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo()
*/
@Override
public String[] getAdditionalDataInfo() {
@ -411,7 +411,7 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
/*
* (non-Javadoc)
* @see eva2.server.go.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.server.go.PopulationInterface)
* @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface)
*/
@Override
public Object[] getAdditionalDataValue(PopulationInterface pop) {

28
src/eva2/optimization/strategies/MultiObjectiveCMAES.java
View File

@ -70,7 +70,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
* (non-Javadoc)
*
* @see
* eva2.server.go.strategies.InterfaceOptimizer#setIdentifier(java.lang.
* eva2.optimization.strategies.InterfaceOptimizer#setIdentifier(java.lang.
* String)
*/
@Override
@ -82,7 +82,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
* (non-Javadoc)
*
* @see
* eva2.server.go.strategies.InterfaceOptimizer#SetProblem(eva2.server.go
* eva2.optimization.strategies.InterfaceOptimizer#SetProblem(eva2.optimization
* .problems.InterfaceOptimizationProblem)
*/
@Override
@ -104,7 +104,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @see eva2.server.go.strategies.InterfaceOptimizer#getAllSolutions()
* @see eva2.optimization.strategies.InterfaceOptimizer#getAllSolutions()
*/
@Override
public InterfaceSolutionSet getAllSolutions() {
@ -115,7 +115,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @see eva2.server.go.strategies.InterfaceOptimizer#getIdentifier()
* @see eva2.optimization.strategies.InterfaceOptimizer#getIdentifier()
*/
@Override
public String getIdentifier() {
@ -125,7 +125,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @see eva2.server.go.strategies.InterfaceOptimizer#getName()
* @see eva2.optimization.strategies.InterfaceOptimizer#getName()
*/
@Override
public String getName() {
@ -139,7 +139,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @see eva2.server.go.strategies.InterfaceOptimizer#getPopulation()
* @see eva2.optimization.strategies.InterfaceOptimizer#getPopulation()
*/
@Override
public Population getPopulation() {
@ -149,7 +149,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @see eva2.server.go.strategies.InterfaceOptimizer#getProblem()
* @see eva2.optimization.strategies.InterfaceOptimizer#getProblem()
*/
@Override
public InterfaceOptimizationProblem getProblem() {
@ -160,7 +160,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
* (non-Javadoc)
*
* @see
* eva2.server.go.strategies.InterfaceOptimizer#getStringRepresentation()
* eva2.optimization.strategies.InterfaceOptimizer#getStringRepresentation()
*/
@Override
public String getStringRepresentation() {
@ -175,7 +175,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @see eva2.server.go.strategies.InterfaceOptimizer#init()
* @see eva2.optimization.strategies.InterfaceOptimizer#init()
*/
@Override
public void init() {
@ -192,7 +192,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
* (non-Javadoc)
*
* @see
* eva2.server.go.strategies.InterfaceOptimizer#initByPopulation(eva2.server
* eva2.optimization.strategies.InterfaceOptimizer#initByPopulation(eva2.server
* .go.populations.Population, boolean)
*/
@Override
@ -217,7 +217,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @see eva2.server.go.strategies.InterfaceOptimizer#optimize()
* @see eva2.optimization.strategies.InterfaceOptimizer#optimize()
*/
@Override
public void optimize() {
@ -354,9 +354,9 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
/*
* (non-Javadoc)
*
* @seeeva2.server.go.strategies.InterfaceOptimizer#
* @seeeva2.optimization.strategies.InterfaceOptimizer#
* removePopulationChangedEventListener
* (eva2.server.go.InterfacePopulationChangedEventListener)
* (eva2.optimization.InterfacePopulationChangedEventListener)
*/
@Override
public boolean removePopulationChangedEventListener(
@ -368,7 +368,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
* (non-Javadoc)
*
* @see
* eva2.server.go.strategies.InterfaceOptimizer#setPopulation(eva2.server
* eva2.optimization.strategies.InterfaceOptimizer#setPopulation(eva2.server
* .go.populations.Population)
*/
@Override

4
src/eva2/optimization/strategies/NichePSO.java
View File

@ -762,7 +762,7 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
/**
* @tested nn (non-Javadoc)
* @see
* eva2.server.go.strategies.InterfaceOptimizer#setPopulation(javaeva.server.oa.go.Populations.Population)
* eva2.optimization.strategies.InterfaceOptimizer#setPopulation(javaeva.server.oa.go.Populations.Population)
*/
@Override
public void setPopulation(Population pop) {
@ -865,7 +865,7 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
/**
* @tested junit (non-Javadoc)
* @see eva2.server.go.strategies.InterfaceOptimizer#getAllSolutions()
* @see eva2.optimization.strategies.InterfaceOptimizer#getAllSolutions()
* @return a population consisting of the personal best solutions of every
* particle in the mainswarm and all subswarms
*/

2
src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java
View File

@ -212,7 +212,7 @@ public class ParticleSubSwarmOptimization extends ParticleSwarmOptimizationGCPSO
}
/* (non-Javadoc)
* @see eva2.server.go.strategies.ParticleSwarmOptimization#addSortedIndizesTo(eva2.server.go.populations.Population)
* @see eva2.optimization.strategies.ParticleSwarmOptimization#addSortedIndizesTo(eva2.optimization.populations.Population)
*/
@Override
protected void addSortedIndicesTo(Object[] sortedPopulation, Population pop) {

2
src/eva2/tools/ReflectPackage.java
View File

@ -433,7 +433,7 @@ public class ReflectPackage {
/**
* Retrieve assignable classes of the given package from classpath given by full class and package String,
* such as eva2.server.go.problems.AbstractOptimizationProblem.
* such as eva2.optimization.problems.AbstractOptimizationProblem.
*
* @param pckg String denoting the package
* @param reqSuperCls