Changeset 1396 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power

Timestamp:

06/26/14 14:18:01 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power

Files:

• CustomPowerStateName.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/UserPowerStateName.java) (1 diff)
• PowerStateName.java (modified) (1 diff)
• PowerStateNameFactory.java (modified) (1 diff)
• StandardPowerStateName.java (modified) (1 diff)
• plugin/EnergyEstimationPlugin.java (modified) (1 diff)
• ui/ComputingResourcePowerInterface.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/CustomPowerStateName.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power;
 
-public class UserPowerStateName implements PowerStateName {
+public class CustomPowerStateName implements PowerStateName {
 
         protected String name;
 
-        public UserPowerStateName(String name) {
+        public CustomPowerStateName(String name) {
                 this.name = name;
         }
 
-        public String getName() {
+        public String getLabel() {
                 return name;
         }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerStateName.java

@@ -3 +3 @@
 public interface PowerStateName {
         
-        public String getName();
+        public String getLabel();
 
 }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerStateNameFactory.java

@@ -6 +6 @@
         public static PowerStateName createPowerStateName (String powerStateName){
                 
-                if(powerStateName.equals(StandardPowerStateName.ON.getName()))
+                if(powerStateName.equals(StandardPowerStateName.ON.getLabel()))
                         return StandardPowerStateName.ON;
                 
-                else if(powerStateName.equals(StandardPowerStateName.OFF.getName()))
+                else if(powerStateName.equals(StandardPowerStateName.OFF.getLabel()))
                         return StandardPowerStateName.OFF;
                 
-                else if(powerStateName.equals(StandardPowerStateName.HIBERNATE.getName()))
+                else if(powerStateName.equals(StandardPowerStateName.HIBERNATE.getLabel()))
                         return StandardPowerStateName.HIBERNATE;
                 
-                else if(powerStateName.equals(StandardPowerStateName.SLEEP.getName()))
+                else if(powerStateName.equals(StandardPowerStateName.SLEEP.getLabel()))
                         return StandardPowerStateName.SLEEP;
                 
-                else if(powerStateName.equals(StandardPowerStateName.SUSPEND.getName()))
+                else if(powerStateName.equals(StandardPowerStateName.SUSPEND.getLabel()))
                         return StandardPowerStateName.SUSPEND;
                 
-                else return new UserPowerStateName(powerStateName);
+                else return new CustomPowerStateName(powerStateName);
         }
 }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/StandardPowerStateName.java

@@ -10 +10 @@
         HIBERNATE;
 
-        public String getName() {
+        public String getLabel() {
                 return toString();
         }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/plugin/EnergyEstimationPlugin.java

@@ -10 +10 @@
         public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
 
-        public double estimateAirThroughput(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
+        public double estimateAirflow(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
 
         public double estimateTemperature(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/ComputingResourcePowerInterface.java

@@ -74 +74 @@
         public boolean supportPowerState(PowerStateName state) {
                 for(PowerState powerState: powerProfile.getSupportedPowerStates()){
-                        if(powerState.getName().getName().equals(state.getName())){
+                        if(powerState.getName().getLabel().equals(state.getLabel())){
                                 return true;
                         }
@@ -86 +86 @@
                 if(supportPowerState(state)){
                         for(PowerState powerState: powerProfile.getSupportedPowerStates()){
-                                if(powerState.getName().getName().equals(state.getName())){
+                                if(powerState.getName().getLabel().equals(state.getLabel())){
                                         powerConsumption = powerState.getPowerUsage();
                                         break;