Merge branch 'OperatorExamples'

dream/simulation/Machine.py

@@ -74,6 +74,9 @@ class Machine(CoreObject):
         # check whether the operators are provided with a skills set
         # check whether the operators are provided with a skills set
         self.dedicatedOperator=self.checkForDedicatedOperators()
+        if operatorPool and not (operatorPool=='None'):
+            self.operatorPool=operatorPool
+        else:
             if len(G.OperatorPoolsList)>0:
                 for operatorPool in G.OperatorPoolsList:                    # find the operatorPool assigned to the machine
                     if(self.id in operatorPool.coreObjectIds):                   # and add it to the machine's operatorPool