Prechádzať zdrojové kódy

Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

dominik.rieder 7 rokov pred
rodič
commit
f4856be8f5
1 zmenil súbory, kde vykonal 8 pridanie a 9 odobranie
  1. 8 9
      src/classes/TrackedDataSet.java

+ 8 - 9
src/classes/TrackedDataSet.java

@@ -17,15 +17,14 @@ public class TrackedDataSet {
 	public static final int GROUP_PRODUCTION = 9;
 	public static final int GROUP_CONSUMPTION = 10;
 	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 AVG_RATIO_PRODUCERS_CONSUMERS_IN_HOLONS = 21;
+	public static final int AMOUNT_CLOSED_SWITCHES = 12;
+	public static final int AVG_AMOUNT_OBJECTS_IN_HOLONS = 13;
+	public static final int AVG_AMOUNT_ELEMENTS_IN_HOLONS = 14;
+	public static final int AVG_AMOUNT_PRODUCERS_IN_HOLONS = 15;
+	public static final int AVG_CONSUMED_ENERGY_IN_HOLONS = 16;
+	public static final int AVG_WASTED_ENERGY_IN_HOLONS = 17;
+	public static final int AMOUNT_BROKEN_EDGES = 18;
+	public static final int RATIO_PRODUCERS_CONSUMERS = 19;
 	
 	//Variables of the Data Set
 	private AbstractCpsObject cps;