Skip to content
Snippets Groups Projects
Commit 754f6039 authored by BrunoDatoMeneses's avatar BrunoDatoMeneses
Browse files

ENH: remove blackbox from viewer

parent 43f6c5ac
Branches
No related tags found
1 merge request!1Merge Master
...@@ -25,7 +25,7 @@ public class Head extends AbstractHead { ...@@ -25,7 +25,7 @@ public class Head extends AbstractHead {
private Context newContext; private Context newContext;
private String functionSelected; private String functionSelected;
private BlackBoxAgent oracle; //private BlackBoxAgent oracle;
private ArrayList<Context> contexts = new ArrayList<Context>(); private ArrayList<Context> contexts = new ArrayList<Context>();
private ArrayList<Double> xLastCriticityValues = new ArrayList<Double>(); private ArrayList<Double> xLastCriticityValues = new ArrayList<Double>();
...@@ -672,18 +672,18 @@ public class Head extends AbstractHead { ...@@ -672,18 +672,18 @@ public class Head extends AbstractHead {
* *
* @return the oracle * @return the oracle
*/ */
public BlackBoxAgent getOracle() { // public BlackBoxAgent getOracle() {
return oracle; // return oracle;
} // }
/** /**
* Sets the oracle. * Sets the oracle.
* *
* @param oracle the new oracle * @param oracle the new oracle
*/ */
public void setOracle(BlackBoxAgent oracle) { // public void setOracle(BlackBoxAgent oracle) {
this.oracle = oracle; // this.oracle = oracle;
} // }
/** /**
* Gets the oracle value. * Gets the oracle value.
......
...@@ -32,7 +32,7 @@ import mas.blackbox.BlackBoxAgent; ...@@ -32,7 +32,7 @@ import mas.blackbox.BlackBoxAgent;
public class Percept extends SystemAgent implements Serializable { public class Percept extends SystemAgent implements Serializable {
private BlackBoxAgent sensor; //private BlackBoxAgent sensor;
protected ArrayList<Agent> targets = new ArrayList<Agent>(); protected ArrayList<Agent> targets = new ArrayList<Agent>();
protected ArrayList<Agent> activatedContext = new ArrayList<Agent>(); protected ArrayList<Agent> activatedContext = new ArrayList<Agent>();
...@@ -91,7 +91,7 @@ public class Percept extends SystemAgent implements Serializable { ...@@ -91,7 +91,7 @@ public class Percept extends SystemAgent implements Serializable {
this.oldValue = p.oldValue; this.oldValue = p.oldValue;
this.value = p.value; this.value = p.value;
this.sensor = p.sensor; //this.sensor = p.sensor;
this.targets = new ArrayList<Agent>(); this.targets = new ArrayList<Agent>();
for(Agent obj: p.targets) { for(Agent obj: p.targets) {
...@@ -298,18 +298,18 @@ public class Percept extends SystemAgent implements Serializable { ...@@ -298,18 +298,18 @@ public class Percept extends SystemAgent implements Serializable {
* *
* @return the sensor * @return the sensor
*/ */
public BlackBoxAgent getSensor() { // public BlackBoxAgent getSensor() {
return sensor; // return sensor;
} // }
/** /**
* Sets the sensor. * Sets the sensor.
* *
* @param sensor the new sensor * @param sensor the new sensor
*/ */
public void setSensor(BlackBoxAgent sensor) { // public void setSensor(BlackBoxAgent sensor) {
this.sensor = sensor; // this.sensor = sensor;
} // }
/* (non-Javadoc) /* (non-Javadoc)
* @see agents.SystemAgent#getTargets() * @see agents.SystemAgent#getTargets()
......
...@@ -26,7 +26,7 @@ public class MainTabbedPanel extends JTabbedPane{ ...@@ -26,7 +26,7 @@ public class MainTabbedPanel extends JTabbedPane{
private World world; private World world;
/** The black box panel. */ /** The black box panel. */
private BlackBoxPanel blackBoxPanel; //private BlackBoxPanel blackBoxPanel;
/** The system panel. */ /** The system panel. */
private SystemPanel systemPanel; private SystemPanel systemPanel;
...@@ -72,7 +72,7 @@ public class MainTabbedPanel extends JTabbedPane{ ...@@ -72,7 +72,7 @@ public class MainTabbedPanel extends JTabbedPane{
blackBoxPanel = new BlackBoxPanel(world); //blackBoxPanel = new BlackBoxPanel(world);
//systemPanel = new SystemPanel(world); //systemPanel = new SystemPanel(world);
panelChart = new PanelChart(world); panelChart = new PanelChart(world);
//panelTwoDim = new GrapheTwoDimPanel(world); //panelTwoDim = new GrapheTwoDimPanel(world);
...@@ -82,7 +82,7 @@ public class MainTabbedPanel extends JTabbedPane{ ...@@ -82,7 +82,7 @@ public class MainTabbedPanel extends JTabbedPane{
world.getScheduler().addScheduledItem(panelChart); 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("System", systemPanel);
this.addTab("Charts", new JScrollPane(panelChart,JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS)); 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)); this.addTab("2-Dimensions", new JScrollPane(panelTwoDimStandard,JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS));
...@@ -98,7 +98,7 @@ public class MainTabbedPanel extends JTabbedPane{ ...@@ -98,7 +98,7 @@ public class MainTabbedPanel extends JTabbedPane{
* Update. * Update.
*/ */
public void update() { public void update() {
blackBoxPanel.update(); //blackBoxPanel.update();
// systemPanel.update(); // systemPanel.update();
// panelTwoDim.update(); // panelTwoDim.update();
panelTwoDimStandard.update(); panelTwoDimStandard.update();
...@@ -111,7 +111,7 @@ public class MainTabbedPanel extends JTabbedPane{ ...@@ -111,7 +111,7 @@ public class MainTabbedPanel extends JTabbedPane{
* @param blackBox the new black box * @param blackBox the new black box
*/ */
public void setBlackBox(BlackBox blackBox) { public void setBlackBox(BlackBox blackBox) {
blackBoxPanel.setBlackBox(blackBox); //blackBoxPanel.setBlackBox(blackBox);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment