Changeset 711

Timestamp:

12/21/12 14:20:38 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/test/article/recs/plugins/scheduling

Files:

• RecsExclusivenessEnOptNodePowManSP.java (modified) (1 diff)
• RecsExclusivenessEnOptSP.java (modified) (1 diff)

DCWoRMS/trunk/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java

@@ -222 +222 @@
                 try {
                                 node1EU = getMeasuredTime(createQuery(task, node1)) * getMeasuredPower(createQuery(task, node1));
+                        } catch (FileNotFoundException e) {
+
+                        } catch (IOException e) {
+
+                        } catch (MissingResourceException e){
+                                
+                        }
+                try {
                                 node2EU = getMeasuredTime(createQuery(task, node2)) * getMeasuredPower(createQuery(task, node2));
                         } catch (FileNotFoundException e) {

DCWoRMS/trunk/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java

@@ -216 +216 @@
                 double node2EU = Double.MAX_VALUE;
                 try {
-                                node1EU = getMeasuredTime(createQuery(task, node1)) * (getMeasuredPower(createQuery(task, node1)) - node1.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
-                                //System.out.println(node1.getCategory() + ": " + node1EU + "; "+ getMeasuredTime(createQuery(task, node1)) +";" + node1.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON) + ":" + getMeasuredPower(createQuery(task, node1)));
-                                node2EU = getMeasuredTime(createQuery(task, node2)) * (getMeasuredPower(createQuery(task, node2)) - node2.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
-                                //System.out.println(node2.getCategory() + ": " + node2EU + "; "+ getMeasuredTime(createQuery(task, node2)) +";" + node2.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON) + ":" + getMeasuredPower(createQuery(task, node2)));
+                                node1EU = getMeasuredTime(createQuery(task, node1)) * Math.abs(getMeasuredPower(createQuery(task, node1)) - node1.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
+                                //System.out.println("1" + node1.getCategory() +"; " + getApplicationType(task) + ": " + node1EU + "; "+ getMeasuredTime(createQuery(task, node1)) +";" + node1.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON) + ":" + getMeasuredPower(createQuery(task, node1)));
+                } catch (FileNotFoundException e) {
+
+                        } catch (IOException e) {
+
+                        } catch (MissingResourceException e){
+                                
+                        } catch (NoSuchFieldException e) {
+
+                        }
+                        
+                try {
+                                node2EU = getMeasuredTime(createQuery(task, node2)) * Math.abs(getMeasuredPower(createQuery(task, node2)) - node2.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
+                                //System.out.println("2" + node2.getCategory() +"; " + getApplicationType(task) + ": " + node2EU + "; "+ getMeasuredTime(createQuery(task, node2)) +";" + node2.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON) + ":" + getMeasuredPower(createQuery(task, node2)));
                 } catch (FileNotFoundException e) {