21WFtusmIesUcgQ8erTzT9 changeset

Changeset656232633437 (b)
ParentNone (a)
ab
0+public Simulation getSimulation() throws ClassNotFoundException {
0+
0+        ArrayList<Operation> listOp2 = new ArrayList<Operation>();
0+        operationsPrioriteToDoListModel = dyndefn.getOperationList();
0+
0+        for (int i = 0; i < operationsPrioriteToDoListModel.size(); i++) {
0+            listOp2.add((AbstractOperation) operationsPrioriteToDoListModel.get(i));
0+            if (operationsPrioriteToDoListModel.get(i) instanceof OperationSuccession) {
0+                listOp2.add((OperationSuccession) operationsPrioriteToDoListModel.get(i));
0+            }
0+        }
0+        int duration = simDef.getDuration();
0+        int visu = simDef.getFrequenceVisu();
0+        Simulation c2 = new Simulation(listOp2, duration, visu, simDef.getMatrixWidth(), simDef.getMatrixHeight());
0+           if(simDef.getCalcul() != null){
0+                   c2.NUM--;
0+           }
0+           if(landscapeDefinition != null)
0+           c2.setMerges(landscapeDefinition.getMerges());
0+        return c2;
0+    }
0+
0+    public int getReturnStatus() {
0+        return returnStatus;
0+    }
0+
0+    public int getMatrixHeight() {
0+        return matrixHeight;
0+    }
0+
0+    public int getMatrixWidth() {
0+        return matrixWidth;
0+    }
0+
0+    public String getTimer() {
0+        return strTimer;
0+    }
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
--- Revision None
+++ Revision 656232633437
@@ -0,0 +1,37 @@
+public Simulation getSimulation() throws ClassNotFoundException {
+
+        ArrayList<Operation> listOp2 = new ArrayList<Operation>();
+        operationsPrioriteToDoListModel = dyndefn.getOperationList();
+
+        for (int i = 0; i < operationsPrioriteToDoListModel.size(); i++) {
+            listOp2.add((AbstractOperation) operationsPrioriteToDoListModel.get(i));
+            if (operationsPrioriteToDoListModel.get(i) instanceof OperationSuccession) {
+                listOp2.add((OperationSuccession) operationsPrioriteToDoListModel.get(i));
+            }
+        }
+        int duration = simDef.getDuration();
+        int visu = simDef.getFrequenceVisu();
+        Simulation c2 = new Simulation(listOp2, duration, visu, simDef.getMatrixWidth(), simDef.getMatrixHeight());
+	   if(simDef.getCalcul() != null){
+		   c2.NUM--;
+	   }
+	   if(landscapeDefinition != null)
+	   c2.setMerges(landscapeDefinition.getMerges());
+        return c2;
+    }
+
+    public int getReturnStatus() {
+        return returnStatus;
+    }
+
+    public int getMatrixHeight() {
+        return matrixHeight;
+    }
+
+    public int getMatrixWidth() {
+        return matrixWidth;
+    }
+
+    public String getTimer() {
+        return strTimer;
+    }