diff --git a/AMOEBA3/src/mas/agents/head/Head.java b/AMOEBA3/src/mas/agents/head/Head.java index 5a5a50dc8a686c804fb3d7f72b46a4fb910f699d..ddeb9997378be100fc0cefb2e1b011f19bfe22da 100644 --- a/AMOEBA3/src/mas/agents/head/Head.java +++ b/AMOEBA3/src/mas/agents/head/Head.java @@ -11,7 +11,7 @@ import mas.agents.percept.Percept; import mas.agents.context.Context; import mas.agents.messages.Message; import mas.agents.messages.MessageType; -import mas.blackbox.BlackBoxAgent; +//import mas.blackbox.BlackBoxAgent; // TODO: Auto-generated Javadoc /** diff --git a/AMOEBA3/src/mas/agents/percept/Percept.java b/AMOEBA3/src/mas/agents/percept/Percept.java index d9c0ccfa5cfbec0e45cdfb720b12569f422fbc98..b7b73d262c1f752e7fafeea3653471137c93d5f8 100644 --- a/AMOEBA3/src/mas/agents/percept/Percept.java +++ b/AMOEBA3/src/mas/agents/percept/Percept.java @@ -21,7 +21,7 @@ import mas.agents.context.CustomComparator; import mas.agents.context.Range; import mas.agents.messages.Message; import mas.agents.messages.MessageType; -import mas.blackbox.BlackBoxAgent; +//import mas.blackbox.BlackBoxAgent; // TODO: Auto-generated Javadoc /** diff --git a/AMOEBA3/src/mas/init/amoeba/DefaultAMOEBAFactory.java b/AMOEBA3/src/mas/init/amoeba/DefaultAMOEBAFactory.java index 8405cfbef50da9ac98ee92e584fcff3b039696b9..98b266646dda45ebe3b67089ded1da556cfcb5fb 100644 --- a/AMOEBA3/src/mas/init/amoeba/DefaultAMOEBAFactory.java +++ b/AMOEBA3/src/mas/init/amoeba/DefaultAMOEBAFactory.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import mas.blackbox.BlackBox; +//import mas.blackbox.BlackBox; import mas.init.Serialization; import mas.kernel.AMOEBA; import mas.kernel.Scheduler; diff --git a/AMOEBA3/src/mas/init/amoeba/SerializedAMOEBAFactory.java b/AMOEBA3/src/mas/init/amoeba/SerializedAMOEBAFactory.java index 2d79a43b38fcbe227fcdc6bba1af26b9e22e995d..391c58aa5df77ee52baaa685909f058d8e1c7d5b 100644 --- a/AMOEBA3/src/mas/init/amoeba/SerializedAMOEBAFactory.java +++ b/AMOEBA3/src/mas/init/amoeba/SerializedAMOEBAFactory.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.util.ArrayList; -import mas.blackbox.BlackBox; +//import mas.blackbox.BlackBox; import mas.kernel.AMOEBA; import mas.kernel.Scheduler; import mas.kernel.World; diff --git a/AMOEBA3/src/mas/init/amoeba/XMLFilesAMOEBAFactory.java b/AMOEBA3/src/mas/init/amoeba/XMLFilesAMOEBAFactory.java index ca41c86286c817040c8aba91a16feb7059f11035..1132e950b910b38bfc3e1d298dcb8f754ab2b629 100644 --- a/AMOEBA3/src/mas/init/amoeba/XMLFilesAMOEBAFactory.java +++ b/AMOEBA3/src/mas/init/amoeba/XMLFilesAMOEBAFactory.java @@ -2,7 +2,7 @@ package mas.init.amoeba; import java.io.File; -import mas.blackbox.BlackBox; +//import mas.blackbox.BlackBox; import mas.init.Initialization; import mas.kernel.AMOEBA; import mas.kernel.Scheduler; diff --git a/AMOEBA3/src/mas/kernel/AMOEBA.java b/AMOEBA3/src/mas/kernel/AMOEBA.java index fe8f17bbf08fb095ab15e5ebd13fe4ef4681d650..d17941b4d64217bcdcb544cf163e131ca2887ade 100644 --- a/AMOEBA3/src/mas/kernel/AMOEBA.java +++ b/AMOEBA3/src/mas/kernel/AMOEBA.java @@ -17,9 +17,9 @@ import mas.agents.percept.Percept; import mas.agents.context.Context; import mas.agents.localModel.TypeLocalModel; -import mas.blackbox.BlackBox; -import mas.blackbox.BlackBoxAgent; -import mas.blackbox.Output; +//import mas.blackbox.BlackBox; +//import mas.blackbox.BlackBoxAgent; +//import mas.blackbox.Output; import visualization.csv.CsvFileWriter; diff --git a/AMOEBA3/src/mas/kernel/Launcher.java b/AMOEBA3/src/mas/kernel/Launcher.java index bca5ad5d58af041b3b95c2419124bd747ddb604c..83ccb7937ce91887db6809816931b77dd37b4a3a 100644 --- a/AMOEBA3/src/mas/kernel/Launcher.java +++ b/AMOEBA3/src/mas/kernel/Launcher.java @@ -10,7 +10,7 @@ import javax.swing.UnsupportedLookAndFeelException; import visualization.view.JMainFrame; import visualization.view.system.MainPanel; import mas.agents.localModel.TypeLocalModel; -import mas.blackbox.BlackBox; +//import mas.blackbox.BlackBox; // TODO: Auto-generated Javadoc diff --git a/AMOEBA3/src/mas/kernel/Scheduler.java b/AMOEBA3/src/mas/kernel/Scheduler.java index 65fa9d20210990b6b6c5cd53dfc8f852d08c71c3..ec9dbabe4076b64b496f7166b3e6ff5222c69f9e 100644 --- a/AMOEBA3/src/mas/kernel/Scheduler.java +++ b/AMOEBA3/src/mas/kernel/Scheduler.java @@ -16,9 +16,9 @@ import mas.agents.Agent; import mas.agents.percept.Percept; import mas.agents.context.Context; import mas.agents.head.Head; -import mas.blackbox.BBFunction; -import mas.blackbox.Input; -import mas.blackbox.Output; +//import mas.blackbox.BBFunction; +//import mas.blackbox.Input; +//import mas.blackbox.Output; // TODO: Auto-generated Javadoc /** @@ -121,15 +121,15 @@ public class Scheduler implements Serializable{ else if (a instanceof Head) { heads.add(a); } - else if (a instanceof Input) { - inputs.add(a); - } - else if (a instanceof BBFunction) { - functions.add(a); - } - else if (a instanceof Output) { - outputs.add(a); - } +// else if (a instanceof Input) { +// inputs.add(a); +// } +// else if (a instanceof BBFunction) { +// functions.add(a); +// } +// else if (a instanceof Output) { +// outputs.add(a); +// } // System.out.println(a.getClass().toString()); } @@ -154,15 +154,15 @@ public class Scheduler implements Serializable{ else if (a instanceof Head) { heads.remove(a); } - else if (a instanceof Input) { - inputs.remove(a); - } - else if (a instanceof BBFunction) { - functions.remove(a); - } - else if (a instanceof Output) { - outputs.remove(a); - } +// else if (a instanceof Input) { +// inputs.remove(a); +// } +// else if (a instanceof BBFunction) { +// functions.remove(a); +// } +// else if (a instanceof Output) { +// outputs.remove(a); +// } // System.out.println(a.getClass().toString()); } diff --git a/AMOEBA3/src/mas/kernel/World.java b/AMOEBA3/src/mas/kernel/World.java index 1b9d560ff78a4e8fe89a6b6e54fa0d0978a4304f..0f77f4a3c351ebc8ae6c5f6626db8b1758e412ec 100644 --- a/AMOEBA3/src/mas/kernel/World.java +++ b/AMOEBA3/src/mas/kernel/World.java @@ -36,7 +36,7 @@ import mas.agents.localModel.LocalModelAverage; import mas.agents.localModel.LocalModelFirstExp; import mas.agents.localModel.LocalModelMillerRegression; import mas.agents.localModel.TypeLocalModel; -import mas.blackbox.BlackBox; +//import mas.blackbox.BlackBox; // TODO: Auto-generated Javadoc /**