Changeset 896 for DCWoRMS/branches/coolemall/src/test/PhaseTimeEstimationPlugin.java

Timestamp:

03/04/13 08:25:34 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/test/PhaseTimeEstimationPlugin.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/test/PhaseTimeEstimationPlugin.java

@@ -8 +8 @@
 import schedframe.resources.units.ResourceUnitName;
 import schedframe.resources.units.StandardResourceUnitName;
+import schedframe.scheduling.tasks.phases.ResourceConsumption;
 import dcworms.schedframe.scheduling.ExecTask;
 import dcworms.schedframe.scheduling.Executable;
@@ -27 +28 @@
                         double completionPercentage) {
 
-                
                 Executable exec = (Executable) task;
-        //      System.out.println(exec.getJobId() +":"+ exec.getApplicationName());
+                // System.out.println(exec.getJobId() +":"+ exec.getApplicationName());
                 // collect all information necessary to do the calculation
                 PEUnit peUnit = (PEUnit) allocatedResources.get(StandardResourceUnitName.PE);
@@ -40 +40 @@
 
                 // estimate remainingTaskLength
-                double remainingLength =  task.getLength() * (1 - completionPercentage/100);
-                
+                ResourceConsumption resConsumption = exec.getResourceConsumptionProfile().getCurrentResourceConsumption();
+
                 // do the calculation
-                double execTime = (remainingLength / (cnt * speed));
+                double execTime = (1 - completionPercentage/100) * resConsumption.getDuration();
 
                 // if the result is very close to 0, but less then one millisecond then round this result to 0.001