correction in Job outputResutlsJSON

dream/simulation/Job.py

@@ -82,7 +82,7 @@ class Job(Entity):                                  # inherits from the Entity c
                 # TODO : check if there is a need for setting a different 'type' for the MouldAssembly than 'Machine'
                 #    ask Georgios if the method __class__.__name__ of finding the class type of the last step is correct
                 # if the entity is of type orderComponent and the last step in it's schedule is Assembly
-                elif self.type=='OrderComponent' and self.schedule[-1][0].__class__.__name__=='MouldAssemblyManaged':
+                elif self.type=='OrderComponent' and self.schedule[-1][0].__class__.__name__ in set(['MouldAssemblyManaged','MouldAssembly']):
                     json['results']['completionTime']=self.schedule[-1][1]  
                     completionTime=self.schedule[-1][1]  
                 #else input "still in progress"

dream/simulation/Machine.py

@@ -1089,27 +1089,6 @@ class Machine(CoreObject):
              and (self.canDeliverOnInterruption
                   or self.timeLastEntityEnded==self.env.now
                   or self.checkIfActive())
-                 
-#     # =======================================================================
-#     #                       calculates the setup time
-#     # =======================================================================
-#     def calculateSetupTime(self):
-#         return self.stpRng.generateNumber()
-    
-#     # =======================================================================
-#     #                        calculates the Load time
-#     # =======================================================================
-#     def calculateLoadTime(self):
-#         return self.loadRng.generateNumber()
-    
-#     # =======================================================================
-#     #                        calculates the Load time
-#     # =======================================================================
-#     def calculateTime(self, type='Processing'):
-#         if type=='Setup':
-#             return self.stpRng.generateNumber()
-#         elif type=='Load':
-#            return self.loadRng.generateNumber()
     
     #===========================================================================
     # checks whether the entity can proceed to a successor object