diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..bb17bb3 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,20 @@ +FROM debian:buster + +RUN apt-get clean +RUN apt-get update --fix-missing +RUN apt-get update +#RUN sed -i 's:^path-exclude=/usr/share/man:#path-exclude=/usr/share/man:' /etc/dpkg/dpkg.cfg.d/excludes +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y locales bash-completion whois time wget git maven default-jdk + +# LOCALE +RUN sed -i '/es_ES.UTF-8/s/^# //g' /etc/locale.gen && locale-gen +ENV LANG es_ES.UTF-8 +ENV LANGUAGE es_ES:es +ENV LC_ALL es_ES.UTF-8 + +# USUARIO +RUN useradd -m usuario -p sa5u2O0Xjsufg +#RUN usermod -aG sudo usuario + +USER usuario +WORKDIR /home/usuario diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..431acc4 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,16 @@ +{ + "name": "eco-rwa", + "dockerFile": "Dockerfile", + "settings": { + "workbench.colorTheme": "Cobalt2", + "terminal.integrated.shell.linux": "/bin/bash" + }, + "extensions": [ + "vscjava.vscode-java-pack", + "redhat.vscode-xml", + "redhat.fabric8-analytics", + "esbenp.prettier-vscode", + "wesbos.theme-cobalt2" + ] +} + diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..90ccbb3 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,22 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Launch Board", + "request": "launch", + "mainClass": "eco.lib.examples.floorplan.Board", + "projectName": "eco-rwa" + }, + { + "type": "java", + "name": "Launch Current File", + "request": "launch", + "mainClass": "${file}", + "projectName": "eco-rwa" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e0f15db --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..ed46e28 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,19 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "verify", + "type": "shell", + "command": "mvn -B verify", + "group": "build" + }, + { + "label": "test", + "type": "shell", + "command": "mvn -B test", + "group": "test" + } + ] +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2c08395..95765f0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - hero-rwa - hero-rwa - 1.20201205 + eco-rwa + eco-rwa + 1.0.0 jar - + @@ -14,11 +14,11 @@ - + com.github.iscar-ucm - hero - 1.20191121 + eco + 1.1.0 @@ -29,7 +29,30 @@ UTF-8 - 15 - 15 + 11 + 11 - \ No newline at end of file + + src + + + maven-assembly-plugin + 3.3.0 + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + diff --git a/src/main/java/hero/lib/examples/floorplan/Board.java b/src/eco/lib/examples/floorplan/Board.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/Board.java rename to src/eco/lib/examples/floorplan/Board.java index 0491dd9..4194972 100644 --- a/src/main/java/hero/lib/examples/floorplan/Board.java +++ b/src/eco/lib/examples/floorplan/Board.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import com.mxgraph.model.mxCell; import com.mxgraph.model.mxGeometry; diff --git a/src/main/java/hero/lib/examples/floorplan/CodifSP.java b/src/eco/lib/examples/floorplan/CodifSP.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/CodifSP.java rename to src/eco/lib/examples/floorplan/CodifSP.java index 7f8df06..3ece465 100644 --- a/src/main/java/hero/lib/examples/floorplan/CodifSP.java +++ b/src/eco/lib/examples/floorplan/CodifSP.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.io.File; import java.util.ArrayList; @@ -31,7 +31,7 @@ public class CodifSP { protected ArrayList arrayGammaN = new ArrayList(); protected ArrayList arrayGammaP = new ArrayList(); - public void CodifSP(){ + public CodifSP(){ /* Constructor de la clase * El resultado son dos 'arraylist'. Uno para la GammaN y otro para la P * 1.Se lee el archivo de la variable 'nombre_archivo' y se genera una diff --git a/src/main/java/hero/lib/examples/floorplan/CodifSPGA.java b/src/eco/lib/examples/floorplan/CodifSPGA.java similarity index 94% rename from src/main/java/hero/lib/examples/floorplan/CodifSPGA.java rename to src/eco/lib/examples/floorplan/CodifSPGA.java index ca00efa..8857d43 100644 --- a/src/main/java/hero/lib/examples/floorplan/CodifSPGA.java +++ b/src/eco/lib/examples/floorplan/CodifSPGA.java @@ -17,20 +17,20 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.logging.Logger; -import hero.core.algorithm.metaheuristic.moga.NSGAII; -import hero.core.operator.mutation.SwapMutationDouble; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.lib.examples.floorplan.util.CycleCrossoverDouble; -import hero.lib.examples.floorplan.util.EliteSelectorOperator; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.mutation.SwapMutationDouble; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.lib.examples.floorplan.util.CycleCrossoverDouble; +import eco.lib.examples.floorplan.util.EliteSelectorOperator; /** * diff --git a/src/main/java/hero/lib/examples/floorplan/CodifSPGAproblem.java b/src/eco/lib/examples/floorplan/CodifSPGAproblem.java similarity index 95% rename from src/main/java/hero/lib/examples/floorplan/CodifSPGAproblem.java rename to src/eco/lib/examples/floorplan/CodifSPGAproblem.java index 7f5cbda..f9465d5 100644 --- a/src/main/java/hero/lib/examples/floorplan/CodifSPGAproblem.java +++ b/src/eco/lib/examples/floorplan/CodifSPGAproblem.java @@ -17,15 +17,16 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; import java.util.ArrayList; import java.util.Collections; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; + /** * @@ -40,8 +41,8 @@ public class CodifSPGAproblem extends Problem> { protected ArrayList idPos; //-----------------------------------------------------------Constructor - public CodifSPGAproblem(FloorplanConfiguration cfgOK, - FloorplanConfiguration cfgTest, + public CodifSPGAproblem(FloorplanConfiguration cfgArgOK, + FloorplanConfiguration cfgArgTest, int layer, ArrayList idNeg, ArrayList idPos) { @@ -56,8 +57,8 @@ public CodifSPGAproblem(FloorplanConfiguration cfgOK, * Each match should add the component's id to the arraylist 'ids' */ //Después ya podemos inicializar los miembros de esta clase - this.cfgOK = cfgOK; - this.cfgTest = cfgTest; + cfgOK = cfgArgOK; + cfgTest = cfgArgTest; this.layer = layer; this.idNeg = idNeg; //for 'newRandomSetOfSolutions' this.idPos = idPos; //for 'newRandomSetOfSolutions' diff --git a/src/main/java/hero/lib/examples/floorplan/Component.java b/src/eco/lib/examples/floorplan/Component.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/Component.java rename to src/eco/lib/examples/floorplan/Component.java index e9fbe7f..2c19583 100644 --- a/src/main/java/hero/lib/examples/floorplan/Component.java +++ b/src/eco/lib/examples/floorplan/Component.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; /** * diff --git a/src/main/java/hero/lib/examples/floorplan/ComponentThermalComparator.java b/src/eco/lib/examples/floorplan/ComponentThermalComparator.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/ComponentThermalComparator.java rename to src/eco/lib/examples/floorplan/ComponentThermalComparator.java index d79f8bb..bad732c 100644 --- a/src/main/java/hero/lib/examples/floorplan/ComponentThermalComparator.java +++ b/src/eco/lib/examples/floorplan/ComponentThermalComparator.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.util.Comparator; diff --git a/src/main/java/hero/lib/examples/floorplan/ComponentVariable.java b/src/eco/lib/examples/floorplan/ComponentVariable.java similarity index 92% rename from src/main/java/hero/lib/examples/floorplan/ComponentVariable.java rename to src/eco/lib/examples/floorplan/ComponentVariable.java index 69ebc62..346795a 100644 --- a/src/main/java/hero/lib/examples/floorplan/ComponentVariable.java +++ b/src/eco/lib/examples/floorplan/ComponentVariable.java @@ -17,12 +17,12 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.operator.mutation.MutationOperator; -import hero.core.problem.Solution; -import hero.core.problem.Variable; -import hero.core.util.random.RandomGenerator; +import eco.core.operator.mutation.MutationOperator; +import eco.core.problem.Solution; +import eco.core.problem.Variable; +import eco.core.util.random.RandomGenerator; /** * diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanAirChannel.java b/src/eco/lib/examples/floorplan/FloorplanAirChannel.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanAirChannel.java rename to src/eco/lib/examples/floorplan/FloorplanAirChannel.java index b2325b9..6e76cdd 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanAirChannel.java +++ b/src/eco/lib/examples/floorplan/FloorplanAirChannel.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -27,13 +26,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; -import hero.core.util.random.RandomGenerator; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; +import eco.core.util.random.RandomGenerator; public class FloorplanAirChannel extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanCharacterize.java b/src/eco/lib/examples/floorplan/FloorplanCharacterize.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/FloorplanCharacterize.java rename to src/eco/lib/examples/floorplan/FloorplanCharacterize.java index fb3867f..0b397a6 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanCharacterize.java +++ b/src/eco/lib/examples/floorplan/FloorplanCharacterize.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.io.File; diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanConfiguration.java b/src/eco/lib/examples/floorplan/FloorplanConfiguration.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/FloorplanConfiguration.java rename to src/eco/lib/examples/floorplan/FloorplanConfiguration.java index 3fbc611..ea12a0d 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanConfiguration.java +++ b/src/eco/lib/examples/floorplan/FloorplanConfiguration.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanDTS.java b/src/eco/lib/examples/floorplan/FloorplanDTS.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/FloorplanDTS.java rename to src/eco/lib/examples/floorplan/FloorplanDTS.java index d61e12a..89a744c 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanDTS.java +++ b/src/eco/lib/examples/floorplan/FloorplanDTS.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -32,10 +31,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.lib.examples.floorplan.util.MultiwayTree; -import hero.lib.examples.floorplan.util.Solution; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.lib.examples.floorplan.util.MultiwayTree; +import eco.lib.examples.floorplan.util.Solution; + import java.util.Collection; /** @@ -299,7 +300,7 @@ private void randomEncoding() { NSGAII algorithm = new NSGAII(problem, 1, 0, new ComponentVariable.ComponentMutation(1.0 / problem.getNumberOfVariables()), new CycleCrossover<>(), new BinaryTournamentNSGAII()); algorithm.initialize(); // Take one individual from population where coordinates have been established. - hero.core.problem.Solution indiv = algorithm.getPopulation().get(0); + eco.core.problem.Solution indiv = algorithm.getPopulation().get(0); // Modify cfg coordinates: ArrayList variables = indiv.getVariables(); diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanDTSSimulatedAnnealing.java b/src/eco/lib/examples/floorplan/FloorplanDTSSimulatedAnnealing.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanDTSSimulatedAnnealing.java rename to src/eco/lib/examples/floorplan/FloorplanDTSSimulatedAnnealing.java index a635ce8..8a35eb0 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanDTSSimulatedAnnealing.java +++ b/src/eco/lib/examples/floorplan/FloorplanDTSSimulatedAnnealing.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.lib.examples.floorplan.util.SimulatedAnnealingSolver; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -28,6 +27,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import eco.lib.examples.floorplan.util.SimulatedAnnealingSolver; + /** * Class implementing the simulated annealing technique for problem * solving. diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanDraw.java b/src/eco/lib/examples/floorplan/FloorplanDraw.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanDraw.java rename to src/eco/lib/examples/floorplan/FloorplanDraw.java index 8db12a8..16991b4 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanDraw.java +++ b/src/eco/lib/examples/floorplan/FloorplanDraw.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; public class FloorplanDraw { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanExhaustive.java b/src/eco/lib/examples/floorplan/FloorplanExhaustive.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/FloorplanExhaustive.java rename to src/eco/lib/examples/floorplan/FloorplanExhaustive.java index 827d76e..03ff79f 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanExhaustive.java +++ b/src/eco/lib/examples/floorplan/FloorplanExhaustive.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanExhaustiveRacks.java b/src/eco/lib/examples/floorplan/FloorplanExhaustiveRacks.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/FloorplanExhaustiveRacks.java rename to src/eco/lib/examples/floorplan/FloorplanExhaustiveRacks.java index 5637f42..4960a86 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanExhaustiveRacks.java +++ b/src/eco/lib/examples/floorplan/FloorplanExhaustiveRacks.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.io.IOException; import java.util.logging.Level; diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanGenetic.java b/src/eco/lib/examples/floorplan/FloorplanGenetic.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanGenetic.java rename to src/eco/lib/examples/floorplan/FloorplanGenetic.java index f5cd619..24e1df1 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanGenetic.java +++ b/src/eco/lib/examples/floorplan/FloorplanGenetic.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -27,13 +26,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; -import hero.core.util.random.RandomGenerator; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; +import eco.core.util.random.RandomGenerator; public class FloorplanGenetic extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocMultiObj.java b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocMultiObj.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocMultiObj.java rename to src/eco/lib/examples/floorplan/FloorplanGeneticAsocMultiObj.java index 1ddb58f..0ecbfcc 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocMultiObj.java +++ b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocMultiObj.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -30,12 +29,13 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; public class FloorplanGeneticAsocMultiObj extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocTemp.java b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocTemp.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocTemp.java rename to src/eco/lib/examples/floorplan/FloorplanGeneticAsocTemp.java index df9a4ac..762b077 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocTemp.java +++ b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocTemp.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -30,12 +29,13 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; public class FloorplanGeneticAsocTemp extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocWeightedSum.java b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocWeightedSum.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocWeightedSum.java rename to src/eco/lib/examples/floorplan/FloorplanGeneticAsocWeightedSum.java index b38df33..47406e7 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocWeightedSum.java +++ b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocWeightedSum.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -30,12 +29,13 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; public class FloorplanGeneticAsocWeightedSum extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocWire.java b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocWire.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocWire.java rename to src/eco/lib/examples/floorplan/FloorplanGeneticAsocWire.java index e068c61..8b40b6c 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticAsocWire.java +++ b/src/eco/lib/examples/floorplan/FloorplanGeneticAsocWire.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -30,12 +29,13 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; public class FloorplanGeneticAsocWire extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticPreTsv.java b/src/eco/lib/examples/floorplan/FloorplanGeneticPreTsv.java similarity index 95% rename from src/main/java/hero/lib/examples/floorplan/FloorplanGeneticPreTsv.java rename to src/eco/lib/examples/floorplan/FloorplanGeneticPreTsv.java index d5b499e..b53a9b9 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanGeneticPreTsv.java +++ b/src/eco/lib/examples/floorplan/FloorplanGeneticPreTsv.java @@ -17,19 +17,19 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.IOException; import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; public class FloorplanGeneticPreTsv extends FloorplanGenetic { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanPolishAsoc.java b/src/eco/lib/examples/floorplan/FloorplanPolishAsoc.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/FloorplanPolishAsoc.java rename to src/eco/lib/examples/floorplan/FloorplanPolishAsoc.java index f19fb53..0470bad 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanPolishAsoc.java +++ b/src/eco/lib/examples/floorplan/FloorplanPolishAsoc.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -32,15 +31,16 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.comparator.SolutionDominance; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; -import hero.core.util.random.RandomGenerator; -import hero.lib.examples.floorplan.util.BinaryNode; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.comparator.SolutionDominance; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; +import eco.core.util.random.RandomGenerator; +import eco.lib.examples.floorplan.util.BinaryNode; public class FloorplanPolishAsoc extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanPso.java b/src/eco/lib/examples/floorplan/FloorplanPso.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanPso.java rename to src/eco/lib/examples/floorplan/FloorplanPso.java index 5c9bdc3..760f59f 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanPso.java +++ b/src/eco/lib/examples/floorplan/FloorplanPso.java @@ -17,20 +17,20 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.mopso.OMOPSO; import java.io.IOException; import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.core.util.logger.HeroLogger; -import hero.core.util.random.RandomGenerator; +import eco.core.algorithm.metaheuristic.mopso.OMOPSO; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.logger.HeroLogger; +import eco.core.util.random.RandomGenerator; /** * Trying to solve the Floorplanning problem using PSO. diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanSP.java b/src/eco/lib/examples/floorplan/FloorplanSP.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/FloorplanSP.java rename to src/eco/lib/examples/floorplan/FloorplanSP.java index 785564d..bd29a7a 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanSP.java +++ b/src/eco/lib/examples/floorplan/FloorplanSP.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.lib.examples.floorplan.util.Solution; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -28,6 +27,8 @@ import java.util.Random; //import jeco.lib.problems.floorplan.FloorplanConfiguration; +import eco.lib.examples.floorplan.util.Solution; + /** * @author cia */ diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanSPSimulatedAnnealing.java b/src/eco/lib/examples/floorplan/FloorplanSPSimulatedAnnealing.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/FloorplanSPSimulatedAnnealing.java rename to src/eco/lib/examples/floorplan/FloorplanSPSimulatedAnnealing.java index 7e6cc85..0b9aff4 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanSPSimulatedAnnealing.java +++ b/src/eco/lib/examples/floorplan/FloorplanSPSimulatedAnnealing.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.lib.examples.floorplan.util.SimulatedAnnealingSolver; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -32,6 +31,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import eco.lib.examples.floorplan.util.SimulatedAnnealingSolver; + /** * Class implementing the simulated annealing technique for problem * solving. diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanSolution.java b/src/eco/lib/examples/floorplan/FloorplanSolution.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/FloorplanSolution.java rename to src/eco/lib/examples/floorplan/FloorplanSolution.java index 947e4a9..26dd54f 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanSolution.java +++ b/src/eco/lib/examples/floorplan/FloorplanSolution.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.lib.examples.floorplan.util.Solution; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -29,6 +28,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import eco.lib.examples.floorplan.util.Solution; + /** * This interface provides some specific elements for FlooplanSolutions * diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanThermalViasAux.java b/src/eco/lib/examples/floorplan/FloorplanThermalViasAux.java similarity index 91% rename from src/main/java/hero/lib/examples/floorplan/FloorplanThermalViasAux.java rename to src/eco/lib/examples/floorplan/FloorplanThermalViasAux.java index 4c90385..57bd9b5 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanThermalViasAux.java +++ b/src/eco/lib/examples/floorplan/FloorplanThermalViasAux.java @@ -17,20 +17,21 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.awt.Point; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.SinglePointCrossover; -import hero.core.operator.mutation.BooleanMutation; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; + +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.SinglePointCrossover; +import eco.core.operator.mutation.BooleanMutation; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; public class FloorplanThermalViasAux extends FloorplanTsv { public static int OBJ_BoundaryTsvs = 2; diff --git a/src/main/java/hero/lib/examples/floorplan/FloorplanTsv.java b/src/eco/lib/examples/floorplan/FloorplanTsv.java similarity index 96% rename from src/main/java/hero/lib/examples/floorplan/FloorplanTsv.java rename to src/eco/lib/examples/floorplan/FloorplanTsv.java index bc0a63d..9f9643e 100644 --- a/src/main/java/hero/lib/examples/floorplan/FloorplanTsv.java +++ b/src/eco/lib/examples/floorplan/FloorplanTsv.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.awt.Point; import java.io.IOException; import java.util.ArrayList; @@ -31,14 +30,15 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.SinglePointCrossover; -import hero.core.operator.mutation.BooleanMutation; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.core.util.logger.HeroLogger; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.SinglePointCrossover; +import eco.core.operator.mutation.BooleanMutation; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.logger.HeroLogger; public class FloorplanTsv extends Problem> { diff --git a/src/main/java/hero/lib/examples/floorplan/LiquidChannels.java b/src/eco/lib/examples/floorplan/LiquidChannels.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/LiquidChannels.java rename to src/eco/lib/examples/floorplan/LiquidChannels.java index d53629c..7707e2b 100644 --- a/src/main/java/hero/lib/examples/floorplan/LiquidChannels.java +++ b/src/eco/lib/examples/floorplan/LiquidChannels.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -31,20 +30,21 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import hero.core.operator.crossover.SinglePointCrossover; -import hero.core.operator.mutation.BooleanMutation; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.core.util.logger.HeroLogger; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.SinglePointCrossover; +import eco.core.operator.mutation.BooleanMutation; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.logger.HeroLogger; + public class LiquidChannels extends Problem> { private static final Logger logger = Logger.getLogger(LiquidChannels.class.getName()); diff --git a/src/main/java/hero/lib/examples/floorplan/LiquidChannelsCrossover.java b/src/eco/lib/examples/floorplan/LiquidChannelsCrossover.java similarity index 93% rename from src/main/java/hero/lib/examples/floorplan/LiquidChannelsCrossover.java rename to src/eco/lib/examples/floorplan/LiquidChannelsCrossover.java index 7a4b03d..ebf806c 100644 --- a/src/main/java/hero/lib/examples/floorplan/LiquidChannelsCrossover.java +++ b/src/eco/lib/examples/floorplan/LiquidChannelsCrossover.java @@ -17,13 +17,13 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.operator.crossover.CrossoverOperator; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.core.util.random.RandomGenerator; +import eco.core.operator.crossover.CrossoverOperator; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.random.RandomGenerator; public class LiquidChannelsCrossover extends CrossoverOperator> { diff --git a/src/main/java/hero/lib/examples/floorplan/Manager.java b/src/eco/lib/examples/floorplan/Manager.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/Manager.java rename to src/eco/lib/examples/floorplan/Manager.java index ce9e83d..d69c066 100644 --- a/src/main/java/hero/lib/examples/floorplan/Manager.java +++ b/src/eco/lib/examples/floorplan/Manager.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.lib.examples.floorplan.FloorplanTsv; import java.awt.Point; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -43,6 +42,8 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import eco.lib.examples.floorplan.FloorplanTsv; + /** * * @author jlrisco diff --git a/src/main/java/hero/lib/examples/floorplan/PostfixVariable.java b/src/eco/lib/examples/floorplan/PostfixVariable.java similarity index 96% rename from src/main/java/hero/lib/examples/floorplan/PostfixVariable.java rename to src/eco/lib/examples/floorplan/PostfixVariable.java index 0835adf..be2aa8d 100644 --- a/src/main/java/hero/lib/examples/floorplan/PostfixVariable.java +++ b/src/eco/lib/examples/floorplan/PostfixVariable.java @@ -17,12 +17,12 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.operator.mutation.MutationOperator; -import hero.core.problem.Solution; -import hero.core.problem.Variable; -import hero.core.util.random.RandomGenerator; +import eco.core.operator.mutation.MutationOperator; +import eco.core.problem.Solution; +import eco.core.problem.Variable; +import eco.core.util.random.RandomGenerator; /** * diff --git a/src/main/java/hero/lib/examples/floorplan/RandomFloorplanGenerator.java b/src/eco/lib/examples/floorplan/RandomFloorplanGenerator.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/RandomFloorplanGenerator.java rename to src/eco/lib/examples/floorplan/RandomFloorplanGenerator.java index 497f53b..905d595 100644 --- a/src/main/java/hero/lib/examples/floorplan/RandomFloorplanGenerator.java +++ b/src/eco/lib/examples/floorplan/RandomFloorplanGenerator.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -30,13 +29,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.random.RandomGenerator; -import hero.lib.examples.floorplan.util.BinaryNode; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.random.RandomGenerator; +import eco.lib.examples.floorplan.util.BinaryNode; /** * Based on polish notation, this class generates random floorplans diff --git a/src/main/java/hero/lib/examples/floorplan/Sequence.java b/src/eco/lib/examples/floorplan/Sequence.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/Sequence.java rename to src/eco/lib/examples/floorplan/Sequence.java index ef59f39..7c4fbf3 100644 --- a/src/main/java/hero/lib/examples/floorplan/Sequence.java +++ b/src/eco/lib/examples/floorplan/Sequence.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; import java.util.ArrayList; import java.util.Random; diff --git a/src/main/java/hero/lib/examples/floorplan/SequencePair.java b/src/eco/lib/examples/floorplan/SequencePair.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/SequencePair.java rename to src/eco/lib/examples/floorplan/SequencePair.java index b0d07ca..bb15f0d 100644 --- a/src/main/java/hero/lib/examples/floorplan/SequencePair.java +++ b/src/eco/lib/examples/floorplan/SequencePair.java @@ -17,15 +17,16 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; -import hero.lib.examples.floorplan.util.DirectedAcyclicGraph; -import hero.lib.examples.floorplan.util.DirectedEdge; import java.util.Iterator; import java.util.ArrayList; import java.util.Random; //import jeco.lib.problems.floorplan.FloorplanConfiguration; +import eco.lib.examples.floorplan.util.DirectedAcyclicGraph; +import eco.lib.examples.floorplan.util.DirectedEdge; + /** * @author cia */ diff --git a/src/main/java/hero/lib/examples/floorplan/ThermalVia.java b/src/eco/lib/examples/floorplan/ThermalVia.java similarity index 96% rename from src/main/java/hero/lib/examples/floorplan/ThermalVia.java rename to src/eco/lib/examples/floorplan/ThermalVia.java index a14c381..efefee9 100644 --- a/src/main/java/hero/lib/examples/floorplan/ThermalVia.java +++ b/src/eco/lib/examples/floorplan/ThermalVia.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan; +package eco.lib.examples.floorplan; /** * diff --git a/src/main/java/hero/lib/examples/floorplan/register/FloorplanRegisterConfiguration.java b/src/eco/lib/examples/floorplan/register/FloorplanRegisterConfiguration.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/register/FloorplanRegisterConfiguration.java rename to src/eco/lib/examples/floorplan/register/FloorplanRegisterConfiguration.java index 0c3b92a..28d3e4b 100644 --- a/src/main/java/hero/lib/examples/floorplan/register/FloorplanRegisterConfiguration.java +++ b/src/eco/lib/examples/floorplan/register/FloorplanRegisterConfiguration.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.register; +package eco.lib.examples.floorplan.register; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/hero/lib/examples/floorplan/register/FloorplanRegisterGenetic.java b/src/eco/lib/examples/floorplan/register/FloorplanRegisterGenetic.java similarity index 95% rename from src/main/java/hero/lib/examples/floorplan/register/FloorplanRegisterGenetic.java rename to src/eco/lib/examples/floorplan/register/FloorplanRegisterGenetic.java index 4385472..2833859 100644 --- a/src/main/java/hero/lib/examples/floorplan/register/FloorplanRegisterGenetic.java +++ b/src/eco/lib/examples/floorplan/register/FloorplanRegisterGenetic.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.register; +package eco.lib.examples.floorplan.register; -import hero.core.algorithm.metaheuristic.moga.NSGAII; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -27,12 +26,13 @@ import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.operator.crossover.CycleCrossover; -import hero.core.operator.selection.BinaryTournamentNSGAII; -import hero.core.problem.Problem; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.util.logger.HeroLogger; +import eco.core.algorithm.metaheuristic.moga.NSGAII; +import eco.core.operator.crossover.CycleCrossover; +import eco.core.operator.selection.BinaryTournamentNSGAII; +import eco.core.problem.Problem; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.util.logger.HeroLogger; public class FloorplanRegisterGenetic extends Problem { diff --git a/src/main/java/hero/lib/examples/floorplan/register/Register.java b/src/eco/lib/examples/floorplan/register/Register.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/register/Register.java rename to src/eco/lib/examples/floorplan/register/Register.java index 4185c2d..d8c68be 100644 --- a/src/main/java/hero/lib/examples/floorplan/register/Register.java +++ b/src/eco/lib/examples/floorplan/register/Register.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.register; +package eco.lib.examples.floorplan.register; /** * diff --git a/src/main/java/hero/lib/examples/floorplan/register/RegisterThermalComparator.java b/src/eco/lib/examples/floorplan/register/RegisterThermalComparator.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/register/RegisterThermalComparator.java rename to src/eco/lib/examples/floorplan/register/RegisterThermalComparator.java index 03ca0a5..61ee638 100644 --- a/src/main/java/hero/lib/examples/floorplan/register/RegisterThermalComparator.java +++ b/src/eco/lib/examples/floorplan/register/RegisterThermalComparator.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.register; +package eco.lib.examples.floorplan.register; import java.util.Comparator; diff --git a/src/main/java/hero/lib/examples/floorplan/register/RegisterVariable.java b/src/eco/lib/examples/floorplan/register/RegisterVariable.java similarity index 91% rename from src/main/java/hero/lib/examples/floorplan/register/RegisterVariable.java rename to src/eco/lib/examples/floorplan/register/RegisterVariable.java index 8851af4..450d8b6 100644 --- a/src/main/java/hero/lib/examples/floorplan/register/RegisterVariable.java +++ b/src/eco/lib/examples/floorplan/register/RegisterVariable.java @@ -17,12 +17,12 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.register; +package eco.lib.examples.floorplan.register; -import hero.core.operator.mutation.MutationOperator; -import hero.core.problem.Solution; -import hero.core.problem.Variable; -import hero.core.util.random.RandomGenerator; +import eco.core.operator.mutation.MutationOperator; +import eco.core.problem.Solution; +import eco.core.problem.Variable; +import eco.core.util.random.RandomGenerator; /** * diff --git a/src/main/java/hero/lib/examples/floorplan/util/AbstractSolver.java b/src/eco/lib/examples/floorplan/util/AbstractSolver.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/util/AbstractSolver.java rename to src/eco/lib/examples/floorplan/util/AbstractSolver.java index a6b86dc..9155fa3 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/AbstractSolver.java +++ b/src/eco/lib/examples/floorplan/util/AbstractSolver.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; public abstract class AbstractSolver implements Solver { public static Solution bestSolution; diff --git a/src/main/java/hero/lib/examples/floorplan/util/BinaryNode.java b/src/eco/lib/examples/floorplan/util/BinaryNode.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/util/BinaryNode.java rename to src/eco/lib/examples/floorplan/util/BinaryNode.java index 98b0353..c36956e 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/BinaryNode.java +++ b/src/eco/lib/examples/floorplan/util/BinaryNode.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; import java.util.LinkedList; import java.util.Set; diff --git a/src/main/java/hero/lib/examples/floorplan/util/CycleCrossoverDouble.java b/src/eco/lib/examples/floorplan/util/CycleCrossoverDouble.java similarity index 96% rename from src/main/java/hero/lib/examples/floorplan/util/CycleCrossoverDouble.java rename to src/eco/lib/examples/floorplan/util/CycleCrossoverDouble.java index 78f30e8..11b7dac 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/CycleCrossoverDouble.java +++ b/src/eco/lib/examples/floorplan/util/CycleCrossoverDouble.java @@ -17,15 +17,16 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; -import hero.core.operator.crossover.CrossoverOperator; -import hero.core.problem.Solutions; -import hero.core.problem.Solution; -import hero.core.problem.Variable; -import hero.core.util.random.RandomGenerator; import java.util.ArrayList; +import eco.core.operator.crossover.CrossoverOperator; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.random.RandomGenerator; + /** * * @author cia diff --git a/src/main/java/hero/lib/examples/floorplan/util/DirectedAcyclicGraph.java b/src/eco/lib/examples/floorplan/util/DirectedAcyclicGraph.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/util/DirectedAcyclicGraph.java rename to src/eco/lib/examples/floorplan/util/DirectedAcyclicGraph.java index 812d79f..e7dcf09 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/DirectedAcyclicGraph.java +++ b/src/eco/lib/examples/floorplan/util/DirectedAcyclicGraph.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/hero/lib/examples/floorplan/util/DirectedEdge.java b/src/eco/lib/examples/floorplan/util/DirectedEdge.java similarity index 97% rename from src/main/java/hero/lib/examples/floorplan/util/DirectedEdge.java rename to src/eco/lib/examples/floorplan/util/DirectedEdge.java index b3bd7bc..ca8198b 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/DirectedEdge.java +++ b/src/eco/lib/examples/floorplan/util/DirectedEdge.java @@ -17,9 +17,9 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; -import hero.lib.examples.floorplan.Component; +import eco.lib.examples.floorplan.Component; public class DirectedEdge { private Component beginEdge; diff --git a/src/main/java/hero/lib/examples/floorplan/util/EliteSelectorOperator.java b/src/eco/lib/examples/floorplan/util/EliteSelectorOperator.java similarity index 87% rename from src/main/java/hero/lib/examples/floorplan/util/EliteSelectorOperator.java rename to src/eco/lib/examples/floorplan/util/EliteSelectorOperator.java index f8c3145..1ccba3e 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/EliteSelectorOperator.java +++ b/src/eco/lib/examples/floorplan/util/EliteSelectorOperator.java @@ -17,14 +17,15 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; import java.util.Collections; -import hero.core.operator.comparator.SolutionDominance; -import hero.core.operator.selection.SelectionOperator; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; + +import eco.core.operator.comparator.SolutionDominance; +import eco.core.operator.selection.SelectionOperator; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; /** * Class for selection of elites. diff --git a/src/main/java/hero/lib/examples/floorplan/util/MultiwayTree.java b/src/eco/lib/examples/floorplan/util/MultiwayTree.java similarity index 99% rename from src/main/java/hero/lib/examples/floorplan/util/MultiwayTree.java rename to src/eco/lib/examples/floorplan/util/MultiwayTree.java index c76ad50..2746276 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/MultiwayTree.java +++ b/src/eco/lib/examples/floorplan/util/MultiwayTree.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/hero/lib/examples/floorplan/util/SimulatedAnnealingSolver.java b/src/eco/lib/examples/floorplan/util/SimulatedAnnealingSolver.java similarity index 98% rename from src/main/java/hero/lib/examples/floorplan/util/SimulatedAnnealingSolver.java rename to src/eco/lib/examples/floorplan/util/SimulatedAnnealingSolver.java index c8aa416..eadbe8c 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/SimulatedAnnealingSolver.java +++ b/src/eco/lib/examples/floorplan/util/SimulatedAnnealingSolver.java @@ -17,9 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; -import hero.lib.examples.floorplan.FloorplanSolution; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -28,6 +27,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import eco.lib.examples.floorplan.FloorplanSolution; + /** * Class implementing the simulated annealing technique for problem * solving. diff --git a/src/main/java/hero/lib/examples/floorplan/util/Solution.java b/src/eco/lib/examples/floorplan/util/Solution.java similarity index 96% rename from src/main/java/hero/lib/examples/floorplan/util/Solution.java rename to src/eco/lib/examples/floorplan/util/Solution.java index 04ada1b..7a013ef 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/Solution.java +++ b/src/eco/lib/examples/floorplan/util/Solution.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; import java.util.Enumeration; diff --git a/src/main/java/hero/lib/examples/floorplan/util/Solver.java b/src/eco/lib/examples/floorplan/util/Solver.java similarity index 95% rename from src/main/java/hero/lib/examples/floorplan/util/Solver.java rename to src/eco/lib/examples/floorplan/util/Solver.java index cf6c3c5..e731892 100644 --- a/src/main/java/hero/lib/examples/floorplan/util/Solver.java +++ b/src/eco/lib/examples/floorplan/util/Solver.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.examples.floorplan.util; +package eco.lib.examples.floorplan.util; public interface Solver { Solution solve(Solution initial); diff --git a/src/main/java/hero/lib/examples/parkinson/DataTable.java b/src/eco/lib/examples/parkinson/DataTable.java similarity index 99% rename from src/main/java/hero/lib/examples/parkinson/DataTable.java rename to src/eco/lib/examples/parkinson/DataTable.java index 8be5d23..ffc8bc6 100644 --- a/src/main/java/hero/lib/examples/parkinson/DataTable.java +++ b/src/eco/lib/examples/parkinson/DataTable.java @@ -18,7 +18,7 @@ * - Josué Pagán Ortíz * - José Luis Risco Martín */ -package hero.lib.examples.parkinson; +package eco.lib.examples.parkinson; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/hero/lib/examples/parkinson/FeaturesTable.java b/src/eco/lib/examples/parkinson/FeaturesTable.java similarity index 99% rename from src/main/java/hero/lib/examples/parkinson/FeaturesTable.java rename to src/eco/lib/examples/parkinson/FeaturesTable.java index bbbeaaa..bbbb639 100644 --- a/src/main/java/hero/lib/examples/parkinson/FeaturesTable.java +++ b/src/eco/lib/examples/parkinson/FeaturesTable.java @@ -18,7 +18,7 @@ * - Josué Pagán Ortíz * - José Luis Risco Martín */ -package hero.lib.examples.parkinson; +package eco.lib.examples.parkinson; import java.io.BufferedReader; import java.io.File; @@ -28,7 +28,8 @@ import java.util.Properties; import java.util.Random; import java.util.logging.Logger; -import hero.core.util.StringManagement; + +import eco.core.util.StringManagement; /** * Class to manage a data table. The data table is passed diff --git a/src/main/java/hero/lib/examples/parkinson/ParkinsonAdaBoostClassifier.java b/src/eco/lib/examples/parkinson/ParkinsonAdaBoostClassifier.java similarity index 97% rename from src/main/java/hero/lib/examples/parkinson/ParkinsonAdaBoostClassifier.java rename to src/eco/lib/examples/parkinson/ParkinsonAdaBoostClassifier.java index b065e98..566e381 100644 --- a/src/main/java/hero/lib/examples/parkinson/ParkinsonAdaBoostClassifier.java +++ b/src/eco/lib/examples/parkinson/ParkinsonAdaBoostClassifier.java @@ -18,7 +18,7 @@ * - Josué Pagán Ortíz * - José Luis Risco Martín */ -package hero.lib.examples.parkinson; +package eco.lib.examples.parkinson; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -34,25 +34,26 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm; -import hero.core.algorithm.metaheuristic.moge.AbstractProblemGE; -import hero.core.algorithm.metaheuristic.moge.Phenotype; -import hero.core.operator.comparator.SimpleDominance; -import hero.core.operator.crossover.SinglePointCrossover; -import hero.core.operator.evaluator.AbstractPopEvaluator; -import hero.core.operator.mutation.IntegerFlipMutation; -import hero.core.operator.selection.BinaryTournament; -import hero.core.optimization.threads.MasterWorkerThreads; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.unstable.util.classifier.ClassifierEvaluator; -import hero.unstable.util.classifier.Quantizer; -import hero.core.util.compiler.MyCompiler; -import hero.core.util.compiler.MyLoader; -import hero.core.util.logger.HeroLogger; -import hero.unstable.util.Maths; -import hero.unstable.util.classifier.AdaBoost; + +import eco.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm; +import eco.core.algorithm.metaheuristic.moge.AbstractProblemGE; +import eco.core.algorithm.metaheuristic.moge.Phenotype; +import eco.core.operator.comparator.SimpleDominance; +import eco.core.operator.crossover.SinglePointCrossover; +import eco.core.operator.evaluator.AbstractPopEvaluator; +import eco.core.operator.mutation.IntegerFlipMutation; +import eco.core.operator.selection.BinaryTournament; +import eco.core.optimization.threads.MasterWorkerThreads; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.compiler.MyCompiler; +import eco.core.util.compiler.MyLoader; +import eco.core.util.logger.HeroLogger; +import eco.unstable.util.Maths; +import eco.unstable.util.classifier.AdaBoost; +import eco.unstable.util.classifier.ClassifierEvaluator; +import eco.unstable.util.classifier.Quantizer; public class ParkinsonAdaBoostClassifier extends AbstractProblemGE { diff --git a/src/main/java/hero/lib/examples/parkinson/ParkinsonClassifier.java b/src/eco/lib/examples/parkinson/ParkinsonClassifier.java similarity index 97% rename from src/main/java/hero/lib/examples/parkinson/ParkinsonClassifier.java rename to src/eco/lib/examples/parkinson/ParkinsonClassifier.java index dd9d726..f7b6e14 100644 --- a/src/main/java/hero/lib/examples/parkinson/ParkinsonClassifier.java +++ b/src/eco/lib/examples/parkinson/ParkinsonClassifier.java @@ -18,7 +18,7 @@ * - Josué Pagán Ortíz * - José Luis Risco Martín */ -package hero.lib.examples.parkinson; +package eco.lib.examples.parkinson; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -34,24 +34,25 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm; -import hero.core.algorithm.metaheuristic.moge.AbstractProblemGE; -import hero.core.algorithm.metaheuristic.moge.Phenotype; -import hero.core.operator.comparator.SimpleDominance; -import hero.core.operator.crossover.SinglePointCrossover; -import hero.core.operator.evaluator.AbstractPopEvaluator; -import hero.core.operator.mutation.IntegerFlipMutation; -import hero.core.operator.selection.BinaryTournament; -import hero.core.optimization.threads.MasterWorkerThreads; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.unstable.util.classifier.ClassifierEvaluator; -import hero.unstable.util.classifier.Quantizer; -import hero.core.util.compiler.MyCompiler; -import hero.core.util.compiler.MyLoader; -import hero.core.util.logger.HeroLogger; -import hero.unstable.util.Maths; + +import eco.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm; +import eco.core.algorithm.metaheuristic.moge.AbstractProblemGE; +import eco.core.algorithm.metaheuristic.moge.Phenotype; +import eco.core.operator.comparator.SimpleDominance; +import eco.core.operator.crossover.SinglePointCrossover; +import eco.core.operator.evaluator.AbstractPopEvaluator; +import eco.core.operator.mutation.IntegerFlipMutation; +import eco.core.operator.selection.BinaryTournament; +import eco.core.optimization.threads.MasterWorkerThreads; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.compiler.MyCompiler; +import eco.core.util.compiler.MyLoader; +import eco.core.util.logger.HeroLogger; +import eco.unstable.util.Maths; +import eco.unstable.util.classifier.ClassifierEvaluator; +import eco.unstable.util.classifier.Quantizer; public class ParkinsonClassifier extends AbstractProblemGE { diff --git a/src/main/java/hero/lib/examples/parkinson/ParkinsonFeatureClassifier.java b/src/eco/lib/examples/parkinson/ParkinsonFeatureClassifier.java similarity index 97% rename from src/main/java/hero/lib/examples/parkinson/ParkinsonFeatureClassifier.java rename to src/eco/lib/examples/parkinson/ParkinsonFeatureClassifier.java index a6b9b53..86b03b9 100644 --- a/src/main/java/hero/lib/examples/parkinson/ParkinsonFeatureClassifier.java +++ b/src/eco/lib/examples/parkinson/ParkinsonFeatureClassifier.java @@ -18,7 +18,7 @@ * - Josué Pagán Ortíz * - José Luis Risco Martín */ -package hero.lib.examples.parkinson; +package eco.lib.examples.parkinson; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -34,24 +34,25 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import hero.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm; -import hero.core.algorithm.metaheuristic.moge.AbstractProblemGE; -import hero.core.algorithm.metaheuristic.moge.Phenotype; -import hero.core.operator.comparator.SimpleDominance; -import hero.core.operator.crossover.SinglePointCrossover; -import hero.core.operator.evaluator.AbstractPopEvaluator; -import hero.core.operator.mutation.IntegerFlipMutation; -import hero.core.operator.selection.BinaryTournament; -import hero.core.optimization.threads.MasterWorkerThreads; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; -import hero.unstable.util.classifier.ClassifierEvaluator; -import hero.unstable.util.classifier.Quantizer; -import hero.core.util.compiler.MyCompiler; -import hero.core.util.compiler.MyLoader; -import hero.core.util.logger.HeroLogger; -import hero.unstable.util.Maths; + +import eco.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm; +import eco.core.algorithm.metaheuristic.moge.AbstractProblemGE; +import eco.core.algorithm.metaheuristic.moge.Phenotype; +import eco.core.operator.comparator.SimpleDominance; +import eco.core.operator.crossover.SinglePointCrossover; +import eco.core.operator.evaluator.AbstractPopEvaluator; +import eco.core.operator.mutation.IntegerFlipMutation; +import eco.core.operator.selection.BinaryTournament; +import eco.core.optimization.threads.MasterWorkerThreads; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; +import eco.core.util.compiler.MyCompiler; +import eco.core.util.compiler.MyLoader; +import eco.core.util.logger.HeroLogger; +import eco.unstable.util.Maths; +import eco.unstable.util.classifier.ClassifierEvaluator; +import eco.unstable.util.classifier.Quantizer; public class ParkinsonFeatureClassifier extends AbstractProblemGE { diff --git a/src/main/java/hero/lib/test/pareto/TestResults.java b/src/eco/lib/test/pareto/TestResults.java similarity index 94% rename from src/main/java/hero/lib/test/pareto/TestResults.java rename to src/eco/lib/test/pareto/TestResults.java index de5046f..b4425af 100644 --- a/src/main/java/hero/lib/test/pareto/TestResults.java +++ b/src/eco/lib/test/pareto/TestResults.java @@ -17,12 +17,8 @@ * Contributors: * - José Luis Risco Martín */ -package hero.lib.test.pareto; +package eco.lib.test.pareto; -import hero.core.operator.comparator.SolutionDominance; -import hero.core.problem.Solution; -import hero.core.problem.Solutions; -import hero.core.problem.Variable; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -31,6 +27,11 @@ import java.util.logging.Level; import java.util.logging.Logger; +import eco.core.operator.comparator.SolutionDominance; +import eco.core.problem.Solution; +import eco.core.problem.Solutions; +import eco.core.problem.Variable; + /** * * @author José Luis Risco Martín diff --git a/src/main/java/hero/unstable/util/classifier/AdaBoost.java b/src/eco/unstable/util/classifier/AdaBoost.java similarity index 97% rename from src/main/java/hero/unstable/util/classifier/AdaBoost.java rename to src/eco/unstable/util/classifier/AdaBoost.java index b3021f1..01e70ad 100644 --- a/src/main/java/hero/unstable/util/classifier/AdaBoost.java +++ b/src/eco/unstable/util/classifier/AdaBoost.java @@ -17,12 +17,13 @@ * Contributors: * - José Luis Risco Martín */ -package hero.unstable.util.classifier; +package eco.unstable.util.classifier; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import hero.lib.examples.parkinson.ParkinsonAdaBoostClassifier; + +import eco.lib.examples.parkinson.ParkinsonAdaBoostClassifier; /** * diff --git a/src/main/java/hero/unstable/util/classifier/ClassifierEvaluator.java b/src/eco/unstable/util/classifier/ClassifierEvaluator.java similarity index 99% rename from src/main/java/hero/unstable/util/classifier/ClassifierEvaluator.java rename to src/eco/unstable/util/classifier/ClassifierEvaluator.java index c38e73a..931d3c2 100644 --- a/src/main/java/hero/unstable/util/classifier/ClassifierEvaluator.java +++ b/src/eco/unstable/util/classifier/ClassifierEvaluator.java @@ -17,7 +17,7 @@ * Contributors: * - José Luis Risco Martín */ -package hero.unstable.util.classifier; +package eco.unstable.util.classifier; /** * Class to manage the confusion matrix and metric parameters of a classifier. diff --git a/src/main/java/hero/unstable/util/classifier/Quantizer.java b/src/eco/unstable/util/classifier/Quantizer.java similarity index 97% rename from src/main/java/hero/unstable/util/classifier/Quantizer.java rename to src/eco/unstable/util/classifier/Quantizer.java index 56c65b0..b13b12a 100644 --- a/src/main/java/hero/unstable/util/classifier/Quantizer.java +++ b/src/eco/unstable/util/classifier/Quantizer.java @@ -18,7 +18,7 @@ * - Josué Pagán Ortíz * - José Luis Risco Martín */ -package hero.unstable.util.classifier; +package eco.unstable.util.classifier; /** *