Changeset 1312 for DCWoRMS/branches/coolemall/src/test/thermal/recs/plugins/scheduling/RecsExclusivenessTempIncrOptSP.java

Timestamp:

03/21/14 15:43:32 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/test/thermal/recs/plugins/scheduling/RecsExclusivenessTempIncrOptSP.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/test/thermal/recs/plugins/scheduling/RecsExclusivenessTempIncrOptSP.java

@@ -178 +178 @@
                 private TaskInterface<?> task;
                 
-                double Q = ThermalConstants.Q;
-                double C = ThermalConstants.C;
-                double delta1 = ThermalConstants.delta1;
-                double delta2 = ThermalConstants.delta2;
-                double ro = ThermalConstants.ro;
-                
                 public TemperatureComparator(TaskInterface<?> task){
                         this.task = task;
@@ -192 +186 @@
                 double power1 = 0;
                 double power2 = 0;
-                double time1 = 0;
-                double time2 = 0;
                 try{
                         power1 = Math.abs(getMeasuredPower(createQuery(task, node1)) - node1.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
                         power2 = Math.abs(getMeasuredPower(createQuery(task, node2)) - node2.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
-                        time1 = getMeasuredTime(createQuery(task, node1));
-                        time2 = getMeasuredTime(createQuery(task, node2));
                 } catch (FileNotFoundException e) {
         
@@ -213 +203 @@
                 
                 double deltaOne = 1, deltaTwo = 1;
-                if (id1 >= 0 && id1 <= 8) // outlet
-                        deltaOne = delta2;
-                else if (id1 >= 9 && id1 <= 17) // inlet
-                        deltaOne = delta1;
-                if (id2 >= 0 && id2 <= 8) // outlet
-                        deltaTwo = delta2;
-                else if (id2 >= 9 && id2 <= 17) // inlet
-                        deltaTwo = delta1;
-                
-                double extraNode1Temp =  deltaOne * (power1/(Q * C * ro)) * time1;
-                double extraNode2Temp =  deltaTwo * (power2/(Q * C * ro)) * time2;
+                if (id1 >= 1 && id1 <= 9) // outlet
+                        deltaOne = ThermalConstants.delta2;
+                else if (id1 >= 10 && id1 <= 18) // inlet
+                        deltaOne = ThermalConstants.delta1;
+                if (id2 >= 1 && id2 <= 9) // outlet
+                        deltaTwo = ThermalConstants.delta2;
+                else if (id2 >= 10 && id2 <= 18) // inlet
+                        deltaTwo = ThermalConstants.delta1;
+                
+                double extraNode1Temp =  deltaOne * (power1/(ThermalConstants.Q * ThermalConstants.C * ThermalConstants.ro));
+                double extraNode2Temp =  deltaTwo * (power2/(ThermalConstants.Q * ThermalConstants.C * ThermalConstants.ro));
                 
                 if (extraNode1Temp > extraNode2Temp)