From 342586bacde6dec62fa1c17419a916ce42305757 Mon Sep 17 00:00:00 2001
From: BrunoDatoMeneses <bruno.dato.meneses@gmail.com>
Date: Fri, 20 Sep 2019 15:04:23 +0200
Subject: [PATCH] CLN: organize experiments

---
 AMOEBAonAMAK/src/agents/percept/Percept.java                  | 2 +-
 AMOEBAonAMAK/src/experiments/{ => benchmark}/Benchmark.java   | 2 +-
 .../src/experiments/{ => benchmark}/BenchmarkThreading.java   | 2 +-
 .../experiments/{ => reinforcement}/SimpleReinforcement.java  | 2 +-
 .../SimpleReinforcement1DSpatialRewardAndAction.java          | 4 ++--
 .../{ => reinforcement}/SimpleReinforcement2D.java            | 2 +-
 .../SimpleReinforcement2DSpatialRewardAndAction.java          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename AMOEBAonAMAK/src/experiments/{ => benchmark}/Benchmark.java (95%)
 rename AMOEBAonAMAK/src/experiments/{ => benchmark}/BenchmarkThreading.java (96%)
 rename AMOEBAonAMAK/src/experiments/{ => reinforcement}/SimpleReinforcement.java (96%)
 rename AMOEBAonAMAK/src/experiments/{ => reinforcement}/SimpleReinforcement1DSpatialRewardAndAction.java (96%)
 rename AMOEBAonAMAK/src/experiments/{ => reinforcement}/SimpleReinforcement2D.java (96%)
 rename AMOEBAonAMAK/src/experiments/{ => reinforcement}/SimpleReinforcement2DSpatialRewardAndAction.java (96%)

diff --git a/AMOEBAonAMAK/src/agents/percept/Percept.java b/AMOEBAonAMAK/src/agents/percept/Percept.java
index bdd4ba15..551fef50 100644
--- a/AMOEBAonAMAK/src/agents/percept/Percept.java
+++ b/AMOEBAonAMAK/src/agents/percept/Percept.java
@@ -392,7 +392,7 @@ public class Percept extends AmoebaAgent {
 	}
 	
 	public double getMappingErrorAllowedMin() {
-		return getMinMaxDistance() * getEnvironment().getMappingErrorAllowed() * 0.4;
+		return getMinMaxDistance() * getEnvironment().getMappingErrorAllowed() * 0.5;
 	}
 	
 	public double getMappingErrorAllowedOverMapping() {
diff --git a/AMOEBAonAMAK/src/experiments/Benchmark.java b/AMOEBAonAMAK/src/experiments/benchmark/Benchmark.java
similarity index 95%
rename from AMOEBAonAMAK/src/experiments/Benchmark.java
rename to AMOEBAonAMAK/src/experiments/benchmark/Benchmark.java
index 17c5376e..aae072a3 100644
--- a/AMOEBAonAMAK/src/experiments/Benchmark.java
+++ b/AMOEBAonAMAK/src/experiments/benchmark/Benchmark.java
@@ -1,4 +1,4 @@
-package experiments;
+package experiments.benchmark;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/AMOEBAonAMAK/src/experiments/BenchmarkThreading.java b/AMOEBAonAMAK/src/experiments/benchmark/BenchmarkThreading.java
similarity index 96%
rename from AMOEBAonAMAK/src/experiments/BenchmarkThreading.java
rename to AMOEBAonAMAK/src/experiments/benchmark/BenchmarkThreading.java
index 58529462..37233bbe 100644
--- a/AMOEBAonAMAK/src/experiments/BenchmarkThreading.java
+++ b/AMOEBAonAMAK/src/experiments/benchmark/BenchmarkThreading.java
@@ -1,4 +1,4 @@
-package experiments;
+package experiments.benchmark;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/AMOEBAonAMAK/src/experiments/SimpleReinforcement.java b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement.java
similarity index 96%
rename from AMOEBAonAMAK/src/experiments/SimpleReinforcement.java
rename to AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement.java
index 02c98deb..e03c29e9 100644
--- a/AMOEBAonAMAK/src/experiments/SimpleReinforcement.java
+++ b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement.java
@@ -1,4 +1,4 @@
-package experiments;
+package experiments.reinforcement;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/AMOEBAonAMAK/src/experiments/SimpleReinforcement1DSpatialRewardAndAction.java b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement1DSpatialRewardAndAction.java
similarity index 96%
rename from AMOEBAonAMAK/src/experiments/SimpleReinforcement1DSpatialRewardAndAction.java
rename to AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement1DSpatialRewardAndAction.java
index 1214086e..a84b073b 100644
--- a/AMOEBAonAMAK/src/experiments/SimpleReinforcement1DSpatialRewardAndAction.java
+++ b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement1DSpatialRewardAndAction.java
@@ -1,4 +1,4 @@
-package experiments;
+package experiments.reinforcement;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,7 +32,7 @@ import utils.XmlConfigGenerator;
 public abstract class SimpleReinforcement1DSpatialRewardAndAction {
 	/* Learn and Test */
 	public static final int MAX_STEP_PER_EPISODE = 200;
-	public static final int N_LEARN = 1000;//400
+	public static final int N_LEARN = 100;//400
 	public static final int N_TEST = 100;
 	
 	/* Exploration */
diff --git a/AMOEBAonAMAK/src/experiments/SimpleReinforcement2D.java b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement2D.java
similarity index 96%
rename from AMOEBAonAMAK/src/experiments/SimpleReinforcement2D.java
rename to AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement2D.java
index 844b9602..26d76e1a 100644
--- a/AMOEBAonAMAK/src/experiments/SimpleReinforcement2D.java
+++ b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement2D.java
@@ -1,4 +1,4 @@
-package experiments;
+package experiments.reinforcement;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/AMOEBAonAMAK/src/experiments/SimpleReinforcement2DSpatialRewardAndAction.java b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement2DSpatialRewardAndAction.java
similarity index 96%
rename from AMOEBAonAMAK/src/experiments/SimpleReinforcement2DSpatialRewardAndAction.java
rename to AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement2DSpatialRewardAndAction.java
index b526e211..0f44eee9 100644
--- a/AMOEBAonAMAK/src/experiments/SimpleReinforcement2DSpatialRewardAndAction.java
+++ b/AMOEBAonAMAK/src/experiments/reinforcement/SimpleReinforcement2DSpatialRewardAndAction.java
@@ -1,4 +1,4 @@
-package experiments;
+package experiments.reinforcement;
 
 import java.io.File;
 import java.io.IOException;
-- 
GitLab