New Properties

src/classes/TrackedDataSet.java

@@ -16,7 +16,16 @@ public class TrackedDataSet {
 	public static final int PERCENT_PARTIAL_SUPPLIED = 8;
 	public static final int GROUP_PRODUCTION = 9;
 	public static final int GROUP_CONSUMPTION = 10;
-	public static final int AMOUNT_SUBNETS = 11;
+	public static final int AMOUNT_HOLONS = 11;
+	public static final int AVG_AMOUNT_CLOSED_SWITCHES_IN_HOLONS = 12;
+	public static final int AVG_AMOUNT_OPEN_SWITCHES_IN_HOLONS = 13;
+	public static final int AVG_AMOUNT_OBJECTS_IN_HOLONS = 14;
+	public static final int AVG_AMOUNT_ELEMENTS_IN_HOLONS = 15;
+	public static final int AVG_AMOUNT_PRODUCERS_IN_HOLONS = 16;
+	public static final int CONSUMED_ENERGY_IN_HOLONS = 17;
+	public static final int WASTED_ENERGY_IN_HOLONS = 18;
+	public static final int AVG_AMOUNT_BROKEN_EDGES_IN_HOLONS = 19;
+	public static final int RATIO_PRODUCERS_CONSUMERS = 21;
 	
 	//Variables of the Data Set
 	private AbstractCpsObject cps;

src/ui/view/StatisticGraph.java

@@ -109,7 +109,7 @@ public class StatisticGraph extends JPanel {
 				case TrackedDataSet.ACTIVATED_ELEMENTS:
 				case TrackedDataSet.TOTAL_PRODUCTION:
 				case TrackedDataSet.TOTAL_CONSUMPTION:
-				case TrackedDataSet.AMOUNT_SUBNETS:
+				case TrackedDataSet.AMOUNT_HOLONS:
 				case TrackedDataSet.GROUP_CONSUMPTION:
 				case TrackedDataSet.GROUP_PRODUCTION:
 					createPathFloats(set);
@@ -229,7 +229,7 @@ public class StatisticGraph extends JPanel {
 				val = getMaxTotalConsumption(((CpsUpperNode) set.getCpsObject()).getNodes());
 				val *= -1;
 				break;
-			case TrackedDataSet.AMOUNT_SUBNETS:
+			case TrackedDataSet.AMOUNT_HOLONS:
 				val = controller.getSimManager().getSubNets().size();
 				for (int i = 0; i < model.getCurIteration(); i++) {
 					if (val < set.getValues()[i]) {
@@ -323,7 +323,7 @@ public class StatisticGraph extends JPanel {
 				set.setValAt(-getTotalConsumptionAt(((CpsUpperNode) set.getCpsObject()).getNodes(), model.getCurIteration()),
 						model.getCurIteration());
 				break;
-			case TrackedDataSet.AMOUNT_SUBNETS:
+			case TrackedDataSet.AMOUNT_HOLONS:
 				set.setValAt(controller.getSimManager().getSubNets().size(), model.getCurIteration());
 				break;
 			default:

src/ui/view/StatisticGraphPanel.java

@@ -187,7 +187,7 @@ public class StatisticGraphPanel extends JPanel {
 		case TrackedDataSet.PERCENT_PARTIAL_SUPPLIED:
 			property = "Percentage of partial supplied";
 			break;
-		case TrackedDataSet.AMOUNT_SUBNETS:
+		case TrackedDataSet.AMOUNT_HOLONS:
 			property = "Amount of Subnets";
 			break;
 		default:

src/ui/view/splitPane.java

@@ -129,7 +129,7 @@ public class splitPane 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_SUBNETS);
+		propValTable.put(NR_SUBNETS, TrackedDataSet.AMOUNT_HOLONS);
 
 		JScrollPane dataPane = new JScrollPane();
 		setLeftComponent(dataPane);