Output queues in results

This is mostly to have an id in the result json and be able to display it as a station for gantt by station

Output queues in results
This is mostly to have an id in the result json and be able to display it as a station for gantt by station
7dc0cc78 · Jérome Perrin · 7bca22bf · 7dc0cc78 · 7dc0cc78 · 7dc0cc78
Commit 7dc0cc78 authored Dec 19, 2013 by Jérome Perrin
25 changed files
--- a/dream/platform/static/src/dream_launcher.js
+++ b/dream/platform/static/src/dream_launcher.js
@@ -381,7 +381,7 @@


              $.each(data['success'].elementList, function (idx, obj) {
-                if (obj.results.working_ratio !== undefined) {
+                if (obj.results !== undefined && obj.results.working_ratio !== undefined) {
                  /* when there is only one replication, the ratio is given as a float,
                      otherwise we have a mapping avg, min max */
                  if (obj.results.blockage_ratio !== undefined) {

--- a/dream/simulation/Queue.py
+++ b/dream/simulation/Queue.py
@@ -278,3 +278,9 @@ class Queue(CoreObject):
        else:
          assert False, "Unknown scheduling criterion %r" % (criterion, )

+    def outputResultsJSON(self):
+        from Globals import G
+        json = {'_class': 'Dream.%s' % self.__class__.__name__,
+                'id': str(self.id),
+                'schedulingRule': self.schedulingRule}
+        G.outputJSON['elementList'].append(json)
--- a/dream/tests/dump/Topology01.json.result
+++ b/dream/tests/dump/Topology01.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 
@@ -29,6 +34,11 @@
    "waiting_ratio": 3.888888888888889
   }
  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Repairman", 
   "id": "W1", 

--- a/dream/tests/dump/Topology03.json.result
+++ b/dream/tests/dump/Topology03.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 

--- a/dream/tests/dump/Topology04.json.result
+++ b/dream/tests/dump/Topology04.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 
@@ -29,6 +34,11 @@
    "waiting_ratio": 0.0
   }
  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Repairman", 
   "id": "W1", 

--- a/dream/tests/dump/Topology05.json.result
+++ b/dream/tests/dump/Topology05.json.result
@@ -37,6 +37,11 @@
    "failure_ratio": 19.444444444444443, 
    "waiting_ratio": 18.368055555555557
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology06.json.result
+++ b/dream/tests/dump/Topology06.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 
@@ -39,6 +44,11 @@
    "waiting_ratio": 18.680555555555557
   }
  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Repairman", 
   "id": "W1", 

--- a/dream/tests/dump/Topology07.json.result
+++ b/dream/tests/dump/Topology07.json.result
@@ -38,6 +38,11 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 1.875
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology08.json.result
+++ b/dream/tests/dump/Topology08.json.result
@@ -48,6 +48,11 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 0.017361111111111112
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology10.json.result
+++ b/dream/tests/dump/Topology10.json.result
@@ -48,6 +48,11 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 0.052083333333333336
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology11.json.result
+++ b/dream/tests/dump/Topology11.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 
@@ -39,6 +44,11 @@
    "waiting_ratio": 0.10416666666666667
   }
  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Repairman", 
   "id": "W1", 

--- a/dream/tests/dump/Topology12.json.result
+++ b/dream/tests/dump/Topology12.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 
@@ -49,6 +54,11 @@
    "waiting_ratio": 0.1388888888888889
   }
  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Repairman", 
   "id": "W1", 

--- a/dream/tests/dump/Topology15.json.result
+++ b/dream/tests/dump/Topology15.json.result
@@ -9,6 +9,11 @@
    "waiting_ratio": 6.887731481480949
   }
  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 

--- a/dream/tests/dump/Topology16.json.result
+++ b/dream/tests/dump/Topology16.json.result
@@ -9,6 +9,11 @@
    "waiting_ratio": 6.601851851851579
   }
  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 

--- a/dream/tests/dump/Topology17.json.result
+++ b/dream/tests/dump/Topology17.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 
@@ -28,6 +33,11 @@
    "failure_ratio": 19.444444444444443, 
    "waiting_ratio": 3.1944444444444446
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology18.json.result
+++ b/dream/tests/dump/Topology18.json.result
@@ -143,6 +143,21 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 50.0
   }
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q3", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology19.json.result
+++ b/dream/tests/dump/Topology19.json.result
@@ -248,6 +248,21 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 69.23076923076923
   }
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q3", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology20.json.result
+++ b/dream/tests/dump/Topology20.json.result
@@ -396,6 +396,21 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 78.26086956521739
   }
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q2", 
+   "schedulingRule": "MC"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q3", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology21.json.result
+++ b/dream/tests/dump/Topology21.json.result
@@ -18,6 +18,11 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 20.03472222222222
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology22.json.result
+++ b/dream/tests/dump/Topology22.json.result
@@ -38,6 +38,16 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 75.06944444444444
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology23.json.result
+++ b/dream/tests/dump/Topology23.json.result
@@ -38,6 +38,16 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 75.06944444444444
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.LineClearance", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology24.json.result
+++ b/dream/tests/dump/Topology24.json.result
 {
 "elementList": [
+  {
+   "_class": "Dream.Queue", 
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
+  }, 
  {
   "_class": "Dream.Exit", 
   "id": "E1", 
@@ -28,6 +33,11 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 1.7361111111111112
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology25.json.result
+++ b/dream/tests/dump/Topology25.json.result
@@ -38,6 +38,21 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 7.566666666666668
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.LineClearance", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q3", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology26.json.result
+++ b/dream/tests/dump/Topology26.json.result
@@ -263,6 +263,21 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 32.432432432432435
   }
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "id": "Q3", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation", 

--- a/dream/tests/dump/Topology27.json.result
+++ b/dream/tests/dump/Topology27.json.result
@@ -28,6 +28,16 @@
    "failure_ratio": 0.0, 
    "waiting_ratio": 25.125
   }
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.Queue", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
  }
 ], 
 "_class": "Dream.Simulation",