Changeset 1317 for DCWoRMS/branches

Timestamp:

03/31/14 16:01:31 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe

Files:

• resources/computing/profiles/energy/thermal/ThermalInterfaceFactory.java (modified) (2 diffs)
• resources/devices/DeviceAirThroughputInterface.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/resources/devices/PhysicalResourceAirThroughputInterface.java) (2 diffs)
• resources/devices/DevicePowerInterface.java (added)
• resources/devices/DeviceThermalInterface.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/resources/devices/PhysicalResourceThermalInterface.java) (2 diffs)
• resources/devices/PhysicalResourcePowerInterface.java (deleted)
• resources/devices/coolemall/FanAirThroughputInterface.java (modified) (1 diff)
• resources/devices/description/PhysicalResourceDescription.java (modified) (1 diff)
• scheduling/ResourceHistoryItem.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import schedframe.resources.computing.profiles.energy.thermal.ui.ThermalInterface;
 import schedframe.resources.devices.PhysicalResource;
-import schedframe.resources.devices.PhysicalResourceThermalInterface;
+import schedframe.resources.devices.DeviceThermalInterface;
 
 public class ThermalInterfaceFactory {
@@ -14 +14 @@
                 ThermalInterface thermalInterface;
                 if (resource.getType().getName().equals(StandardResourceType.CRAH.getName()))
-                        thermalInterface = new PhysicalResourceThermalInterface(resource, tp);
+                        thermalInterface = new DeviceThermalInterface(resource, tp);
                 else if (resource.getType().getName().equals(StandardResourceType.Fan.getName()))
-                        thermalInterface = new PhysicalResourceThermalInterface(resource, tp);
+                        thermalInterface = new DeviceThermalInterface(resource, tp);
                 else if(resource.getType().getName().equals(StandardResourceType.Inlet.getName()))
-                        thermalInterface = new PhysicalResourceThermalInterface(resource, tp);
+                        thermalInterface = new DeviceThermalInterface(resource, tp);
                 else if(resource.getType().getName().equals(StandardResourceType.Outlet.getName()))
-                        thermalInterface = new PhysicalResourceThermalInterface(resource, tp);
+                        thermalInterface = new DeviceThermalInterface(resource, tp);
                 else 
                         thermalInterface = new ComputingResourceThermalInterface((ComputingResource)resource, tp);

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/DeviceAirThroughputInterface.java

@@ -16 +16 @@
 import schedframe.resources.computing.profiles.energy.airthroughput.ui.AirThroughputInterface;
 
-public class PhysicalResourceAirThroughputInterface implements AirThroughputInterface{
+public class DeviceAirThroughputInterface implements AirThroughputInterface{
 
         protected AirThroughputStateName currentAirThroughputState;
@@ -22 +22 @@
         protected PhysicalResource resource;
         
-        public PhysicalResourceAirThroughputInterface(PhysicalResource resource, AirThroughputProfile airThroughputProfile){
+        public DeviceAirThroughputInterface(PhysicalResource resource, AirThroughputProfile airThroughputProfile){
                 this.resource = resource;
                 this.airThroughputProfile = airThroughputProfile;

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/DeviceThermalInterface.java

@@ -10 +10 @@
 import schedframe.resources.computing.profiles.energy.thermal.ui.ThermalInterface;
 
-public class PhysicalResourceThermalInterface implements ThermalInterface{
+public class DeviceThermalInterface implements ThermalInterface{
 
         private static int START_TEMP = 0;
@@ -16 +16 @@
         protected ThermalProfile thermalProfile;
 
-        public PhysicalResourceThermalInterface(PhysicalResource resource, ThermalProfile thermalProfile) {
+        public DeviceThermalInterface(PhysicalResource resource, ThermalProfile thermalProfile) {
                 super();
                 this.resource = resource;

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/coolemall/FanAirThroughputInterface.java

@@ -4 +4 @@
 import schedframe.resources.computing.profiles.energy.airthroughput.UserAirThroughputStateName;
 import schedframe.resources.devices.PhysicalResource;
-import schedframe.resources.devices.PhysicalResourceAirThroughputInterface;
+import schedframe.resources.devices.DeviceAirThroughputInterface;
 
-public class FanAirThroughputInterface extends PhysicalResourceAirThroughputInterface {
+public class FanAirThroughputInterface extends DeviceAirThroughputInterface {
 
         public FanAirThroughputInterface(PhysicalResource resource, AirThroughputProfile airThroughputProfile) {

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/description/PhysicalResourceDescription.java

@@ -48 +48 @@
         }
 
+        public void addChildren(PhysicalResourceDescription child) {
+                super.addChildren(child);
+                if(child.getLoadProfile().getLoadCalendar().getLoadDistribution().size() == 0){
+                        child.getLoadProfile().getLoadCalendar().getLoadDistribution().addAll(this.getLoadProfile().getLoadCalendar().getLoadDistribution());
+                }
+        }
+        
         protected void initProfiles(Profile profile) {
                 if (profile != null) {

DCWoRMS/branches/coolemall/src/schedframe/scheduling/ResourceHistoryItem.java

@@ -13 +13 @@
         protected Map<ResourceUnitName, ResourceUnit> usedResources;
         protected DateTime timeStamp;
+        protected double completionPercentage;
         
         /**
@@ -31 +32 @@
                 return timeStamp;
         }
+
+        public double getCompletionPercentage() {
+                return completionPercentage;
+        }
+
+        public void setCompletionPercentage(double completionPercentage) {
+                this.completionPercentage = completionPercentage;
+        }
         
 }