Jobshop objects added as empty scripts for now

dream/simulation/LineGenerationJSON.py

@@ -64,6 +64,9 @@ from Assembly import Assembly
 from Dismantle import Dismantle
 from Conveyer import Conveyer
 from Job import Job
+#from MachineJobShop import MachineJobShop
+#from QueueJobShop import QueueJobShop
+#from ExitJobShop import ExitJobShop
 import xlwt
 import xlrd
 import time
@@ -112,7 +115,7 @@ def createObjects():
     G.JobList=[]
     G.WipList=[]
     G.EntityList=[]  
-
+    G.MachineJobShopList=[]
 
     #loop through all the model resources 
     #search for repairmen in order to create them
@@ -169,6 +172,31 @@ def createObjects():
             G.MachineList.append(M)
             G.ObjList.append(M)
             
+        elif objClass=='Dream.MachineJobShop':
+            id=element.get('id', 'not found')
+            name=element.get('name', 'not found')
+            processingTime=element.get('processingTime', 'not found')
+            distributionType=processingTime.get('distributionType', 'not found')
+            mean=float(processingTime.get('mean', '0'))  
+            stdev=float(processingTime.get('stdev', '0'))  
+            min=float(processingTime.get('min', '0')) 
+            max=float(processingTime.get('max', '0'))
+            failures=element.get('failures', 'not found')  
+            failureDistribution=failures.get('failureDistribution', 'not found')
+            MTTF=float(failures.get('MTTF', '0'))   
+            MTTR=float(failures.get('MTTR', '0')) 
+            availability=float(failures.get('availability', '0'))  
+            r='None'
+            for repairman in G.RepairmanList:
+                if(id in repairman.coreObjectIds):
+                    r=repairman
+                    
+            M=MachineJobShop(id, name, 1, distributionType, [mean,stdev,min,max], failureDistribution,
+                                                    MTTF, MTTR, availability, r)
+            M.nextIds=getSuccessorList(id)
+            G.MachineJobShopList.append(M)
+            G.ObjList.append(M)
+            
         elif objClass=='Dream.Exit':
             id=element.get('id', 'not found')
             name=element.get('name', 'not found')

dream/simulation/MachineJobShop.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 8 Nov 2012
+
+@author: George
+'''
+'''
+extends the machine object so that it can act as a jobshop station. It reads the processing time and the successive station from the Entity
+'''
+
+from SimPy.Simulation import Process, Resource
+from SimPy.Simulation import activate, passivate, waituntil, now, hold
+
+from Machine import Machine
+
+from RandomNumberGenerator import RandomNumberGenerator
+
+#the MachineJobShop object
+class MachineJobShop(Machine):
+    
+    
+    
\ No newline at end of file