diff --git a/src/eva2/optimization/problems/SimpleProblemWrapper.java b/src/eva2/optimization/problems/SimpleProblemWrapper.java index a8bd903a..2f296cc2 100644 --- a/src/eva2/optimization/problems/SimpleProblemWrapper.java +++ b/src/eva2/optimization/problems/SimpleProblemWrapper.java @@ -8,10 +8,10 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.RNG; import eva2.util.annotation.Description; -import simpleprobs.InterfaceSimpleProblem; -import simpleprobs.SimpleF1; -import simpleprobs.SimpleProblemBinary; -import simpleprobs.SimpleProblemDouble; +import eva2.optimization.problems.simple.InterfaceSimpleProblem; +import eva2.optimization.problems.simple.SimpleF1; +import eva2.optimization.problems.simple.SimpleProblemBinary; +import eva2.optimization.problems.simple.SimpleProblemDouble; import java.util.BitSet; diff --git a/src/simpleprobs/InterfaceSimpleProblem.java b/src/eva2/optimization/problems/simple/InterfaceSimpleProblem.java similarity index 93% rename from src/simpleprobs/InterfaceSimpleProblem.java rename to src/eva2/optimization/problems/simple/InterfaceSimpleProblem.java index 8f1c7bdb..1f7838d4 100644 --- a/src/simpleprobs/InterfaceSimpleProblem.java +++ b/src/eva2/optimization/problems/simple/InterfaceSimpleProblem.java @@ -1,10 +1,8 @@ -package simpleprobs; +package eva2.optimization.problems.simple; /** * A simple interface to easily include new optimization problems in Java into the * EvA framework. - * - * @author mkron */ public interface InterfaceSimpleProblem { diff --git a/src/simpleprobs/SimpleB1.java b/src/eva2/optimization/problems/simple/SimpleB1.java similarity index 93% rename from src/simpleprobs/SimpleB1.java rename to src/eva2/optimization/problems/simple/SimpleB1.java index 11900e7d..cbc23f65 100644 --- a/src/simpleprobs/SimpleB1.java +++ b/src/eva2/optimization/problems/simple/SimpleB1.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.optimization.problems.simple; import java.util.BitSet; diff --git a/src/simpleprobs/SimpleF1.java b/src/eva2/optimization/problems/simple/SimpleF1.java similarity index 94% rename from src/simpleprobs/SimpleF1.java rename to src/eva2/optimization/problems/simple/SimpleF1.java index e8806e33..cc3af7e0 100644 --- a/src/simpleprobs/SimpleF1.java +++ b/src/eva2/optimization/problems/simple/SimpleF1.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.optimization.problems.simple; public class SimpleF1 extends SimpleProblemDouble { diff --git a/src/simpleprobs/SimpleProblemBinary.java b/src/eva2/optimization/problems/simple/SimpleProblemBinary.java similarity index 87% rename from src/simpleprobs/SimpleProblemBinary.java rename to src/eva2/optimization/problems/simple/SimpleProblemBinary.java index 9df41bdb..ce757783 100644 --- a/src/simpleprobs/SimpleProblemBinary.java +++ b/src/eva2/optimization/problems/simple/SimpleProblemBinary.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.optimization.problems.simple; import java.io.Serializable; import java.util.BitSet; diff --git a/src/simpleprobs/SimpleProblemDouble.java b/src/eva2/optimization/problems/simple/SimpleProblemDouble.java similarity index 86% rename from src/simpleprobs/SimpleProblemDouble.java rename to src/eva2/optimization/problems/simple/SimpleProblemDouble.java index c9d60dbb..7c4a496f 100644 --- a/src/simpleprobs/SimpleProblemDouble.java +++ b/src/eva2/optimization/problems/simple/SimpleProblemDouble.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.optimization.problems.simple; import java.io.Serializable; diff --git a/src/eva2/optimization/problems/simple/package-info.java b/src/eva2/optimization/problems/simple/package-info.java new file mode 100644 index 00000000..d0185ea9 --- /dev/null +++ b/src/eva2/optimization/problems/simple/package-info.java @@ -0,0 +1 @@ +package eva2.optimization.problems.simple; \ No newline at end of file diff --git a/src/simpleprobs/package-info.java b/src/simpleprobs/package-info.java deleted file mode 100644 index d5158608..00000000 --- a/src/simpleprobs/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package simpleprobs; \ No newline at end of file