Changeset 1423 for DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling

Timestamp:

07/30/14 12:25:00 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java (modified) (8 diffs)

DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java

@@ -51 +51 @@
         
         protected int estimatedDuration;
-        protected String schedName;
+        protected String schedulerName;
 
         protected double submissionTime;
@@ -157 +157 @@
         }
         
-        public boolean isFinished()
-    {
+        public boolean isFinished(){
                 return task.isFinished();
     }
@@ -264 +263 @@
 
     public void setSchedulerName(int resourceId){
-        this.schedName = GridSim.getEntityName(resourceId);
+        this.schedulerName = GridSim.getEntityName(resourceId);
     }
     
     public void setSchedulerName(String resourceId){
-        this.schedName = resourceId;
+        this.schedulerName = resourceId;
     }
 
     public String getSchedulerName(){
-        return schedName;
+        return schedulerName;
     }
         
@@ -375 +374 @@
         
         private void preparePhases(String resourceType) {
-                LinkedList<ExecutionPhase> resourceConsumptionList = new LinkedList<ExecutionPhase>();
+                LinkedList<ExecutionPhase> execPhases = new LinkedList<ExecutionPhase>();
                 
                 long usefulWork = -1;
@@ -388 +387 @@
                                 e.printStackTrace();
                         }
-                        resourceConsumptionList.add(resConsumption);
+                        execPhases.add(resConsumption);
                 } else {
                         boolean found = false;
@@ -396 +395 @@
                                                 for(ResourceConsumptionType resConsumption: resConsumptioProfile.getResourceConsumption()){
                                                         ExecutionPhase resourceConsumption = new ExecutionPhase(resConsumption);
-                                                        resourceConsumptionList.add(resourceConsumption);
+                                                        execPhases.add(resourceConsumption);
                                                 }
                                                 for(StringParameterType prop: resConsumptioProfile.getProperties()){
@@ -412 +411 @@
                                 for(ResourceConsumptionType resConsumption: task.getDescription().getExecution().getResourceConsumptionProfile()[0].getResourceConsumption()){
                                         ExecutionPhase resourceConsumption = new ExecutionPhase(resConsumption);
-                                        resourceConsumptionList.add(resourceConsumption);
+                                        execPhases.add(resourceConsumption);
                                 }
                                 
@@ -425 +424 @@
                 
                 usefulWork = (usefulWork != -1) ? usefulWork : this.getLength();
-                this.execProfile = new ExecutionProfile(resourceConsumptionList);
+                this.execProfile = new ExecutionProfile(execPhases);
                 this.execProfile.setUsefulWork(usefulWork);