Changeset 734 for DCWoRMS/trunk/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java

Timestamp:

01/02/13 08:12:13 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java (modified) (4 diffs)

DCWoRMS/trunk/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java

@@ -10 +10 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
+import schedframe.resources.computing.ComputingNode;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -42 +43 @@
                 try {
                         execTime = TIME_FACTOR * (1 - completionPercentage/100) * getMeasuredTime(query);
+                        //System.out.println(task.getJobId()+": "+ execTime + "; "+ completionPercentage);
                         if (Double.compare(execTime, 0.001) < 0) {
                                 execTime = 0.001;
                         }
                         execTime = Math.round(execTime);
+                        //System.out.println(task.getJobId()+": "+ execTime);
                 } catch (FileNotFoundException e) {
                         execTime = defaultEstimation(task, peUnit, completionPercentage);
@@ -71 +74 @@
                 
                 ProcessingElements pe = (ProcessingElements) peUnit;
+                if(pe.get(0) instanceof ComputingNode)
+                        return ((ComputingNode)pe.get(0)).getCategory();
                 Core core = (Core)pe.get(0);
                 return core.getParent().getParent().getCategory();
@@ -77 +82 @@
         private int getFrequency(PEUnit peUnit){
                 ProcessingElements pe = (ProcessingElements) peUnit;
+                if(pe.get(0) instanceof ComputingNode)
+                        return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
                 Core core = (Core)pe.get(0);
                 Processor proc = (Processor) core.getParent();