Changeset 512 for DCWoRMS/trunk/src/simulator/reader

Timestamp:

10/12/12 13:04:31 (13 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/simulator/reader/ResourceReader.java (modified) (5 diffs)

DCWoRMS/trunk/src/simulator/reader/ResourceReader.java

@@ -9 +9 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Deque;
 import java.util.HashMap;
@@ -27 +29 @@
 import schedframe.ResourceController;
 import schedframe.exceptions.ResourceException;
+import schedframe.resources.Resource;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
@@ -51 +54 @@
 
         protected ResourceCalendar resourceCalendar;
-        protected Deque<Initializable> toInit = new ArrayDeque<Initializable>();
+        protected List<Initializable> toInit = new ArrayList<Initializable>();
         
         private ExecutionTimeEstimationPlugin execTimeEstimationPlugin;
@@ -85 +88 @@
 
                 ResourceController rc = new ResourceController(mainScheduler, computingResources);
+                Collections.sort(toInit, new ResourceTypeComparator(new ArrayList<String>(compResLayers)));
                 rc.setInitList(toInit);
                 rc.setCompResLayers(compResLayers);
@@ -430 +434 @@
         }
         
+        class ResourceTypeComparator implements Comparator<Initializable>{
+                
+                List<String> order;
+                ResourceTypeComparator(List<String> order) {
+                        this.order = order;
+                }
+                public int compare(Initializable init1, Initializable init2) {
+                        String type1 = ((Resource)init1).getType().getName();
+                        String type2 = ((Resource)init2).getType().getName();
+                        if(order.indexOf(type1) > order.indexOf(type2))
+                                return -1;
+                        else if (order.indexOf(type1) < order.indexOf(type2))
+                                return 1;
+                        else return 0;
+                        
+                }
+        }
+        
 }