Job updated so that it outputs its completion time in the results. Results of tests also updated

dream/simulation/Job.py

@@ -59,18 +59,12 @@ class Job(Entity):                                  # inherits from the Entity c
             
             #if the Job has reached an exit, input completion time in the results
             if self.schedule[-1][0].type=='Exit':
-                json['results']['completionTime']=self.schedule[-1][1]  
-                completionTime=self.schedule[-1][1]  
+                json['results']['completionTime']=self.schedule[-1][1]    
             #else input "still in progress"
             else:
-                json['results']['completionTime']="still in progress"  
-                completionTime=None
-            
-            if completionTime and self.dueDate:
-                delay=completionTime-self.dueDate
-                json['results']['delay']=delay
+                json['results']['completionTime']="still in progress"    
                 
-            json['results']['schedule']=[]
+            json['results']['schedule']={}
             i=0
             for record in self.schedule:               
                 json['results']['schedule'].append({})                                  # dictionary holding time and 

dream/tests/dump/Topology18.json.result

@@ -88,4 +88,4 @@
  "general": {
   "_class": "Dream.Configuration"
  }
-}
\ No newline at end of file
+}

dream/tests/dump/Topology19.json.result

@@ -132,4 +132,4 @@
  "general": {
   "_class": "Dream.Configuration"
  }
-}
\ No newline at end of file
+}

dream/tests/dump/Topology20.json.result

@@ -194,4 +194,4 @@
  "general": {
   "_class": "Dream.Configuration"
  }
-}
\ No newline at end of file
+}