Changeset 1362 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks

Timestamp:

06/03/14 15:12:11 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks

Files:

• Task.java (modified) (2 diffs)
• phases/ExecutionProfile.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ResourceConsumptionProfile.java) (3 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/Task.java

@@ -1 +1 @@
 package schedframe.scheduling.tasks;
+
+import gridsim.dcworms.DCWormsTags;
 
 import java.io.StringReader;
@@ -439 +441 @@
         public boolean isFinished(){
                 if(processes == null)
-                        return (status > 3 && status <= 6);
+                        return (status >= DCWormsTags.SUCCESS && status <= DCWormsTags.FAILED);
                 
                 for(int i = 0; i < processes.size(); i++){

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ExecutionProfile.java

@@ -3 +3 @@
 import java.util.LinkedList;
 
-public class ResourceConsumptionProfile {
+public class ExecutionProfile {
         
         protected LinkedList<ResourceConsumption> resourceConsumptionList;
         protected long usefulWork;
         private int currentPhase;
-        
-        public ResourceConsumptionProfile() {
-                this.resourceConsumptionList = new LinkedList<ResourceConsumption>();
-                this.currentPhase = -1;
-        }
-        
-        public ResourceConsumptionProfile(LinkedList<ResourceConsumption> resourceConsumptionList) {
+
+        public ExecutionProfile(LinkedList<ResourceConsumption> resourceConsumptionList) {
                 this.resourceConsumptionList = resourceConsumptionList;
-                this.currentPhase = -1;
+                this.currentPhase = 0;
         }
         
@@ -24 +19 @@
         
         public ResourceConsumption getCurrentResourceConsumption(){
-                if(currentPhase < resourceConsumptionList.size())
-                        return resourceConsumptionList.get(currentPhase);
-                else 
-                        return null;
+                return resourceConsumptionList.get(currentPhase);
         }
 
@@ -45 +37 @@
                 this.usefulWork = usefulWork;
         }
+        
+        public boolean isLast(){
+                if(currentPhase == resourceConsumptionList.size() - 1){
+                        return true;
+                }
+                return false;
+        }
 }