Changeset 250 for xssim/branches/tpiontek/src/example/energy

Timestamp:

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

Author:

piontek

Message:

 

Location:

xssim/branches/tpiontek/src/example/energy

Files:

• CPUEnergyEstimationPlugin.java (modified) (1 diff)
• ComputingNodeEnergyEstimationPlugin.java (modified) (3 diffs)

xssim/branches/tpiontek/src/example/energy/CPUEnergyEstimationPlugin.java

@@ -32 +32 @@
                         switch( type % 4)
                         {
-                                default: factor = 1.3; 
+                                case 0: factor = 1.1; break;
+                                case 1: factor = 1.2; break;
+                                case 2: factor = 1.3; break;
+                                case 3: factor = 1.4; break;
                         }
                         

xssim/branches/tpiontek/src/example/energy/ComputingNodeEnergyEstimationPlugin.java

@@ -3 +3 @@
 import java.util.Properties;
 
+import schedframe.resources.PowerState;
 import test.rewolucja.energy.EnergyEvent;
 import test.rewolucja.resources.physical.base.ComputingResource;
@@ -17 +18 @@
                 ComputingNode node = (ComputingNode) resource;
                 
-                if( node.getCategory().getName().equals("A"))
-                        power = 240;
-                else if( node.getCategory().getName().equals("B"))
-                        power = 95;
-                else
-                {
-                        System.err.println("Unknown Model: "  +node.getCategory().getName());
-                        System.exit(1);
-                }       
-                
-                
+                        
+                power += node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
                 
                 for(Processor cpu: node.getProcessors()){
@@ -36 +28 @@
                         //}
                 }
-                //power += node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
+
                 return power;
         }