do not output scheduling rules for queues

dream/simulation/Queue.py

@@ -308,6 +308,5 @@ class Queue(CoreObject):
     def outputResultsJSON(self):
         from Globals import G
         json = {'_class': 'Dream.%s' % self.__class__.__name__,
-                'id': str(self.id),
-                'schedulingRule': self.schedulingRule}
+                'id': str(self.id), }
         G.outputJSON['elementList'].append(json)

dream/tests/dump/Topology01.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -37,8 +36,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Repairman", 

dream/tests/dump/Topology03.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 

dream/tests/dump/Topology04.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -37,8 +36,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Repairman", 

dream/tests/dump/Topology05.json.result

@@ -41,8 +41,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology06.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -47,8 +46,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Repairman", 

dream/tests/dump/Topology07.json.result

@@ -42,8 +42,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology08.json.result

@@ -52,8 +52,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology10.json.result

@@ -52,8 +52,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology11.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -47,8 +46,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Repairman", 

dream/tests/dump/Topology12.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -57,8 +56,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Repairman", 

dream/tests/dump/Topology15.json.result

@@ -12,8 +12,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 

dream/tests/dump/Topology16.json.result

@@ -12,8 +12,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 

dream/tests/dump/Topology17.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -37,8 +36,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology18.json.result

@@ -145,18 +145,15 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q3", 
-   "schedulingRule": "FIFO"
+   "id": "Q3"
   }
  ], 
  "general": {

dream/tests/dump/Topology19.json.result

@@ -280,18 +280,15 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q3", 
-   "schedulingRule": "FIFO"
+   "id": "Q3"
   }
  ], 
  "general": {

dream/tests/dump/Topology20.json.result

@@ -444,18 +444,15 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q2", 
-   "schedulingRule": "MC"
+   "id": "Q2"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q3", 
-   "schedulingRule": "FIFO"
+   "id": "Q3"
   }
  ], 
  "general": {

dream/tests/dump/Topology21.json.result

@@ -22,8 +22,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology22.json.result

@@ -42,13 +42,11 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology23.json.result

@@ -42,13 +42,11 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.LineClearance", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology24.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -37,8 +36,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology25.json.result

@@ -42,18 +42,15 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.LineClearance", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q3", 
-   "schedulingRule": "FIFO"
+   "id": "Q3"
   }
  ], 
  "general": {

dream/tests/dump/Topology26.json.result

@@ -291,18 +291,15 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q3", 
-   "schedulingRule": "FIFO"
+   "id": "Q3"
   }
  ], 
  "general": {

dream/tests/dump/Topology27.json.result

@@ -32,13 +32,11 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology29.json.result

@@ -32,13 +32,11 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology30.json.result

@@ -32,13 +32,11 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology31.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -37,8 +36,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology32.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -37,8 +36,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Repairman", 

dream/tests/dump/Topology33.json.result

@@ -3,8 +3,7 @@
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ", 
-   "schedulingRule": "FIFO"
+   "id": "DummyQ"
   }, 
   {
    "_class": "Dream.Exit", 
@@ -57,8 +56,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.Repairman", 

dream/tests/dump/Topology34.json.result

@@ -172,13 +172,11 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueuePreemptive", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology35.json.result

@@ -172,13 +172,11 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueuePreemptive", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology36.json.result

@@ -22,8 +22,7 @@
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }
  ], 
  "general": {

dream/tests/dump/Topology37.json.result

@@ -190,18 +190,15 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q0", 
-   "schedulingRule": "FIFO"
+   "id": "Q0"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }
  ], 
  "general": {

dream/tests/dump/Topology38.json.result

@@ -302,18 +302,15 @@
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q1", 
-   "schedulingRule": "FIFO"
+   "id": "Q1"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q2", 
-   "schedulingRule": "FIFO"
+   "id": "Q2"
   }, 
   {
    "_class": "Dream.QueueJobShop", 
-   "id": "Q3", 
-   "schedulingRule": "FIFO"
+   "id": "Q3"
   }
  ], 
  "general": {