Capacity Enity and Project created

dream/simulation/CapacityEntity.py

@@ -34,8 +34,18 @@ from Entity import Entity
 class CapacityEntity(Entity):
     type="CapacityEntity"
     
-    def __init__(self, id=None, name=None, projectId=None, requiredCapacity=10, priority=0, dueDate=None, orderDate=None, isCritical=False):
+    def __init__(self, id=None, name=None, capacityProjectId=None, requiredCapacity=10, priority=0, dueDate=None, orderDate=None, isCritical=False):
         Entity.__init__(self, id, name, priority, dueDate, orderDate, isCritical)
-        self.projectId=projectId    # the project that the capacity Entity is part of
+        self.capacityProjectId=capacityProjectId    # the project id hat the capacity Entity is part of
+        self.capacityProject=None                   # the project that the capacity Entity is part of. It is defined in initialize
         self.requiredCapacity=requiredCapacity  # the capacity that the capacity entity requires from the following station
 
+    def initialize(self):
+        Entity.initialize(self)
+        from Globals import G
+        # find the project that the capacity entity is part of
+        for project in G.CapacityProjectList:
+            if project.id==self.capacityProjectId:
+                self.capacityProject=project
+                break
+        
\ No newline at end of file

dream/simulation/CapacityProject.py

+# ===========================================================================
+# Copyright 2013 University of Limerick
+#
+# This file is part of DREAM.
+#
+# DREAM is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# DREAM is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with DREAM.  If not, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+
+'''
+Created on 5 June 2013
+
+@author: George
+'''
+'''
+a project that requires specific capacity from each station
+'''
+
+from Entity import Entity
+
+# ===========================================================================
+# The CapacityEntityProject object 
+# ===========================================================================
+class CapacityProject(Entity):
+    type="CapacityProject"
+    
+    def __init__(self, id=None, name=None, capacityRequirementDict={}):
+        Entity.__init__(self, id, name)
+        # a dict that shows the required capacity from every station
+        self.capacityRequirementDict=capacityRequirementDict
+        self.id=id