Changeset 1396 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/EnergyExtension.java

Timestamp:

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

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/EnergyExtension.java (modified) (7 diffs)

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

@@ -10 +10 @@
 import schedframe.resources.computing.extensions.ExtensionException;
 import schedframe.resources.computing.extensions.ExtensionType;
-import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputInterfaceFactory;
-import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputProfile;
-import schedframe.resources.computing.profiles.energy.airthroughput.ui.AirThroughputInterface;
+import schedframe.resources.computing.profiles.energy.airthroughput.AirflowInterfaceFactory;
+import schedframe.resources.computing.profiles.energy.airthroughput.AirflowProfile;
+import schedframe.resources.computing.profiles.energy.airthroughput.ui.AirflowInterface;
 import schedframe.resources.computing.profiles.energy.power.PowerInterfaceFactory;
 import schedframe.resources.computing.profiles.energy.power.PowerProfile;
@@ -30 +30 @@
         protected PowerProfile powerProfile;
         
-        protected AirThroughputInterface airFlowInterface;
-        protected AirThroughputProfile airFlowProfile;
+        protected AirflowInterface airflowInterface;
+        protected AirflowProfile airflowProfile;
         
         protected ThermalInterface thermalInterface;
@@ -74 +74 @@
                 protected PowerProfile powerProfile;
                 
-                protected AirThroughputInterface airFlowInterface;
-                protected AirThroughputProfile airFlowProfile;
+                protected AirflowInterface airflowInterface;
+                protected AirflowProfile airflowProfile;
                 
                 protected ThermalInterface thermalInterface;
@@ -84 +84 @@
                 public Builder powerProfile(PowerProfile pp){this.powerProfile = pp; this.powerInterface = PowerInterfaceFactory.createPowerInterface(resource, powerProfile); return this; }
 
-        public Builder airFlowProfile(AirThroughputProfile atp){this.airFlowProfile = atp; this.airFlowInterface = AirThroughputInterfaceFactory.createAirThroughputInterface(resource, airFlowProfile); return this; }
+        public Builder airflowProfile(AirflowProfile atp){this.airflowProfile = atp; this.airflowInterface = AirflowInterfaceFactory.createAirflowInterface(resource, airflowProfile); return this; }
 
         public Builder thermalProfile(ThermalProfile tp){this.thermalProfile = tp; this.thermalInterface = ThermalInterfaceFactory.createThermalInterface(resource, thermalProfile); return this; }
@@ -98 +98 @@
                 this.powerProfile = builder.powerProfile;
                 
-                this.airFlowInterface = builder.airFlowInterface ;
-                this.airFlowProfile = builder.airFlowProfile;
+                this.airflowInterface = builder.airflowInterface ;
+                this.airflowProfile = builder.airflowProfile;
                 
                 this.thermalInterface = builder.thermalInterface;
@@ -163 +163 @@
                                 
                         case AIRFLOW_STATE_CHANGED:
-                                double airFlow = powerProfile.getEnergyEstimationPlugin().estimateAirThroughput(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
-                                airFlowProfile.addToAirFlowHistory(airFlow);
+                                double airflow = powerProfile.getEnergyEstimationPlugin().estimateAirflow(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                airflowProfile.addToAirFlowHistory(airflow);
                                 break;
                                 
@@ -204 +204 @@
         }
 
-        public AirThroughputInterface getAirThroughputInterface() {
-                return airFlowInterface;
-        }
-
-        public AirThroughputProfile getAirFlowProfile() {
-                return airFlowProfile;
+        public AirflowInterface getAirflowInterface() {
+                return airflowInterface;
+        }
+
+        public AirflowProfile getAirFlowProfile() {
+                return airflowProfile;
         }