Changeset 896 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases

Timestamp:

03/04/13 08:25:34 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases

Files:

• ResourceConsumption.java (modified) (2 diffs)
• ResourceConsumptionProfile.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ResourceConsumption.java

@@ -51 +51 @@
         }
 
-        public void setReferenceHardware(String referenceHardware) {
-                this.referenceHardware = referenceHardware;
-        }
-
         public long getDuration() {
                 return duration;
-        }
-
-        public void setDuration(long duration) {
-                this.duration = duration;
         }
 
@@ -67 +59 @@
         }
 
-        public void setBehaviourList(List<PhaseBehaviour> behaviourList) {
-                this.phaseBehaviourList = behaviourList;
-        }
 }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ResourceConsumptionProfile.java

@@ -1 +1 @@
 package schedframe.scheduling.tasks.phases;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 public class ResourceConsumptionProfile {
         
-        protected List<ResourceConsumption> resourceConsumptionList;
+        protected LinkedList<ResourceConsumption> resourceConsumptionList;
+        protected int currentPhase;
         
         public ResourceConsumptionProfile() {
-                this.resourceConsumptionList = new ArrayList<ResourceConsumption>();
+                this.resourceConsumptionList = new LinkedList<ResourceConsumption>();
+                this.currentPhase = -1;
         }
         
-        public ResourceConsumptionProfile(List<ResourceConsumption> resourceConsumptionList) {
+        public ResourceConsumptionProfile(LinkedList<ResourceConsumption> resourceConsumptionList) {
                 this.resourceConsumptionList = resourceConsumptionList;
+                this.currentPhase = -1;
+        }
+        
+        public LinkedList<ResourceConsumption> getResourceConsumptionList(){
+                return resourceConsumptionList;
+        }
+        
+        public ResourceConsumption getCurrentResourceConsumption(){
+                if(currentPhase < resourceConsumptionList.size())
+                        return resourceConsumptionList.get(currentPhase);
+                else 
+                        return null;
+        }
+
+        public int getCurrentPhase() {
+                return currentPhase;
+        }
+
+        public void setCurrentPhase(int currentPhase) {
+                this.currentPhase = currentPhase;
         }
 }