diff --git a/AMOEBAonAMAK/src/agents/context/Context.java b/AMOEBAonAMAK/src/agents/context/Context.java index 0f601e60e99fdc66ae0a47bfc242531879d537a6..2a4632fe95b9b884aaf0503014ff493fc76c79f8 100644 --- a/AMOEBAonAMAK/src/agents/context/Context.java +++ b/AMOEBAonAMAK/src/agents/context/Context.java @@ -713,7 +713,7 @@ public class Context extends AmoebaAgent { for (Percept pct : getAmas().getPercepts()) { currentDistance = this.distance(ctxt, pct); - if(currentDistance<-pct.getMappingErrorAllowedMin()) { + if(currentDistance<-pct.getMappingErrorAllowedMin() && getAmas().getCycle()>1000) { getEnvironment().trace(TRACE_LEVEL.DEBUG,new ArrayList<String>(Arrays.asList("OVERLAP",pct.getName(), ""+this,""+ctxt)) ); overlapCounts+=1; overlapDistances.put(pct, Math.abs(currentDistance)); @@ -723,7 +723,7 @@ public class Context extends AmoebaAgent { } - if (currentDistance > pct.getMappingErrorAllowedMin()) { + if (currentDistance > pct.getMappingErrorAllowedMin() && getAmas().getCycle()>2000) { getEnvironment().trace(TRACE_LEVEL.DEBUG,new ArrayList<String>(Arrays.asList("VOID",pct.getName(), ""+this,""+ctxt, "distance", ""+currentDistance)) ); voidDistances.put(pct, currentDistance); bounds.put(pct, this.voidBounds(ctxt, pct)); @@ -2209,7 +2209,7 @@ public class Context extends AmoebaAgent { ret[1] = g / 255.0d; ret[2] = b / 255.0d; - return ret[0] + "," + ret[1] + "," + ret[2] + ",100"; + return ret[0] + "," + ret[1] + "," + ret[2] + ",200"; } public static double normalizePositiveValues(double upperBound, double dispersion, double value) { diff --git a/AMOEBAonAMAK/src/agents/head/Head.java b/AMOEBAonAMAK/src/agents/head/Head.java index f4de3348de5bde8f9ede9591fa28887989137332..90995cdbe2aa62bfcc54dcd72ec4fcb03c0825f7 100644 --- a/AMOEBAonAMAK/src/agents/head/Head.java +++ b/AMOEBAonAMAK/src/agents/head/Head.java @@ -215,8 +215,7 @@ public class Head extends AmoebaAgent { NCSDetection_ChildContext(); - //if(getAmas().getCycle()>1000) - //NCSDetection_PotentialRequest(); + NCSDetection_PotentialRequest(); criticalities.addCriticality("spatialCriticality", (getMinMaxVolume() - getVolumeOfAllContexts()) / getMinMaxVolume()); diff --git a/AMOEBAonAMAK/src/experiments/UnityLauncher/Main.java b/AMOEBAonAMAK/src/experiments/UnityLauncher/Main.java index effe3bbcf7316ef5a328169310f5cce120eca898..3198f183a3be69539d05feb8f83773625927ce37 100644 --- a/AMOEBAonAMAK/src/experiments/UnityLauncher/Main.java +++ b/AMOEBAonAMAK/src/experiments/UnityLauncher/Main.java @@ -31,8 +31,8 @@ public class Main implements Runnable { public static final boolean randomExploration = false; public static final boolean limitedToSpaceZone = true; public static final double mappingErrorAllowed = 0.03; - public static final double explorationIncrement = 1.0 ; - public static final double explorationWidht = 0.5 ; + public static final double explorationIncrement = 2.0 ; + public static final double explorationWidht = 0.3 ; public static final int nbCycle = 10000; diff --git a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java index 44f17659e94c4158cb169a9b2a48759d6eaee801..b26d63786fa62affc10ce76456644f65f6a74722 100644 --- a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java +++ b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java @@ -163,6 +163,7 @@ public class F_N_Manager implements StudiedSystem{ x[i] = selfRequest.get("px" + i); } } + else { if (generator == null) generator = new Random(29);