dump updated now that Operator and CapacityStation output family

dream/tests/dump/Topology01.json.result

@@ -47,6 +47,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 73.26388888888889, 

dream/tests/dump/Topology03.json.result

@@ -41,6 +41,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 73.26388888888889, 

dream/tests/dump/Topology04.json.result

@@ -47,6 +47,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 73.26388888888889, 

dream/tests/dump/Topology06.json.result

@@ -58,6 +58,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 73.26388888888889, 

dream/tests/dump/Topology11.json.result

@@ -58,6 +58,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 100.0, 

dream/tests/dump/Topology12.json.result

@@ -69,6 +69,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 100.0, 

dream/tests/dump/Topology15.json.result

@@ -50,6 +50,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 73.26388888888889, 

dream/tests/dump/Topology16.json.result

@@ -61,6 +61,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 73.26388888888889, 

dream/tests/dump/Topology28.json.result

@@ -35,6 +35,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology31.json.result

@@ -47,6 +47,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 73.26388888888889, 

dream/tests/dump/Topology33.json.result

@@ -69,6 +69,7 @@
   }, 
   {
    "_class": "Dream.Repairman", 
+   "family": "Operator", 
    "id": "W1", 
    "results": {
     "waiting_ratio": 100.0, 

dream/tests/dump/Topology42.json.result

@@ -38,6 +38,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology43.json.result

@@ -84,6 +84,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 100.0, 
@@ -92,6 +93,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O2", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology44.json.result

@@ -178,6 +178,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology45.json.result

@@ -119,6 +119,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 66.66666666666667, 
@@ -127,6 +128,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O2", 
    "results": {
     "waiting_ratio": 66.66666666666667, 
@@ -135,6 +137,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O3", 
    "results": {
     "waiting_ratio": 33.333333333333336, 

dream/tests/dump/Topology46.json.result

@@ -39,6 +39,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 55.55555555555556, 
@@ -47,6 +48,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O2", 
    "results": {
     "waiting_ratio": 88.88888888888889, 

dream/tests/dump/Topology47.json.result

@@ -38,7 +38,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 66.66666666666667, 

dream/tests/dump/Topology56.json.result

@@ -301,7 +301,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology57.json.result

@@ -302,6 +302,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology58.json.result

@@ -441,7 +441,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.0, 
@@ -449,7 +450,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 30.8457711442786, 

dream/tests/dump/Topology59.json.result

@@ -441,7 +441,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology61.json.result

@@ -441,7 +441,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology62.json.result

@@ -441,7 +441,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology66.json.result

@@ -627,7 +627,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.5847953216374352, 
@@ -635,7 +636,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 50.584795321637436, 

dream/tests/dump/Topology67.json.result

@@ -767,7 +767,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.0, 
@@ -775,7 +776,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 62.634408602150536, 
@@ -783,7 +785,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP3", 
    "results": {
     "waiting_ratio": 62.63440860215052, 

dream/tests/dump/Topology68.json.result

@@ -767,7 +767,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.5347593582887585, 
@@ -775,7 +776,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 62.8342245989305, 
@@ -783,7 +785,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP3", 
    "results": {
     "waiting_ratio": 62.8342245989305, 

dream/tests/dump/Topology69.json.result

@@ -97,6 +97,7 @@
   }, 
   {
    "_class": "Dream.Operator", 
+   "family": "Operator", 
    "id": "O1", 
    "results": {
     "waiting_ratio": 0.0, 

dream/tests/dump/Topology70.json.result

@@ -623,7 +623,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 2.7863777089783235, 
@@ -631,7 +632,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 49.845201238390096, 

dream/tests/dump/Topology71.json.result

@@ -620,7 +620,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 17.60563380281689, 
@@ -628,7 +629,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 48.94366197183098, 

dream/tests/dump/Topology72.json.result

@@ -616,7 +616,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 16.53543307086615, 
@@ -624,7 +625,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 53.1496062992126, 

dream/tests/dump/Topology73.json.result

@@ -767,7 +767,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP1", 
    "results": {
     "waiting_ratio": 0.5347593582887585, 
@@ -775,7 +776,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP2", 
    "results": {
     "waiting_ratio": 62.8342245989305, 
@@ -783,7 +785,8 @@
    }
   }, 
   {
-   "_class": "Dream.Operator", 
+   "_class": "Dream.OperatorManagedJob", 
+   "family": "Operator", 
    "id": "OP3", 
    "results": {
     "waiting_ratio": 62.8342245989305, 

dream/tests/dump/Topology76.json.result

@@ -25,6 +25,7 @@
   }, 
   {
    "_class": "Dream.CapacityStation", 
+   "family": "CapacityStation", 
    "id": "CS1", 
    "results": {
     "capacityUsed": [
@@ -76,6 +77,7 @@
   }, 
   {
    "_class": "Dream.CapacityStation", 
+   "family": "CapacityStation", 
    "id": "CS2", 
    "results": {
     "capacityUsed": [

dream/tests/dump/Topology77.json.result

@@ -37,6 +37,7 @@
   }, 
   {
    "_class": "Dream.CapacityStation", 
+   "family": "CapacityStation", 
    "id": "CS1", 
    "results": {
     "capacityUsed": [
@@ -92,6 +93,7 @@
   }, 
   {
    "_class": "Dream.CapacityStation", 
+   "family": "CapacityStation", 
    "id": "CS2", 
    "results": {
     "capacityUsed": [
@@ -147,6 +149,7 @@
   }, 
   {
    "_class": "Dream.CapacityStation", 
+   "family": "CapacityStation", 
    "id": "CS3", 
    "results": {
     "capacityUsed": [
@@ -202,6 +205,7 @@
   }, 
   {
    "_class": "Dream.CapacityStation", 
+   "family": "CapacityStation", 
    "id": "CS4", 
    "results": {
     "capacityUsed": [