add missing scipy import and remove unsued

dream/simulation/Assembly.py

@@ -30,7 +30,6 @@ from SimPy.Simulation import Process, Resource
 from SimPy.Simulation import waituntil, now, hold
 import xlwt
 from RandomNumberGenerator import RandomNumberGenerator
-import scipy.stats as stat
 from CoreObject import CoreObject
 
 #the Assembly object

dream/simulation/BatchReassembly.py

@@ -28,7 +28,6 @@ BatchReassembly is a Core Object that takes a number of subBatches and reassembl
 from SimPy.Simulation import Process, Resource
 from SimPy.Simulation import activate, waituntil, now, hold
 
-import scipy.stats as stat
 
 from Globals import G
 from RandomNumberGenerator import RandomNumberGenerator

dream/simulation/Conveyer.py

@@ -29,7 +29,6 @@ it gathers entities and transfers them with a certain speed
 from SimPy.Simulation import Process, Resource
 from SimPy.Simulation import waituntil, now, hold, infinity, activate
 import xlwt
-import scipy.stats as stat
 from CoreObject import CoreObject
 
 #The conveyer object

dream/simulation/CoreObject.py

@@ -26,7 +26,6 @@ Class that acts as an abstract. It should have no instances. All the core-object
 '''
 
 from SimPy.Simulation import Process, Resource, now
-import scipy.stats as stat
 
 # ===========================================================================
 # the core object

dream/simulation/Dismantle.py

@@ -31,7 +31,6 @@ from SimPy.Simulation import Process, Resource
 from SimPy.Simulation import waituntil, now, hold, infinity
 import xlwt
 from RandomNumberGenerator import RandomNumberGenerator
-import scipy.stats as stat
 from CoreObject import CoreObject
 
 # ===========================================================================

dream/simulation/Examples/PartJobShop.json

@@ -342,12 +342,12 @@
       }
     }, 
     "PM1": {
-      "_class": "Dream.Operator", 
+      "_class": "Dream.OperatorManagedJob", 
       "element_id": "DreamNode_14", 
       "name": "PM1"
     }, 
     "PM2": {
-      "_class": "Dream.Operator", 
+      "_class": "Dream.OperatorManagedJob", 
       "element_id": "DreamNode_15", 
       "name": "PM2"
     }, 

dream/simulation/Exit.py

@@ -27,7 +27,6 @@ models the exit of the model
 
 from SimPy.Simulation import now, Process, Resource, infinity, waituntil
 import xlwt
-import scipy.stats as stat
 from CoreObject import CoreObject
 
 # ===========================================================================

dream/simulation/GUI/PartJobShop.py

@@ -61,8 +61,8 @@ class Simulation(ACO.Simulation):
         "_class": 'Dream.ExitJobShop',
         "name": 'Exit'
     }
-    conf["Dream-Operator"] = {
-        "_class": 'Dream.Operator',
+    conf["Dream-OperatorManagedJob"] = {
+        "_class": 'Dream.OperatorManagedJob',
         "name": 'Operator'
     }
     conf["Dream-OrderDecomposition"] = {

dream/simulation/Globals.py

@@ -33,6 +33,7 @@ import xlwt
 import xlrd
 from random import Random, expovariate, gammavariate, normalvariate
 from SimPy.Simulation import now
+import scipy.stats as stat
 
 # ===========================================================================
 # globals

dream/simulation/Machine.py

@@ -37,7 +37,6 @@ from OperatedPoolBroker import Broker
 from OperatorPool import OperatorPool
 
 from RandomNumberGenerator import RandomNumberGenerator
-import scipy.stats as stat
 
 # ===========================================================================
 # the Machine object

dream/simulation/OperatedMachine.py

@@ -36,7 +36,6 @@ from OperatedPoolBroker import Broker
 from OperatorPool import OperatorPool
 
 from RandomNumberGenerator import RandomNumberGenerator
-import scipy.stats as stat
 
 # ===========================================================================
 # the Machine object

dream/simulation/OperatorPool.py

@@ -28,7 +28,6 @@ models a Broker that organizes the dispatch of operators/repairmen
 
 from SimPy.Simulation import Resource, now
 import xlwt
-import scipy.stats as stat
 from ObjectResource import ObjectResource
 from Operator import Operator
 

dream/simulation/Repairman.py

@@ -28,7 +28,6 @@ models a repairman that can fix a machine when it gets failures
 
 from SimPy.Simulation import Resource, now
 import xlwt
-import scipy.stats as stat
 from ObjectResource import ObjectResource
 
 # ===========================================================================