From 8045280859a0751cc728ae178424e417839b96a4 Mon Sep 17 00:00:00 2001 From: Hugo Roussel <hugo.roussel@univ-tlse3.fr> Date: Mon, 15 Jul 2019 10:06:11 +0200 Subject: [PATCH] Clean some outdated TODO --- AMOEBAonAMAK/src/agents/AmoebaAgent.java | 1 - AMOEBAonAMAK/src/agents/context/Context.java | 12 ++---------- AMOEBAonAMAK/src/agents/context/Experiment.java | 1 - AMOEBAonAMAK/src/agents/context/Range.java | 1 - .../localModel/LocalModelMillerRegression.java | 1 - AMOEBAonAMAK/src/agents/head/Head.java | 6 +++--- AMOEBAonAMAK/src/experiments/F_XY_System.java | 7 ------- AMOEBAonAMAK/src/experiments/Main.java | 1 - AMOEBAonAMAK/src/experiments/NDimCube.java | 9 +-------- .../nDimensionsLaunchers/F_N_Launcher.java | 1 - .../nDimensionsLaunchers/F_N_Manager.java | 1 - AMOEBAonAMAK/src/ncs/NCS.java | 1 - 12 files changed, 6 insertions(+), 36 deletions(-) diff --git a/AMOEBAonAMAK/src/agents/AmoebaAgent.java b/AMOEBAonAMAK/src/agents/AmoebaAgent.java index 132cad38..45a2c6c1 100644 --- a/AMOEBAonAMAK/src/agents/AmoebaAgent.java +++ b/AMOEBAonAMAK/src/agents/AmoebaAgent.java @@ -28,7 +28,6 @@ public abstract class AmoebaAgent extends Agent<AMOEBA, World> implements Loggab @Override protected void onReady() { - // TODO Auto-generated method stub super.onReady(); logger().debug("CYCLE "+getAmas().getCycle(), "Agent %s ready.", toString()); } diff --git a/AMOEBAonAMAK/src/agents/context/Context.java b/AMOEBAonAMAK/src/agents/context/Context.java index 8affca32..66e86ac3 100644 --- a/AMOEBAonAMAK/src/agents/context/Context.java +++ b/AMOEBAonAMAK/src/agents/context/Context.java @@ -82,10 +82,6 @@ public class Context extends AmoebaAgent { regressionPerformance = new DynamicPerformance(successesBeforeDiminution, errorsBeforeAugmentation, getAmas().getHeadAgent().getAverageRegressionPerformanceIndicator(), augmentationFactorError, diminutionFactorError, minError); getAmas().addSpatiallyAlteredContextForUnityUI(this); - - //TODO in amak, cannot kill a agent before its 1st cycle - //NCSDetection_Uselessness(); - } public Context(AMOEBA amoeba, Context fatherContext, HashMap<Percept, Pair<Double, Double>> contextDimensions) { @@ -120,8 +116,7 @@ public class Context extends AmoebaAgent { // true, v, world); ranges.put(p, r); ranges.get(p).setValue(p.getValue()); - // TODO - // sendExpressMessage(null, MessageType.REGISTER, p); + firstPoint.addDimension(p, p.getValue()); p.addContextProjection(this); @@ -154,8 +149,6 @@ public class Context extends AmoebaAgent { ranges.put(pct, r); ranges.get(pct).setValue(center); - // TODO - // sendExpressMessage(null, MessageType.REGISTER, pct); pct.addContextProjection(this); } @@ -194,8 +187,7 @@ public class Context extends AmoebaAgent { ranges.put(v, r); ranges.get(v).setValue(v.getValue()); - // TODO - // sendExpressMessage(null, MessageType.REGISTER, v); + firstPoint.addDimension(v, v.getValue()); v.addContextProjection(this);; diff --git a/AMOEBAonAMAK/src/agents/context/Experiment.java b/AMOEBAonAMAK/src/agents/context/Experiment.java index 631300c0..3dcd4406 100644 --- a/AMOEBAonAMAK/src/agents/context/Experiment.java +++ b/AMOEBAonAMAK/src/agents/context/Experiment.java @@ -7,7 +7,6 @@ import java.util.LinkedHashMap; import agents.context.Context; import agents.percept.Percept; -// TODO: Auto-generated Javadoc /** * The Class Experiment. */ diff --git a/AMOEBAonAMAK/src/agents/context/Range.java b/AMOEBAonAMAK/src/agents/context/Range.java index e61452d2..5529a9ac 100644 --- a/AMOEBAonAMAK/src/agents/context/Range.java +++ b/AMOEBAonAMAK/src/agents/context/Range.java @@ -11,7 +11,6 @@ import ncs.NCS; import utils.Pair; import utils.TRACE_LEVEL; -// TODO: Auto-generated Javadoc /** * The Class Range. */ diff --git a/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java b/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java index 1a9bcee4..09e88638 100644 --- a/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java +++ b/AMOEBAonAMAK/src/agents/context/localModel/LocalModelMillerRegression.java @@ -11,7 +11,6 @@ import agents.percept.Percept; import utils.Pair; import utils.TRACE_LEVEL; -// TODO: Auto-generated Javadoc /** * The Class LocalModelMillerRegression. */ diff --git a/AMOEBAonAMAK/src/agents/head/Head.java b/AMOEBAonAMAK/src/agents/head/Head.java index e0713dc3..d07ae056 100644 --- a/AMOEBAonAMAK/src/agents/head/Head.java +++ b/AMOEBAonAMAK/src/agents/head/Head.java @@ -282,9 +282,9 @@ public class Head extends AmoebaAgent { getAmas().data.prediction = nearestContext.getActionProposal(); bestContext = nearestContext; } else { - //TODO THIS IS VERY INEFICIENT ! amoeba should not look globally, but right now there's no other strategy - // to limit performance impact, we limit our search on a random sample. - // a better way would be to increase neighborhood. + //TODO THIS IS VERY INEFICIENT ! amoeba should not look globally, but right now there's no other strategy. + // To limit performance impact, we limit our search on a random sample. + // A better way would be to increase neighborhood. PrintOnce.print("Play without oracle : no nearest context in neighbors, searching in a random sample. (only shown once)"); List<Context> searchList = RandomUtils.pickNRandomElements(getAmas().getContexts(), 100); nearestContext = this.getNearestContext(searchList); diff --git a/AMOEBAonAMAK/src/experiments/F_XY_System.java b/AMOEBAonAMAK/src/experiments/F_XY_System.java index 30f3fdfd..8aba6d44 100644 --- a/AMOEBAonAMAK/src/experiments/F_XY_System.java +++ b/AMOEBAonAMAK/src/experiments/F_XY_System.java @@ -59,32 +59,25 @@ public class F_XY_System implements StudiedSystem { @Override public HashMap<String, Double> getOutputWithNoise(double noiseRange) { - // TODO Auto-generated method stub return null; } @Override public HashMap<String, Double> getOutputWithAmoebaRequest(HashMap<String, Double> amoebaRequest, double noiseRange) { - // TODO Auto-generated method stub return null; } @Override public void setActiveLearning(boolean value) { - // TODO Auto-generated method stub - } @Override public void setSelfRequest(HashMap<Percept, Double> request) { - // TODO Auto-generated method stub - } @Override public HashMap<String, Double> getIntput() { - // TODO Auto-generated method stub return null; } } \ No newline at end of file diff --git a/AMOEBAonAMAK/src/experiments/Main.java b/AMOEBAonAMAK/src/experiments/Main.java index 73ac6686..4cd5643e 100644 --- a/AMOEBAonAMAK/src/experiments/Main.java +++ b/AMOEBAonAMAK/src/experiments/Main.java @@ -45,7 +45,6 @@ public class Main { try { Thread.currentThread().wait(); } catch (InterruptedException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/AMOEBAonAMAK/src/experiments/NDimCube.java b/AMOEBAonAMAK/src/experiments/NDimCube.java index 8e48b426..fcb7ceb6 100644 --- a/AMOEBAonAMAK/src/experiments/NDimCube.java +++ b/AMOEBAonAMAK/src/experiments/NDimCube.java @@ -106,32 +106,25 @@ public class NDimCube implements StudiedSystem{ @Override public HashMap<String, Double> getOutputWithNoise(double noiseRange) { - // TODO Auto-generated method stub return null; } @Override public HashMap<String, Double> getOutputWithAmoebaRequest(HashMap<String, Double> amoebaRequest, double noiseRange) { - // TODO Auto-generated method stub return null; } @Override - public void setActiveLearning(boolean value) { - // TODO Auto-generated method stub - + public void setActiveLearning(boolean value) { } @Override public void setSelfRequest(HashMap<Percept, Double> request) { - // TODO Auto-generated method stub - } @Override public HashMap<String, Double> getIntput() { - // TODO Auto-generated method stub return null; } } \ No newline at end of file diff --git a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java index 2e031071..317b044f 100644 --- a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java +++ b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Launcher.java @@ -15,7 +15,6 @@ import kernel.backup.IBackupSystem; import kernel.backup.SaveHelperImpl; -// TODO: Auto-generated Javadoc /** * The Class BadContextLauncherEasy. */ diff --git a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java index b26d6378..331ba527 100644 --- a/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java +++ b/AMOEBAonAMAK/src/experiments/nDimensionsLaunchers/F_N_Manager.java @@ -8,7 +8,6 @@ import agents.percept.Percept; import kernel.StudiedSystem; -// TODO: Auto-generated Javadoc /** * The Class BadContextManager. */ diff --git a/AMOEBAonAMAK/src/ncs/NCS.java b/AMOEBAonAMAK/src/ncs/NCS.java index 756f21ca..c2e85b02 100644 --- a/AMOEBAonAMAK/src/ncs/NCS.java +++ b/AMOEBAonAMAK/src/ncs/NCS.java @@ -5,7 +5,6 @@ import java.io.Serializable; import kernel.World; - // TODO: Auto-generated Javadoc /** * Non Cooperative Situation as defined in the AMAS theory. */ -- GitLab