Changeset 495 for DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power

Timestamp:

10/10/12 12:12:06 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power

Files:

• PowerInterfaceFactory.java (moved) (moved from DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/PowerProfileFactory.java) (2 diffs)
• PowerProfile.java (modified) (1 diff)
• PowerUsage.java (modified) (1 diff)
• ui/ComputingNodePowerInterface.java (modified) (1 diff)
• ui/ComputingResourcePowerInterface.java (moved) (moved from DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/ui/AbstractPowerInterface.java) (2 diffs)
• ui/DataCenterPowerInterface.java (modified) (1 diff)
• ui/ProcessorPowerInterface.java (modified) (2 diffs)

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/PowerInterfaceFactory.java

@@ -5 +5 @@
 import schedframe.resources.computing.profiles.energy.power.ui.PowerInterface;
 
-public class PowerProfileFactory {
+public class PowerInterfaceFactory {
 
 
@@ -36 +36 @@
                 else if (resource.getType().getName().equals(StandardResourceType.Processor.getName()))
                         powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ProcessorPowerInterface(resource, pp);
-                else throw new IllegalArgumentException("ResourceType " + resource.getType() + " is not supported.");
+                else 
+                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingResourcePowerInterface(resource, pp);
 
                 /*switch(resource.getType()){

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/PowerProfile.java

@@ -22 +22 @@
         
 
-        public PowerProfile(EnergyEstimationPlugin energyEstimationPlugin, List<PowerState> supportedPowerStates) {
+        public PowerProfile(EnergyEstimationPlugin energyEstimationPlugin, List<PowerState> powerStates) {
                 this.energyEstimationPlugin = energyEstimationPlugin;
                 this.powerUsage = new ArrayList<PowerUsage>();
-                this.supportedPowerStates = supportedPowerStates;
+                this.supportedPowerStates = powerStates;
         }
         
-        public PowerProfile(EnergyEstimationPlugin energyEstimationPlugin, List<PowerState> supportedPowerStates,  List<PState> pStates) {
+        public PowerProfile(EnergyEstimationPlugin energyEstimationPlugin, List<PowerState> powerStates,  List<PState> pStates) {
                 this.energyEstimationPlugin = energyEstimationPlugin;
-                this.supportedPowerStates = supportedPowerStates;
+                this.supportedPowerStates = powerStates;
                 this.powerUsage = new ArrayList<PowerUsage>();
                 if(pStates.size() > 0)

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/PowerUsage.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power;
 
-public class PowerUsage {
+import schedframe.resources.computing.profiles.energy.MeasurementHistory;
 
-        protected long timestamp;
-        protected double value;
+public class PowerUsage extends MeasurementHistory{
 
         public PowerUsage(long timestamp, double value){
-                this.timestamp = timestamp;
-                this.value = value;
-        }
-        
-        public long getTimestamp() {
-                return timestamp;
-        }
-
-        public double getValue() {
-                return value;
-        }
-        
-        public void setValue(double value) {
-                this.value = value;
+                super(timestamp, value);
         }
         

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/ui/ComputingNodePowerInterface.java

@@ -10 +10 @@
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
 
-public class ComputingNodePowerInterface extends AbstractPowerInterface{
+public class ComputingNodePowerInterface extends ComputingResourcePowerInterface{
 
         public static long START_TIME = 600000;

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

@@ -17 +17 @@
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
 
-public abstract class AbstractPowerInterface implements PowerInterface{
+public class ComputingResourcePowerInterface implements PowerInterface{
 
         protected PowerStateName currentPowerState;
@@ -23 +23 @@
         protected ComputingResource resource;
         
-        public AbstractPowerInterface(ComputingResource resource, PowerProfile powerProfile){
+        public ComputingResourcePowerInterface(ComputingResource resource, PowerProfile powerProfile){
                 this.resource = resource;
                 this.powerProfile = powerProfile;

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/ui/DataCenterPowerInterface.java

@@ -7 +7 @@
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
 
-public class DataCenterPowerInterface extends AbstractPowerInterface{
+public class DataCenterPowerInterface extends ComputingResourcePowerInterface{
 
-
-
-        
         public DataCenterPowerInterface(ComputingResource resource, PowerProfile pp){
                 super(resource, pp);

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/ui/ProcessorPowerInterface.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power.ui;
 
-import gridsim.dcworms.DCWormsTags;
 
 import java.util.Map;
@@ -16 +15 @@
 import schedframe.resources.units.StandardResourceUnitName;
 
-public class ProcessorPowerInterface extends AbstractPowerInterface {
+public class ProcessorPowerInterface extends ComputingResourcePowerInterface {
 
         protected PState currentPState;