changed statistics names and moved NR_HOLONS to the Holons group, fixes #74 (prior: fixes #42)

src/ui/view/StatisticPanel.java

@@ -23,33 +23,33 @@ public class StatisticPanel extends JSplitPane implements GraphListener {
     public static final String HOLON = "Holons";
 
     // Property Strings
-    public static final String TOT_PROD_HOLON = "total Holon Production";
-    public static final String TOT_CONS_HOLON = "total Holon Consumption";
-    public static final String SUPPLIED_OBJ = "Percentage of supplied Objects";
-    public static final String NOT_SUPPLIED_OBJ = "Percentage of not supplied Objects";
-    public static final String PART_SUPPLIED_OBJ = "Percentage of partially supplied Objects";
-    public static final String NR_SUBNETS = "Nr. of Subnets";
-    public static final String NR_CLOSED_SWITCHES = "Nr. of closed Switches";
-    public static final String AVG_OBJ_IN_HOLONS = "Average amount of Objects in Holons";
-    public static final String AVG_ELEM_IN_HOLONS = "Average amount of Elements in Holons";
-    public static final String AVG_PRODS_IN_HOLONS = "Average amount of Producers in Holons";
-    public static final String AVG_CONS_ENERGY_IN_HOLONS = "Average consumed Energy";
-    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";
-    public static final String NR_ACTIVE_ELEMENTS = "active Elements";
+    public static final String TOT_PROD_HOLON = "total production";
+    public static final String TOT_CONS_HOLON = "total consumption";
+    public static final String SUPPLIED_OBJ = "supplied objects' percentage";
+    public static final String NOT_SUPPLIED_OBJ = "not supplied objects' percentage";
+    public static final String PART_SUPPLIED_OBJ = "partially supplied objects' percentage";
+    public static final String NR_HOLONS = "nr. of Holons";
+    public static final String NR_CLOSED_SWITCHES = "nr. of closed switches";
+    public static final String AVG_OBJ_IN_HOLONS = "average amount of objects";
+    public static final String AVG_ELEM_IN_HOLONS = "average amount of elements";
+    public static final String AVG_PRODS_IN_HOLONS = "average amount of producers";
+    public static final String AVG_CONS_ENERGY_IN_HOLONS = "average consumed energy";
+    public static final String AVG_WASTED_ENERGY_HOLONS = "average wasted energy";
+    public static final String NR_BROKEN_EDGES = "nr. of broken eedges";
+    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";
+    public static final String NR_ACTIVE_ELEMENTS = "active elements";
 
     public static final String SW_ACTIVE = "active";
 
-    public static final String TOT_PROD_GRID = "total Grid Production";
-    public static final String TOT_CONS_GRID = "total Grid Consumption";
+    public static final String TOT_PROD_GRID = "total Grid production";
+    public static final String TOT_CONS_GRID = "total Grid consumption";
     private DefaultTreeModel treeModel;
     private DefaultMutableTreeNode objectsNode;
     private DefaultMutableTreeNode mainGrid;
@@ -99,7 +99,7 @@ public class StatisticPanel extends JSplitPane implements GraphListener {
         holonHashtable.put(SUPPLIED_OBJ, new PropertyDataSet("", defaultGraphColor));
         holonHashtable.put(NOT_SUPPLIED_OBJ, new PropertyDataSet("", defaultGraphColor));
         holonHashtable.put(PART_SUPPLIED_OBJ, new PropertyDataSet("", defaultGraphColor));
-        holonHashtable.put(NR_SUBNETS, new PropertyDataSet("", defaultGraphColor));
+        holonHashtable.put(NR_HOLONS, new PropertyDataSet("", defaultGraphColor));
         holonHashtable.put(NR_CLOSED_SWITCHES, new PropertyDataSet("", defaultGraphColor));
         holonHashtable.put(AVG_OBJ_IN_HOLONS, new PropertyDataSet("", defaultGraphColor));
         holonHashtable.put(AVG_ELEM_IN_HOLONS, new PropertyDataSet("", defaultGraphColor));
@@ -127,7 +127,7 @@ public class StatisticPanel extends JSplitPane implements GraphListener {
         propValTable.put(PART_SUPPLIED_OBJ, TrackedDataSet.PERCENT_PARTIAL_SUPPLIED);
         propValTable.put(TOT_PROD_GRID, TrackedDataSet.GROUP_PRODUCTION);
         propValTable.put(TOT_CONS_GRID, TrackedDataSet.GROUP_CONSUMPTION);
-        propValTable.put(NR_SUBNETS, TrackedDataSet.AMOUNT_HOLONS);
+        propValTable.put(NR_HOLONS, TrackedDataSet.AMOUNT_HOLONS);
         propValTable.put(NR_CLOSED_SWITCHES, TrackedDataSet.AMOUNT_CLOSED_SWITCHES);
         propValTable.put(AVG_OBJ_IN_HOLONS, TrackedDataSet.AVG_AMOUNT_OBJECTS_IN_HOLONS);
         propValTable.put(AVG_ELEM_IN_HOLONS, TrackedDataSet.AVG_AMOUNT_ELEMENTS_IN_HOLONS);
@@ -174,12 +174,12 @@ public class StatisticPanel extends JSplitPane implements GraphListener {
         mainGrid.add(new DefaultMutableTreeNode(SUPPLIED_OBJ));
         mainGrid.add(new DefaultMutableTreeNode(NOT_SUPPLIED_OBJ));
         mainGrid.add(new DefaultMutableTreeNode(PART_SUPPLIED_OBJ));
-        mainGrid.add(new DefaultMutableTreeNode(NR_SUBNETS));
         mainGrid.add(new DefaultMutableTreeNode(PROD_CONS_RATIO));
         mainGrid.add(new DefaultMutableTreeNode(NR_BROKEN_EDGES));
         mainGrid.add(new DefaultMutableTreeNode(NR_CLOSED_SWITCHES));
 
         holonNode = new DefaultMutableTreeNode(HOLON);
+        holonNode.add(new DefaultMutableTreeNode(NR_HOLONS));
         holonNode.add(new DefaultMutableTreeNode(AVG_OBJ_IN_HOLONS));
         holonNode.add(new DefaultMutableTreeNode(AVG_ELEM_IN_HOLONS));
         holonNode.add(new DefaultMutableTreeNode(AVG_WASTED_ENERGY_HOLONS));