Changeset 1272 for DCWoRMS/branches

Timestamp:

03/17/14 11:04:23 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PState.java (modified) (5 diffs)

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

@@ -10 +10 @@
         protected double voltage;
         protected double powerUsage;
-        protected double powerUsageMin;
-        protected double powerUsageMax;
-        //protected List<LoadPowerUsage> loadPowerUsageList;
+
         protected Map<Double, Double> loadPowerUsage;
         
@@ -33 +31 @@
         }
         public double getPower() {
-                if(powerUsage == 0)
-                        powerUsage = (powerUsageMin + powerUsageMax)/2;
                 return powerUsage;
         }
-        public double getPowerMin() {
-                return powerUsageMin;
-        }
-        public double getPowerMax() {
-                return powerUsageMax;
-        }
-        /*public List<LoadPowerUsage> getLoadPowerUsageList() {
-                return loadPowerUsageList;
-        }*/
+
         public Map<Double, Double> getLoadPowerUsage() {
                 if(loadPowerUsage == null) {
@@ -59 +47 @@
                 protected double voltage;
                 protected double powerUsage;
-                protected double powerUsageMin;
-                protected double powerUsageMax;
-                //protected List<LoadPowerUsage> loadPowerUsageList = new ArrayList<LoadPowerUsage>();
+
+
                 protected Map<Double, Double> loadPowerUsage = new TreeMap<Double, Double>();
                 
@@ -68 +55 @@
         public Builder voltage(double value){this.voltage = value; return this; }
         public Builder powerUsage(double rate){this.powerUsage = rate; return this; }
-        public Builder powerUsageMin(double rate){this.powerUsageMin = rate; return this; }
-        public Builder powerUsageMax(double rate){this.powerUsageMax = rate; return this; }
-        //public Builder loadPowerUsage(LoadPowerUsage lpu){this.loadPowerUsageList.add(lpu); return this; }
+
         public Builder loadPowerUsage(double load, double power){this.loadPowerUsage.put(load, power); return this; }
         
@@ -83 +68 @@
                 this.voltage = builder.voltage;
                 this.powerUsage = builder.powerUsage;
-                this.powerUsageMin = builder.powerUsageMin;
-                this.powerUsageMax = builder.powerUsageMax;
-                //this.loadPowerUsageList = builder.loadPowerUsageList;
+                
                 this.loadPowerUsage = builder.loadPowerUsage;
         }
 
-
 }