CalculateProcessingTime() CoreObject method now

d1ae4684 · Ioannis Papagiannopoulos · Sebastien Robin · 2737b568 · d1ae4684 · d1ae4684
Commit d1ae4684 authored Oct 29, 2013 by Ioannis Papagiannopoulos Committed by Sebastien Robin Nov 06, 2013
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

dream/simulation/CoreObject.py dream/simulation/CoreObject.py +6 -1

dream/simulation/Machine.py dream/simulation/Machine.py +0 -5

No files found.
--- a/dream/simulation/CoreObject.py
+++ b/dream/simulation/CoreObject.py
@@ -170,3 +170,8 @@ class CoreObject(Process):
    def getReceiverObjectQueue(self):
        return self.getReceiverObject().Res.activeQ
    
+    # =======================================================================
+    # calculates the processing time
+    # =======================================================================
+    def calculateProcessingTime(self):
+        return self.rng.generateNumber()                            # this is if we have a default processing time for all the entities
\ No newline at end of file
--- a/dream/simulation/Machine.py
+++ b/dream/simulation/Machine.py
@@ -216,11 +216,6 @@ class Machine(CoreObject):
    def checkIfMachineIsUp(self):
        return self.Up
    
-    # =======================================================================
-    # calculates the processing time
-    # =======================================================================
-    def calculateProcessingTime(self):
-        return self.rng.generateNumber()                            # this is if we have a default processing time for all the entities
    
    # =======================================================================
    # checks if the Machine can accept an entity