new Properties added to statistics

src/ui/view/StatPanel2.java

@@ -61,6 +61,10 @@ public class StatPanel2 extends JSplitPane implements GraphListener {
 	public static final String AVG_WASTED_ENERGY_HOLONS = "Average wasted Energy";
 	public static final String NR_BROKEN_EDGES = "Amount of broken Edges";
 	public static final String PROD_CONS_RATIO = "Producer/Consumer Ratio";
+	public static final String AVG_CLOSED_SW_HOLON = "Average of closed Switches per Holon";
+	public static final String AVG_ACTIVE_ELEMENTS_HOLON = "Average of active Elements per Holon";
+	public static final String AVG_INACTIVE_ELEMENTS_HOLON = "Average of inactive Elements per Holon";
+	public static final String AVG_PRODUCTION_HOLON = "Average Production per Holon";
 	
 	public static final String TOT_PROD_OBJ = "total Production";
 	public static final String TOT_CONS_OBJ = "total Consumption";
@@ -127,6 +131,11 @@ public class StatPanel2 extends JSplitPane implements GraphListener {
 		holonHashtable.put(AVG_WASTED_ENERGY_HOLONS, new PropertyDataSet());
 		holonHashtable.put(NR_BROKEN_EDGES, new PropertyDataSet());
 		holonHashtable.put(PROD_CONS_RATIO, new PropertyDataSet());
+		holonHashtable.put(AVG_CLOSED_SW_HOLON, new PropertyDataSet());
+		holonHashtable.put(AVG_ACTIVE_ELEMENTS_HOLON, new PropertyDataSet());
+		holonHashtable.put(AVG_INACTIVE_ELEMENTS_HOLON, new PropertyDataSet());
+		holonHashtable.put(AVG_PRODUCTION_HOLON, new PropertyDataSet());
+
 		
 		//propValTable associates the Strings to the numbers
 		propValTable = new Hashtable<String, Integer>();
@@ -150,6 +159,15 @@ public class StatPanel2 extends JSplitPane implements GraphListener {
 		propValTable.put(AVG_WASTED_ENERGY_HOLONS, TrackedDataSet.AVG_WASTED_ENERGY_IN_HOLONS);
 		propValTable.put(NR_BROKEN_EDGES, TrackedDataSet.AMOUNT_BROKEN_EDGES);
 		propValTable.put(PROD_CONS_RATIO, TrackedDataSet.RATIO_PRODUCERS_CONSUMERS);
+		propValTable.put(AVG_CLOSED_SW_HOLON, TrackedDataSet.AVG_AMOUNT_CLOSED_SWITCHES_IN_HOLONS);
+		propValTable.put(AVG_ACTIVE_ELEMENTS_HOLON, TrackedDataSet.AVG_AMOUNT_ACTIVE_ELEMENTS_IN_HOLONS);
+		propValTable.put(AVG_INACTIVE_ELEMENTS_HOLON, TrackedDataSet.AVG_AMOUNT_INACTIVE_ELEMENTS_IN_HOLONS);
+		propValTable.put(AVG_PRODUCTION_HOLON, TrackedDataSet.AVG_PRODUCED_ENERGY_IN_HOLONS);
+
+
+		
+
+
 
 		JScrollPane graphScrollPane = new JScrollPane();
 		graphScrollPane.setBorder(null);
@@ -193,6 +211,14 @@ public class StatPanel2 extends JSplitPane implements GraphListener {
 		holonNode.add(new DefaultMutableTreeNode(AVG_WASTED_ENERGY_HOLONS));
 		holonNode.add(new DefaultMutableTreeNode(AVG_CONS_ENERGY_IN_HOLONS));
 		holonNode.add(new DefaultMutableTreeNode(AVG_PRODS_IN_HOLONS));
+		holonNode.add(new DefaultMutableTreeNode(AVG_CLOSED_SW_HOLON));
+		holonNode.add(new DefaultMutableTreeNode(AVG_ACTIVE_ELEMENTS_HOLON));
+		holonNode.add(new DefaultMutableTreeNode(AVG_INACTIVE_ELEMENTS_HOLON));
+		holonNode.add(new DefaultMutableTreeNode(AVG_PRODUCTION_HOLON));
+
+
+
+
 
 		objectsNode = new DefaultMutableTreeNode("Objects");
 		objectsNode.add(new DefaultMutableTreeNode("empty"));