HERO renamed to ECO, java 11 used instead java 8

iscar-ucm · May 26, 2021 · e1e356d · e1e356d
1 parent 46496a4
commit e1e356d
Show file tree

Hide file tree

Showing 99 changed files with 564 additions and 491 deletions.
diff --git a/.devcontainer/Dockerfile 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
@@ -0,0 +1,16 @@
+{
+    "name": "eco",
+    "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
@@ -0,0 +1,15 @@
+{
+    // 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 Current File",
+            "request": "launch",
+            "mainClass": "${file}",
+            "projectName": "eco"
+        }
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
diff --git a/.vscode/tasks.json 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"
+        }
+    ]
+}
diff --git a/pom.xml b/pom.xml
@@ -1,34 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>hero</groupId>
-    <artifactId>hero</artifactId>
-    <version>1.0.0</version>
+    <groupId>eco</groupId>
+    <artifactId>eco</artifactId>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
     <build>
-        <plugins>
-            <!-- Make this jar executable -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- DO NOT include log4j.properties file in your Jar -->
-                    <excludes>
-                        <exclude>**/log4j.properties</exclude>
-                    </excludes>
-                    <archive>
-                        <manifest>
-                            <!-- Jar file entry point -->
-                            <mainClass>hero.core.util.indicator.UnaryHyperVolume</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
+        <sourceDirectory>src</sourceDirectory>
     </build>
 </project>
diff --git a/...n/java/hero/core/algorithm/Algorithm.java → src/eco/core/algorithm/Algorithm.java b/...n/java/hero/core/algorithm/Algorithm.java → src/eco/core/algorithm/Algorithm.java
@@ -17,11 +17,11 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.core.algorithm;
+package eco.core.algorithm;
 
-import hero.core.problem.Problem;
-import hero.core.problem.Solutions;
-import hero.core.problem.Variable;
+import eco.core.problem.Problem;
+import eco.core.problem.Solutions;
+import eco.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,20 @@
  *  - J. M. Colmenar
  *  - José Luis Risco Martín
  */
-package hero.core.algorithm.metaheuristic.de;
+package eco.core.algorithm.metaheuristic.de;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Random;
 import java.util.logging.Logger;
-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;
+
+import eco.core.algorithm.Algorithm;
+import eco.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
+import eco.core.operator.comparator.SimpleDominance;
+import eco.core.problem.Problem;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.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,20 @@
  *  - J. M. Colmenar
  *  - José Luis Risco Martín
  */
-package hero.core.algorithm.metaheuristic.de;
+package eco.core.algorithm.metaheuristic.de;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Random;
 import java.util.logging.Logger;
-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;
+
+import eco.core.algorithm.Algorithm;
+import eco.core.algorithm.metaheuristic.ga.SimpleGeneticAlgorithm;
+import eco.core.operator.comparator.SimpleDominance;
+import eco.core.problem.Problem;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.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.core.algorithm.metaheuristic.de;
+package eco.core.algorithm.metaheuristic.de;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import hero.core.problem.Solution;
-import hero.core.problem.Solutions;
-import hero.core.problem.Variable;
-import hero.core.benchmarks.Rastringin;
-import hero.core.util.logger.HeroLogger;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.core.problem.Variable;
+import eco.core.benchmarks.Rastringin;
+import eco.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.core.algorithm.metaheuristic.es;
+package eco.core.algorithm.metaheuristic.es;
 
 import java.util.Collections;
 import java.util.logging.Logger;
 
-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;
+import eco.core.algorithm.Algorithm;
+import eco.core.operator.comparator.SimpleDominance;
+import eco.core.operator.crossover.SinglePointCrossover;
+import eco.core.operator.mutation.MutationOperator;
+import eco.core.operator.selection.BinaryTournament;
+import eco.core.operator.selection.SelectionOperator;
+import eco.core.problem.Problem;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.core.problem.Variable;
 
 public class EvolutionaryStrategy<V extends Variable<?>> extends Algorithm<V> {
 

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.core.algorithm.metaheuristic.es;
+package eco.core.algorithm.metaheuristic.es;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import hero.core.operator.mutation.PolynomialMutation;
-import hero.core.problem.Solution;
-import hero.core.problem.Solutions;
-import hero.core.problem.Variable;
-import hero.core.benchmarks.Rastringin;
-import hero.core.util.logger.HeroLogger;
+import eco.core.benchmarks.Rastringin;
+import eco.core.operator.mutation.PolynomialMutation;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.core.problem.Variable;
+import eco.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,19 +17,20 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.core.algorithm.metaheuristic.ga;
+package eco.core.algorithm.metaheuristic.ga;
 
 import java.util.Collections;
 import java.util.logging.Logger;
-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;
+
+import eco.core.algorithm.Algorithm;
+import eco.core.operator.comparator.SimpleDominance;
+import eco.core.operator.crossover.CrossoverOperator;
+import eco.core.operator.mutation.MutationOperator;
+import eco.core.operator.selection.SelectionOperator;
+import eco.core.problem.Problem;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.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,19 @@
  * Contributors:
  *  - José Luis Risco Martín
  */
-package hero.core.algorithm.metaheuristic.ga;
+package eco.core.algorithm.metaheuristic.ga;
 
 import java.util.logging.Level;
-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.benchmarks.Rastringin;
-import hero.core.util.logger.HeroLogger;
+
+import eco.core.benchmarks.Rastringin;
+import eco.core.operator.comparator.SimpleDominance;
+import eco.core.operator.crossover.SBXCrossover;
+import eco.core.operator.mutation.PolynomialMutation;
+import eco.core.operator.selection.BinaryTournament;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.core.problem.Variable;
+import eco.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.core.algorithm.metaheuristic.ge;
+package eco.core.algorithm.metaheuristic.ge;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -30,21 +30,22 @@
 import java.util.LinkedList;
 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.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;
+
+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.AbstractPopPredictor;
+import eco.core.operator.mutation.IntegerFlipMutation;
+import eco.core.operator.selection.BinaryTournament;
+import eco.core.problem.Solution;
+import eco.core.problem.Solutions;
+import eco.core.problem.Variable;
+import eco.core.util.DataTable;
+import eco.core.util.compiler.MyCompiler;
+import eco.core.util.compiler.MyLoader;
+import eco.core.util.logger.HeroLogger;
 
 /**
  * Class to develop "static" (non-temporal) models