[Refactor] refactor packages of kernel batch feature

gama-platform · Nov 4, 2021 · c7fa752 · c7fa752
1 parent dea8159
commit c7fa752
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 41 deletions.
diff --git a/msi.gama.core/.classpath b/msi.gama.core/.classpath
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-		<accessrules>
-			<accessrule kind="accessible" pattern="*/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gaml">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+		<accessrules>
+			<accessrule kind="accessible" pattern="*/**"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gaml">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/msi.gama.core/src/msi/gama/kernel/batch/ParamSpaceExploAlgorithm.java b/msi.gama.core/src/msi/gama/kernel/batch/ParamSpaceExploAlgorithm.java
@@ -15,6 +15,14 @@
 import java.util.List;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.calibration.HillClimbing;
+import msi.gama.kernel.batch.calibration.SimulatedAnnealing;
+import msi.gama.kernel.batch.calibration.Swarm;
+import msi.gama.kernel.batch.calibration.TabuSearch;
+import msi.gama.kernel.batch.calibration.TabuSearchReactive;
+import msi.gama.kernel.batch.calibration.genetic.GeneticAlgorithm;
+import msi.gama.kernel.batch.exploration.ExhaustiveSearch;
+import msi.gama.kernel.batch.exploration.ExplicitExploration;
 import msi.gama.kernel.experiment.BatchAgent;
 import msi.gama.kernel.experiment.IExperimentPlan;
 import msi.gama.kernel.experiment.IParameter;

diff --git a/...c/msi/gama/kernel/batch/HillClimbing.java → ...ernel/batch/calibration/HillClimbing.java b/...c/msi/gama/kernel/batch/HillClimbing.java → ...ernel/batch/calibration/HillClimbing.java
@@ -8,13 +8,15 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration;
 
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.StoppingCriterion;
+import msi.gama.kernel.batch.StoppingCriterionMaxIt;
 import msi.gama.kernel.experiment.BatchAgent;
 import msi.gama.kernel.experiment.IExperimentPlan;
 import msi.gama.kernel.experiment.IParameter;

diff --git a/...ma/kernel/batch/LocalSearchAlgorithm.java → ...tch/calibration/LocalSearchAlgorithm.java b/...ma/kernel/batch/LocalSearchAlgorithm.java → ...tch/calibration/LocalSearchAlgorithm.java
@@ -8,12 +8,15 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  * 
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import msi.gama.kernel.batch.Neighborhood;
+import msi.gama.kernel.batch.Neighborhood1Var;
+import msi.gama.kernel.batch.ParamSpaceExploAlgorithm;
 import msi.gama.kernel.experiment.BatchAgent;
 import msi.gama.kernel.experiment.IParameter;
 import msi.gama.kernel.experiment.ParametersSet;

diff --git a/...e/src/msi/gama/kernel/batch/Particle.java → ...ma/kernel/batch/calibration/Particle.java b/...e/src/msi/gama/kernel/batch/Particle.java → ...ma/kernel/batch/calibration/Particle.java
@@ -1,9 +1,10 @@
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import msi.gama.kernel.batch.ParamSpaceExploAlgorithm;
 import msi.gama.kernel.experiment.BatchAgent;
 import msi.gama.kernel.experiment.IParameter;
 import msi.gama.kernel.experiment.ParametersSet;

diff --git a/...gama/kernel/batch/SimulatedAnnealing.java → ...batch/calibration/SimulatedAnnealing.java b/...gama/kernel/batch/SimulatedAnnealing.java → ...batch/calibration/SimulatedAnnealing.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...core/src/msi/gama/kernel/batch/Swarm.java → .../gama/kernel/batch/calibration/Swarm.java b/...core/src/msi/gama/kernel/batch/Swarm.java → .../gama/kernel/batch/calibration/Swarm.java
@@ -1,4 +1,4 @@
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,6 +7,9 @@
 import java.util.Map;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.ParamSpaceExploAlgorithm;
+import msi.gama.kernel.batch.StoppingCriterion;
+import msi.gama.kernel.batch.StoppingCriterionMaxIt;
 import msi.gama.kernel.experiment.ParametersSet;
 import msi.gama.precompiler.GamlAnnotations.doc;
 import msi.gama.precompiler.GamlAnnotations.example;

diff --git a/...src/msi/gama/kernel/batch/TabuSearch.java → .../kernel/batch/calibration/TabuSearch.java b/...src/msi/gama/kernel/batch/TabuSearch.java → .../kernel/batch/calibration/TabuSearch.java
@@ -8,14 +8,16 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.StoppingCriterion;
+import msi.gama.kernel.batch.StoppingCriterionMaxIt;
 import msi.gama.kernel.experiment.BatchAgent;
 import msi.gama.kernel.experiment.IExperimentPlan;
 import msi.gama.kernel.experiment.IParameter;

diff --git a/...gama/kernel/batch/TabuSearchReactive.java → ...batch/calibration/TabuSearchReactive.java b/...gama/kernel/batch/TabuSearchReactive.java → ...batch/calibration/TabuSearchReactive.java
@@ -8,14 +8,16 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.StoppingCriterion;
+import msi.gama.kernel.batch.StoppingCriterionMaxIt;
 import msi.gama.kernel.experiment.BatchAgent;
 import msi.gama.kernel.experiment.IExperimentPlan;
 import msi.gama.kernel.experiment.IParameter;

diff --git a/...src/msi/gama/kernel/batch/Chromosome.java → ...batch/calibration/genetic/Chromosome.java b/...src/msi/gama/kernel/batch/Chromosome.java → ...batch/calibration/genetic/Chromosome.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/.../src/msi/gama/kernel/batch/CrossOver.java → .../batch/calibration/genetic/CrossOver.java b/.../src/msi/gama/kernel/batch/CrossOver.java → .../batch/calibration/genetic/CrossOver.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.Set;
 

diff --git a/...c/msi/gama/kernel/batch/CrossOver1Pt.java → ...tch/calibration/genetic/CrossOver1Pt.java b/...c/msi/gama/kernel/batch/CrossOver1Pt.java → ...tch/calibration/genetic/CrossOver1Pt.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/...i/gama/kernel/batch/GeneticAlgorithm.java → ...calibration/genetic/GeneticAlgorithm.java b/...i/gama/kernel/batch/GeneticAlgorithm.java → ...calibration/genetic/GeneticAlgorithm.java
@@ -8,14 +8,17 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.Neighborhood;
+import msi.gama.kernel.batch.Neighborhood1Var;
+import msi.gama.kernel.batch.ParamSpaceExploAlgorithm;
 import msi.gama.kernel.experiment.BatchAgent;
 import msi.gama.kernel.experiment.IExperimentPlan;
 import msi.gama.kernel.experiment.IParameter;

diff --git a/...msi/gama/kernel/batch/Initialization.java → ...h/calibration/genetic/Initialization.java b/...msi/gama/kernel/batch/Initialization.java → ...h/calibration/genetic/Initialization.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.List;
 

diff --git a/...a/kernel/batch/InitializationUniform.java → ...ration/genetic/InitializationUniform.java b/...a/kernel/batch/InitializationUniform.java → ...ration/genetic/InitializationUniform.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,7 +45,7 @@ public List<Chromosome> initializePop(final IScope scope, final List<IParameter.
 			algo.computePopFitness(scope, populationInit);
 		final List<Chromosome> populationInitOrd = new ArrayList<>(populationInit);
 		Collections.sort(populationInitOrd);
-		if (algo.isMaximize) {
+		if (algo.isMaximize()) {
 			Collections.reverse(populationInitOrd);
 		}
 		return populationInitOrd.subList(0, populationDim - 1);

diff --git a/...e/src/msi/gama/kernel/batch/Mutation.java → ...l/batch/calibration/genetic/Mutation.java b/...e/src/msi/gama/kernel/batch/Mutation.java → ...l/batch/calibration/genetic/Mutation.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  * 
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.List;
 import msi.gama.kernel.experiment.IParameter;

diff --git a/...c/msi/gama/kernel/batch/Mutation1Var.java → ...tch/calibration/genetic/Mutation1Var.java b/...c/msi/gama/kernel/batch/Mutation1Var.java → ...tch/calibration/genetic/Mutation1Var.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  * 
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.List;
 

diff --git a/.../src/msi/gama/kernel/batch/Selection.java → .../batch/calibration/genetic/Selection.java b/.../src/msi/gama/kernel/batch/Selection.java → .../batch/calibration/genetic/Selection.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  * 
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.List;
 import msi.gama.runtime.IScope;

diff --git a/.../msi/gama/kernel/batch/SelectionBest.java → ...ch/calibration/genetic/SelectionBest.java b/.../msi/gama/kernel/batch/SelectionBest.java → ...ch/calibration/genetic/SelectionBest.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import static java.lang.Double.compare;
 import static one.util.streamex.StreamEx.of;

diff --git a/.../gama/kernel/batch/SelectionRoulette.java → ...alibration/genetic/SelectionRoulette.java b/.../gama/kernel/batch/SelectionRoulette.java → ...alibration/genetic/SelectionRoulette.java
@@ -8,7 +8,7 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  * 
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.calibration.genetic;
 
 import java.util.*;
 import msi.gama.runtime.IScope;

diff --git a/...i/gama/kernel/batch/ExhaustiveSearch.java → ...l/batch/exploration/ExhaustiveSearch.java b/...i/gama/kernel/batch/ExhaustiveSearch.java → ...l/batch/exploration/ExhaustiveSearch.java
@@ -8,13 +8,14 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.exploration;
 
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.ParamSpaceExploAlgorithm;
 import msi.gama.kernel.experiment.IParameter;
 import msi.gama.kernel.experiment.ParametersSet;
 import msi.gama.metamodel.shape.GamaPoint;

diff --git a/...ama/kernel/batch/ExplicitExploration.java → ...atch/exploration/ExplicitExploration.java b/...ama/kernel/batch/ExplicitExploration.java → ...atch/exploration/ExplicitExploration.java
@@ -8,13 +8,14 @@
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
  ********************************************************************************************************/
-package msi.gama.kernel.batch;
+package msi.gama.kernel.batch.exploration;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import msi.gama.common.interfaces.IKeyword;
+import msi.gama.kernel.batch.ParamSpaceExploAlgorithm;
 import msi.gama.kernel.experiment.ParametersSet;
 import msi.gama.precompiler.GamlAnnotations.doc;
 import msi.gama.precompiler.GamlAnnotations.example;

diff --git a/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentPlan.java b/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentPlan.java
@@ -25,8 +25,8 @@
 import msi.gama.common.interfaces.IKeyword;
 import msi.gama.common.preferences.GamaPreferences;
 import msi.gama.kernel.batch.BatchOutput;
-import msi.gama.kernel.batch.ExhaustiveSearch;
 import msi.gama.kernel.batch.IExploration;
+import msi.gama.kernel.batch.exploration.ExhaustiveSearch;
 import msi.gama.kernel.experiment.ExperimentPlan.BatchValidator;
 import msi.gama.kernel.model.IModel;
 import msi.gama.kernel.simulation.SimulationAgent;