From 754f6039663247773a3f2cf025fc8cc7dac2ce30 Mon Sep 17 00:00:00 2001
From: BrunoDatoMeneses <bruno.dato.meneses@gmail.com>
Date: Thu, 7 Jun 2018 18:16:10 +0200
Subject: [PATCH] ENH: remove blackbox from viewer
---
AMOEBA3/src/mas/agents/head/Head.java | 14 +++++++-------
AMOEBA3/src/mas/agents/percept/Percept.java | 16 ++++++++--------
.../view/system/MainTabbedPanel.java | 10 +++++-----
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/AMOEBA3/src/mas/agents/head/Head.java b/AMOEBA3/src/mas/agents/head/Head.java
index a2583bf5..5a5a50dc 100644
--- a/AMOEBA3/src/mas/agents/head/Head.java
+++ b/AMOEBA3/src/mas/agents/head/Head.java
@@ -25,7 +25,7 @@ public class Head extends AbstractHead {
private Context newContext;
private String functionSelected;
- private BlackBoxAgent oracle;
+ //private BlackBoxAgent oracle;
private ArrayList<Context> contexts = new ArrayList<Context>();
private ArrayList<Double> xLastCriticityValues = new ArrayList<Double>();
@@ -672,18 +672,18 @@ public class Head extends AbstractHead {
*
* @return the oracle
*/
- public BlackBoxAgent getOracle() {
- return oracle;
- }
+// public BlackBoxAgent getOracle() {
+// return oracle;
+// }
/**
* Sets the oracle.
*
* @param oracle the new oracle
*/
- public void setOracle(BlackBoxAgent oracle) {
- this.oracle = oracle;
- }
+// public void setOracle(BlackBoxAgent oracle) {
+// this.oracle = oracle;
+// }
/**
* Gets the oracle value.
diff --git a/AMOEBA3/src/mas/agents/percept/Percept.java b/AMOEBA3/src/mas/agents/percept/Percept.java
index bb280d98..d9c0ccfa 100644
--- a/AMOEBA3/src/mas/agents/percept/Percept.java
+++ b/AMOEBA3/src/mas/agents/percept/Percept.java
@@ -32,7 +32,7 @@ import mas.blackbox.BlackBoxAgent;
public class Percept extends SystemAgent implements Serializable {
- private BlackBoxAgent sensor;
+ //private BlackBoxAgent sensor;
protected ArrayList<Agent> targets = new ArrayList<Agent>();
protected ArrayList<Agent> activatedContext = new ArrayList<Agent>();
@@ -91,7 +91,7 @@ public class Percept extends SystemAgent implements Serializable {
this.oldValue = p.oldValue;
this.value = p.value;
- this.sensor = p.sensor;
+ //this.sensor = p.sensor;
this.targets = new ArrayList<Agent>();
for(Agent obj: p.targets) {
@@ -298,18 +298,18 @@ public class Percept extends SystemAgent implements Serializable {
*
* @return the sensor
*/
- public BlackBoxAgent getSensor() {
- return sensor;
- }
+// public BlackBoxAgent getSensor() {
+// return sensor;
+// }
/**
* Sets the sensor.
*
* @param sensor the new sensor
*/
- public void setSensor(BlackBoxAgent sensor) {
- this.sensor = sensor;
- }
+// public void setSensor(BlackBoxAgent sensor) {
+// this.sensor = sensor;
+// }
/* (non-Javadoc)
* @see agents.SystemAgent#getTargets()
diff --git a/AMOEBA3/src/visualization/view/system/MainTabbedPanel.java b/AMOEBA3/src/visualization/view/system/MainTabbedPanel.java
index b18c77bc..036b73a8 100644
--- a/AMOEBA3/src/visualization/view/system/MainTabbedPanel.java
+++ b/AMOEBA3/src/visualization/view/system/MainTabbedPanel.java
@@ -26,7 +26,7 @@ public class MainTabbedPanel extends JTabbedPane{
private World world;
/** The black box panel. */
- private BlackBoxPanel blackBoxPanel;
+ //private BlackBoxPanel blackBoxPanel;
/** The system panel. */
private SystemPanel systemPanel;
@@ -72,7 +72,7 @@ public class MainTabbedPanel extends JTabbedPane{
- blackBoxPanel = new BlackBoxPanel(world);
+ //blackBoxPanel = new BlackBoxPanel(world);
//systemPanel = new SystemPanel(world);
panelChart = new PanelChart(world);
//panelTwoDim = new GrapheTwoDimPanel(world);
@@ -82,7 +82,7 @@ public class MainTabbedPanel extends JTabbedPane{
world.getScheduler().addScheduledItem(panelChart);
- this.addTab("BlackBox", new JScrollPane(blackBoxPanel,JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS));
+ //this.addTab("BlackBox", new JScrollPane(blackBoxPanel,JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS));
//this.addTab("System", systemPanel);
this.addTab("Charts", new JScrollPane(panelChart,JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS));
this.addTab("2-Dimensions", new JScrollPane(panelTwoDimStandard,JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS));
@@ -98,7 +98,7 @@ public class MainTabbedPanel extends JTabbedPane{
* Update.
*/
public void update() {
- blackBoxPanel.update();
+ //blackBoxPanel.update();
// systemPanel.update();
// panelTwoDim.update();
panelTwoDimStandard.update();
@@ -111,7 +111,7 @@ public class MainTabbedPanel extends JTabbedPane{
* @param blackBox the new black box
*/
public void setBlackBox(BlackBox blackBox) {
- blackBoxPanel.setBlackBox(blackBox);
+ //blackBoxPanel.setBlackBox(blackBox);
}
/**
--
GitLab