Changeset 754 for DCWoRMS/trunk/src/schedframe/resources/computing

Timestamp:

01/07/13 14:52:39 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/ui

Files:

• AirThroughputInterface.java (modified) (1 diff)
• ComputingResourceAirThroughputInterface.java (moved) (moved from DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/DefaultAirThroughputInterface.java) (5 diffs)

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/AirThroughputInterface.java

@@ -5 +5 @@
 import schedframe.Parameters;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputState;
+import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputStateName;
 
 public interface AirThroughputInterface {
         
-        public String getAirThroughputState();
+        public AirThroughputStateName  getAirThroughputState();
         
-        public boolean setAirThroughputState(String airThroughputState);
+        public boolean setAirThroughputState(AirThroughputStateName airThroughputState);
         
-        public boolean supportAirThroughputState(String powerState);
+        public boolean supportAirThroughputState(AirThroughputStateName powerState);
         
         public List<AirThroughputState> getSupportedAirThroughputStates() throws NoSuchFieldException;
         
-        public double getPowerConsumption(String state) throws NoSuchFieldException;
+        public double getAirFlow(AirThroughputStateName state) throws NoSuchFieldException;
+        
+        public double getPowerConsumption(AirThroughputStateName state) throws NoSuchFieldException;
         
         public Parameters getParameters();

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/ComputingResourceAirThroughputInterface.java

@@ -10 +10 @@
 import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputProfile;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputState;
+import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputStateName;
+import schedframe.resources.computing.profiles.energy.airthroughput.StandardAirThroughputStateName;
 
-public class DefaultAirThroughputInterface implements AirThroughputInterface{
+public class ComputingResourceAirThroughputInterface implements AirThroughputInterface{
 
-        protected String currentAirThroughputState;
+        protected AirThroughputStateName currentAirThroughputState;
         protected AirThroughputProfile airThroughputProfile;
         protected ComputingResource resource;
         
-        public DefaultAirThroughputInterface(ComputingResource resource, AirThroughputProfile airThroughputProfile){
+        public ComputingResourceAirThroughputInterface(ComputingResource resource, AirThroughputProfile airThroughputProfile){
                 this.resource = resource;
                 this.airThroughputProfile = airThroughputProfile;
+                this.currentAirThroughputState = StandardAirThroughputStateName.FAN_ON;
         }
         
-        public String getAirThroughputState() {
+        public AirThroughputStateName getAirThroughputState() {
                 return currentAirThroughputState;
         }
 
-        public boolean setAirThroughputState(String state) {
+        public boolean setAirThroughputState(AirThroughputStateName state) {
                 if(supportAirThroughputState(state)){
                         currentAirThroughputState = state;
@@ -32 +35 @@
                         //TO DO - notifications should be called for all resources starting form the lowest layer
                         resource.handleEvent(new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, resource.getName()));
-
                         return true;
                 }
@@ -38 +40 @@
         }
 
-        public boolean supportAirThroughputState(String state) {
+        public boolean supportAirThroughputState(AirThroughputStateName state) {
                 for(AirThroughputState airFlowState: airThroughputProfile.getAirThroughputStates()){
-                        if(airFlowState.getName().equals(state)){
+                        if(airFlowState.getName().equals(state.getName())){
                                 return true;
                         }
@@ -55 +57 @@
         }
 
-        public double getPowerConsumption(String state) throws NoSuchFieldException {
+        public double getAirFlow(AirThroughputStateName state) throws NoSuchFieldException {
+                double airThroughput = 0;
+                if(supportAirThroughputState(state)){
+                        for(AirThroughputState airFlowState: airThroughputProfile.getAirThroughputStates()){
+                                if(airFlowState.getName().equals(state.getName())){
+                                        airThroughput = airFlowState.getValue();
+                                        break;
+                                }
+                        }
+                }
+                return airThroughput;
+        }
+
+        public double getPowerConsumption(AirThroughputStateName state) throws NoSuchFieldException {
                 double powerConsumption = 0;
                 if(supportAirThroughputState(state)){
                         for(AirThroughputState airFlowState: airThroughputProfile.getAirThroughputStates()){
-                                if(airFlowState.getName().equals(state)){
+                                if(airFlowState.getName().equals(state.getName())){
                                         powerConsumption = airFlowState.getPowerUsage();
                                         break;
@@ -67 +82 @@
                 return powerConsumption;
         }
-
+        
         public Parameters getParameters() {
                 return airThroughputProfile.getParameters();