update so that in the schedule of an Entity the whole object is kept

dream/simulation/CoreObject.py

@@ -105,7 +105,7 @@ class CoreObject(Process):
         #append the time to schedule so that it can be read in the result
         #remember that every entity has it's schedule which is supposed to be updated every time 
         # the entity enters a new object
-        activeEntity.schedule.append([activeObject.id,now()])
+        activeEntity.schedule.append([activeObject,now()])
         activeEntity.currentStation=self
         self.timeLastEntityEntered=now()
         try:

dream/simulation/Job.py

@@ -58,7 +58,7 @@ class Job(Entity):                                  # inherits from the Entity c
             i=0
             for record in self.schedule:
                 json['results']['schedule'][str(i)]={}                                  # dictionary holding time and 
-                json['results']['schedule'][str(i)]['stationId']=record[0]              # id of the Object
+                json['results']['schedule'][str(i)]['stationId']=record[0].id              # id of the Object
                 json['results']['schedule'][str(i)]['entranceTime']=record[1]           # time entering the Object
                 i+=1             
             G.outputJSON['elementList'].append(json)

dream/simulation/LineGenerationJSON.py

@@ -538,7 +538,7 @@ def setWIP():
                 object=obj                                  # find the object in the 'G.ObjList
         object.getActiveObjectQueue().append(entity)        # append the entity to its Queue
         entity.remainingRoute[0][0]=""                      # remove data from the remaining route.    
-        entity.schedule.append([object.id,now()])   #append the time to schedule so that it can be read in the result
+        entity.schedule.append([object,now()])   #append the time to schedule so that it can be read in the result
         entity.currentStation=object                        # update the current station of the entity           
 
 # ===========================================================================