Changeset 678 for DCWoRMS/trunk/src/schedframe/scheduling/policy/local

Timestamp:

11/30/12 10:23:41 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (2 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -349 +349 @@
                         ExecTask task = iter.next();
                         Executable exec = (Executable)task;
-                        exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * timeSpan/exec.getEstimatedDuration());
+                        //exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * timeSpan/exec.getEstimatedDuration());
+                        exec.setCompletionPercentage(exec.getCompletionPercentage() + (100 - exec.getCompletionPercentage())  * timeSpan/(exec.getEstimatedDuration() - new DateTime().getMillis()/1000 + exec.getExecStartTime() + timeSpan));
                         
                         UsedResourcesList usedResourcesList = exec.getUsedResources();
@@ -410 +411 @@
                                 continue;
                         }
-                        exec.setEstimatedDuration(time);
+                        //exec.setEstimatedDuration(time);
+                        exec.setEstimatedDuration(Long.valueOf(new DateTime().getMillis()/1000).intValue() - Double.valueOf(exec.getExecStartTime()).intValue() + time);
                         ExecTaskFilter filter = new ExecTaskFilter(exec.getUniqueId(), DCWormsTags.TASK_EXECUTION_FINISHED);
                         scheduler.sim_cancel(filter, null);