Created core package.

iscar-ucm · May 19, 2016 · 14639fc · 14639fc
1 parent 9bf0504
commit 14639fc
Show file tree

Hide file tree

Showing 90 changed files with 460 additions and 460 deletions.
diff --git a/src/hero/algorithm/Algorithm.java → src/hero/core/algorithm/Algorithm.java b/src/hero/algorithm/Algorithm.java → src/hero/core/algorithm/Algorithm.java
@@ -17,11 +17,11 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm;
+package hero.core.algorithm;
 
-import hero.problem.Problem;
-import hero.problem.Solutions;
-import hero.problem.Variable;
+import hero.core.problem.Problem;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
 
 /**
  *

diff --git a/...taheuristic/de/DifferentialEvolution.java → ...taheuristic/de/DifferentialEvolution.java b/...taheuristic/de/DifferentialEvolution.java → ...taheuristic/de/DifferentialEvolution.java
@@ -18,19 +18,19 @@
  *  - J. M. Colmenar
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.de;
+package hero.core.algorithm.metaheuristic.de;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Random;
 import java.util.logging.Logger;
-import hero.algorithm.Algorithm;
-import hero.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
-import hero.operator.comparator.SimpleDominance;
-import hero.problem.Problem;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
+import hero.core.algorithm.Algorithm;
+import hero.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
+import hero.core.operator.comparator.SimpleDominance;
+import hero.core.problem.Problem;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
 
 /**
  * Class implementing the differential evolution technique for problem solving.

diff --git a/...euristic/de/DifferentialEvolutionInt.java → ...euristic/de/DifferentialEvolutionInt.java b/...euristic/de/DifferentialEvolutionInt.java → ...euristic/de/DifferentialEvolutionInt.java
@@ -18,19 +18,19 @@
  *  - J. M. Colmenar
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.de;
+package hero.core.algorithm.metaheuristic.de;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Random;
 import java.util.logging.Logger;
-import hero.algorithm.Algorithm;
-import hero.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
-import hero.operator.comparator.SimpleDominance;
-import hero.problem.Problem;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
+import hero.core.algorithm.Algorithm;
+import hero.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
+import hero.core.operator.comparator.SimpleDominance;
+import hero.core.problem.Problem;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
 
 /**
  * Class implementing the differential evolution technique for problem solving.

diff --git a/...tic/de/DifferentialEvolution_example.java → ...tic/de/DifferentialEvolution_example.java b/...tic/de/DifferentialEvolution_example.java → ...tic/de/DifferentialEvolution_example.java
@@ -18,16 +18,16 @@
  *  - J. M. Colmenar
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.de;
+package hero.core.algorithm.metaheuristic.de;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
-import hero.problems.Rastringin;
-import hero.util.logger.HeroLogger;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
+import hero.core.problems.Rastringin;
+import hero.core.util.logger.HeroLogger;
 
 /**
  * Test class and example of Differential Evolution use.

diff --git a/...etaheuristic/es/EvolutionaryStrategy.java → ...etaheuristic/es/EvolutionaryStrategy.java b/...etaheuristic/es/EvolutionaryStrategy.java → ...etaheuristic/es/EvolutionaryStrategy.java
@@ -17,21 +17,21 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.es;
+package hero.core.algorithm.metaheuristic.es;
 
 import java.util.Collections;
 import java.util.logging.Logger;
 
-import hero.algorithm.Algorithm;
-import hero.operator.comparator.SimpleDominance;
-import hero.operator.crossover.SinglePointCrossover;
-import hero.operator.mutation.MutationOperator;
-import hero.operator.selection.BinaryTournament;
-import hero.operator.selection.SelectionOperator;
-import hero.problem.Problem;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
+import hero.core.algorithm.Algorithm;
+import hero.core.operator.comparator.SimpleDominance;
+import hero.core.operator.crossover.SinglePointCrossover;
+import hero.core.operator.mutation.MutationOperator;
+import hero.core.operator.selection.BinaryTournament;
+import hero.core.operator.selection.SelectionOperator;
+import hero.core.problem.Problem;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
 
 public class EvolutionaryStrategy<T extends Variable<?>> extends Algorithm<T> {
 

diff --git a/...stic/es/EvolutionaryStrategy_example.java → ...stic/es/EvolutionaryStrategy_example.java b/...stic/es/EvolutionaryStrategy_example.java → ...stic/es/EvolutionaryStrategy_example.java
@@ -17,17 +17,17 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.es;
+package hero.core.algorithm.metaheuristic.es;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import hero.operator.mutation.PolynomialMutation;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
-import hero.problems.Rastringin;
-import hero.util.logger.HeroLogger;
+import hero.core.operator.mutation.PolynomialMutation;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
+import hero.core.problems.Rastringin;
+import hero.core.util.logger.HeroLogger;
 
 public class EvolutionaryStrategy_example {
 

diff --git a/...aheuristic/ga/SimpleGeneticAlgorithm.java → ...aheuristic/ga/SimpleGeneticAlgorithm.java b/...aheuristic/ga/SimpleGeneticAlgorithm.java → ...aheuristic/ga/SimpleGeneticAlgorithm.java
@@ -17,20 +17,20 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.ga;
+package hero.core.algorithm.metaheuristic.ga;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.logging.Logger;
-import hero.algorithm.Algorithm;
-import hero.operator.comparator.SimpleDominance;
-import hero.operator.crossover.CrossoverOperator;
-import hero.operator.mutation.MutationOperator;
-import hero.operator.selection.SelectionOperator;
-import hero.problem.Problem;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
+import hero.core.algorithm.Algorithm;
+import hero.core.operator.comparator.SimpleDominance;
+import hero.core.operator.crossover.CrossoverOperator;
+import hero.core.operator.mutation.MutationOperator;
+import hero.core.operator.selection.SelectionOperator;
+import hero.core.problem.Problem;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
 
 public class SimpleGeneticAlgorithm<V extends Variable<?>> extends Algorithm<V> {
 

diff --git a/...ic/ga/SimpleGeneticAlgorithm_example.java → ...ic/ga/SimpleGeneticAlgorithm_example.java b/...ic/ga/SimpleGeneticAlgorithm_example.java → ...ic/ga/SimpleGeneticAlgorithm_example.java
@@ -17,18 +17,18 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.ga;
+package hero.core.algorithm.metaheuristic.ga;
 
 import java.util.logging.Level;
-import hero.operator.comparator.SimpleDominance;
-import hero.operator.crossover.SBXCrossover;
-import hero.operator.mutation.PolynomialMutation;
-import hero.operator.selection.BinaryTournament;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
-import hero.problems.Rastringin;
-import hero.util.logger.HeroLogger;
+import hero.core.operator.comparator.SimpleDominance;
+import hero.core.operator.crossover.SBXCrossover;
+import hero.core.operator.mutation.PolynomialMutation;
+import hero.core.operator.selection.BinaryTournament;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
+import hero.core.problems.Rastringin;
+import hero.core.util.logger.HeroLogger;
 
 public class SimpleGeneticAlgorithm_example {
 

diff --git a/...metaheuristic/ge/GramEvalStaticModel.java → ...metaheuristic/ge/GramEvalStaticModel.java b/...metaheuristic/ge/GramEvalStaticModel.java → ...metaheuristic/ge/GramEvalStaticModel.java
@@ -17,7 +17,7 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.ge;
+package hero.core.algorithm.metaheuristic.ge;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -33,21 +33,21 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import hero.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
-import hero.algorithm.metaheuristic.moge.AbstractProblemGE;
-import hero.algorithm.metaheuristic.moge.Phenotype;
-import hero.operator.comparator.SimpleDominance;
-import hero.operator.crossover.SinglePointCrossover;
-import hero.operator.evaluator.AbstractPopPredictor;
-import hero.operator.mutation.IntegerFlipMutation;
-import hero.operator.selection.BinaryTournament;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
-import hero.util.DataTable;
-import hero.util.compiler.MyCompiler;
-import hero.util.compiler.MyLoader;
-import hero.util.logger.HeroLogger;
+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.AbstractPopPredictor;
+import hero.core.operator.mutation.IntegerFlipMutation;
+import hero.core.operator.selection.BinaryTournament;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
+import hero.core.util.DataTable;
+import hero.core.util.compiler.MyCompiler;
+import hero.core.util.compiler.MyLoader;
+import hero.core.util.logger.HeroLogger;
 
 /**
  * Class to develop "static" (non-temporal) models

diff --git a/...taheuristic/ge/GramEvalTemporalModel.java → ...taheuristic/ge/GramEvalTemporalModel.java b/...taheuristic/ge/GramEvalTemporalModel.java → ...taheuristic/ge/GramEvalTemporalModel.java
@@ -18,7 +18,7 @@
  *  - José Luis Risco Martín
  *  - J. M. Colmenar
  */
-package hero.algorithm.metaheuristic.ge;
+package hero.core.algorithm.metaheuristic.ge;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -33,21 +33,21 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import hero.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
-import hero.algorithm.metaheuristic.moge.AbstractProblemGE;
-import hero.algorithm.metaheuristic.moge.Phenotype;
-import hero.operator.comparator.SimpleDominance;
-import hero.operator.crossover.SinglePointCrossover;
-import hero.operator.evaluator.AbstractPopEvaluator;
-import hero.operator.mutation.IntegerFlipMutation;
-import hero.operator.selection.BinaryTournament;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
-import hero.util.DataTable;
-import hero.util.compiler.MyCompiler;
-import hero.util.compiler.MyLoader;
-import hero.util.logger.HeroLogger;
+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.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
+import hero.core.util.DataTable;
+import hero.core.util.compiler.MyCompiler;
+import hero.core.util.compiler.MyLoader;
+import hero.core.util.logger.HeroLogger;
 
 public class GramEvalTemporalModel extends AbstractProblemGE {
 

diff --git a/...ristic/ge/SimpleGrammaticalEvolution.java → ...ristic/ge/SimpleGrammaticalEvolution.java b/...ristic/ge/SimpleGrammaticalEvolution.java → ...ristic/ge/SimpleGrammaticalEvolution.java
@@ -18,17 +18,17 @@
  *  - J. M. Colmenar
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.ge;
+package hero.core.algorithm.metaheuristic.ge;
 
-import hero.algorithm.Algorithm;
-import hero.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
-import hero.operator.comparator.SimpleDominance;
-import hero.operator.crossover.SinglePointCrossover;
-import hero.operator.mutation.IntegerFlipMutation;
-import hero.operator.selection.BinaryTournament;
-import hero.problem.Problem;
-import hero.problem.Solutions;
-import hero.problem.Variable;
+import hero.core.algorithm.Algorithm;
+import hero.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
+import hero.core.operator.comparator.SimpleDominance;
+import hero.core.operator.crossover.SinglePointCrossover;
+import hero.core.operator.mutation.IntegerFlipMutation;
+import hero.core.operator.selection.BinaryTournament;
+import hero.core.problem.Problem;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
 
 /**
  * Grammatical evolution using just one objective.

diff --git a/...e/SimpleGrammaticalEvolution_example.java → ...e/SimpleGrammaticalEvolution_example.java b/...e/SimpleGrammaticalEvolution_example.java → ...e/SimpleGrammaticalEvolution_example.java
@@ -17,20 +17,20 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.ge;
+package hero.core.algorithm.metaheuristic.ge;
 
 import java.util.logging.Logger;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
-import hero.algorithm.metaheuristic.moge.AbstractProblemGE;
-import hero.algorithm.metaheuristic.moge.Phenotype;
-import hero.operator.crossover.SinglePointCrossover;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
-import hero.util.logger.HeroLogger;
+import hero.core.algorithm.metaheuristic.moge.AbstractProblemGE;
+import hero.core.algorithm.metaheuristic.moge.Phenotype;
+import hero.core.operator.crossover.SinglePointCrossover;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
+import hero.core.util.logger.HeroLogger;
 
 /**
  * Example Please note that using the Script Engine is too slow. We recommend

diff --git a/.../algorithm/metaheuristic/moga/NSGAII.java → .../algorithm/metaheuristic/moga/NSGAII.java b/.../algorithm/metaheuristic/moga/NSGAII.java → .../algorithm/metaheuristic/moga/NSGAII.java
@@ -17,24 +17,24 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.algorithm.metaheuristic.moga;
+package hero.core.algorithm.metaheuristic.moga;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.logging.Logger;
-import hero.algorithm.Algorithm;
-import hero.operator.assigner.CrowdingDistance;
-import hero.operator.assigner.FrontsExtractor;
-import hero.operator.comparator.ComparatorNSGAII;
-import hero.operator.comparator.SolutionDominance;
-import hero.operator.crossover.CrossoverOperator;
-import hero.operator.mutation.MutationOperator;
-import hero.operator.selection.SelectionOperator;
-import hero.problem.Problem;
-import hero.problem.Solution;
-import hero.problem.Solutions;
-import hero.problem.Variable;
+import hero.core.algorithm.Algorithm;
+import hero.core.operator.assigner.CrowdingDistance;
+import hero.core.operator.assigner.FrontsExtractor;
+import hero.core.operator.comparator.ComparatorNSGAII;
+import hero.core.operator.comparator.SolutionDominance;
+import hero.core.operator.crossover.CrossoverOperator;
+import hero.core.operator.mutation.MutationOperator;
+import hero.core.operator.selection.SelectionOperator;
+import hero.core.problem.Problem;
+import hero.core.problem.Solution;
+import hero.core.problem.Solutions;
+import hero.core.problem.Variable;
 
 /**
  *