Skip to content

dream
dream
Commit 936f288a authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Jérome Perrin
Browse files
Options

Topologies 34 and 35 updated as QueuePreemptive became deprecated

parent 0da9016c
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 70 deletions
dream/simulation/JSONInputs/Topology34.json
View file @ 936f288a
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
] ]
}, },
"Q2": { "Q2": {
"_class": "Dream.QueuePreemptive", "_class": "Dream.QueueJobShop",
"id": "Q2", "id": "Q2",
"name": "Queue2", "name": "Queue2",
"isDummy": "0", "isDummy": "0",
......
dream/simulation/JSONInputs/Topology35.json
View file @ 936f288a
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
] ]
}, },
"Q2": { "Q2": {
"_class": "Dream.QueuePreemptive", "_class": "Dream.QueueJobShop",
"id": "Q2", "id": "Q2",
"name": "Queue2", "name": "Queue2",
"isDummy": "0", "isDummy": "0",
......
dream/tests/dump/Topology34.json.result
View file @ 936f288a
{ {
"_class": "Dream.Simulation",
"elementList": [ "elementList": [
{ {
"_class": "Dream.Job",
"extraPropertyDict": { "extraPropertyDict": {
"isCritical": "1", "isCritical": "1",
"name": "Component1",
"route": [ "route": [
{ {
"stationIdsList": [
"Q1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationIdsList": [
"Q1"
],
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0.25" "mean": "0.25"
}, },
"stationIdsList": [
"M1"
],
"stepNumber": "1" "stepNumber": "1"
}, },
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationIdsList": [
"Q2"
],
"stepNumber": "2" "stepNumber": "2"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
}, },
"stationIdsList": [
"M2"
],
"stepNumber": "3" "stepNumber": "3"
} }
] ],
"name": "Component1"
}, },
"_class": "Dream.Job",
"id": "C1", "id": "C1",
"results": { "results": {
"completionTime": 1.25, "completionTime": 1.25,
...@@ -82,33 +81,33 @@ ...@@ -82,33 +81,33 @@
} }
}, },
{ {
"_class": "Dream.Job",
"extraPropertyDict": { "extraPropertyDict": {
"isCritical": "0", "isCritical": "0",
"name": "Component2",
"route": [ "route": [
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationIdsList": [
"Q2"
],
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
}, },
"stationIdsList": [
"M2"
],
"stepNumber": "1" "stepNumber": "1"
} }
] ],
"name": "Component2"
}, },
"_class": "Dream.Job",
"id": "C2", "id": "C2",
"results": { "results": {
"completionTime": 2.0, "completionTime": 2.0,
...@@ -145,40 +144,43 @@ ...@@ -145,40 +144,43 @@
"_class": "Dream.Exit", "_class": "Dream.Exit",
"id": "E1", "id": "E1",
"results": { "results": {
"lifespan": 1.625, "throughput": 2,
"takt_time": 1.0, "takt_time": 1.0,
"throughput": 2 "lifespan": 1.625
} }
}, },
{ {
"_class": "Dream.Machine", "_class": "Dream.Machine",
"id": "M1", "id": "M1",
"results": { "results": {
"working_ratio": 12.5,
"blockage_ratio": 0.0, "blockage_ratio": 0.0,
"failure_ratio": 0.0, "failure_ratio": 0.0,
"waiting_ratio": 87.5, "waiting_ratio": 87.5
"working_ratio": 12.5
} }
}, },
{ {
"_class": "Dream.Machine", "_class": "Dream.Machine",
"id": "M2", "id": "M2",
"results": { "results": {
"working_ratio": 100.0,
"blockage_ratio": 0.0, "blockage_ratio": 0.0,
"failure_ratio": 0.0, "failure_ratio": 0.0,
"waiting_ratio": 0.0, "waiting_ratio": 0.0
"working_ratio": 100.0
} }
}, },
{ {
"_class": "Dream.QueueJobShop", "_class": "Dream.QueueJobShop",
"id": "Q1" "id": "Q1",
"schedulingRule": "FIFO"
}, },
{ {
"_class": "Dream.QueuePreemptive", "_class": "Dream.QueueJobShop",
"id": "Q2" "id": "Q2",
"schedulingRule": "FIFO"
} }
], ],
"_class": "Dream.Simulation",
"general": { "general": {
"_class": "Dream.Configuration" "_class": "Dream.Configuration"
} }
......
dream/tests/dump/Topology35.json.result
View file @ 936f288a
{ {
"_class": "Dream.Simulation",
"elementList": [ "elementList": [
{ {
"_class": "Dream.Job",
"extraPropertyDict": { "extraPropertyDict": {
"isCritical": "1", "isCritical": "1",
"name": "Component1",
"route": [ "route": [
{ {
"stationIdsList": [
"Q1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationIdsList": [
"Q1"
],
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0.25" "mean": "0.25"
}, },
"stationIdsList": [
"M1"
],
"stepNumber": "1" "stepNumber": "1"
}, },
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationIdsList": [
"Q2"
],
"stepNumber": "2" "stepNumber": "2"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
}, },
"stationIdsList": [
"M2"
],
"stepNumber": "3" "stepNumber": "3"
} }
] ],
"name": "Component1"
}, },
"_class": "Dream.Job",
"id": "C1", "id": "C1",
"results": { "results": {
"completionTime": 1.25, "completionTime": 1.25,
...@@ -82,33 +81,33 @@ ...@@ -82,33 +81,33 @@
} }
}, },
{ {
"_class": "Dream.Job",
"extraPropertyDict": { "extraPropertyDict": {
"isCritical": "0", "isCritical": "0",
"name": "Component2",
"route": [ "route": [
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationIdsList": [
"Q2"
],
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
}, },
"stationIdsList": [
"M2"
],
"stepNumber": "1" "stepNumber": "1"
} }
] ],
"name": "Component2"
}, },
"_class": "Dream.Job",
"id": "C2", "id": "C2",
"results": { "results": {
"completionTime": 2.25, "completionTime": 2.25,
...@@ -145,40 +144,43 @@ ...@@ -145,40 +144,43 @@
"_class": "Dream.Exit", "_class": "Dream.Exit",
"id": "E1", "id": "E1",
"results": { "results": {
"lifespan": 1.75, "throughput": 2,
"takt_time": 1.125, "takt_time": 1.125,
"throughput": 2 "lifespan": 1.75
} }
}, },
{ {
"_class": "Dream.Machine", "_class": "Dream.Machine",
"id": "M1", "id": "M1",
"results": { "results": {
"working_ratio": 11.11111111111111,
"blockage_ratio": 0.0, "blockage_ratio": 0.0,
"failure_ratio": 0.0, "failure_ratio": 0.0,
"waiting_ratio": 88.88888888888889, "waiting_ratio": 88.88888888888889
"working_ratio": 11.11111111111111
} }
}, },
{ {
"_class": "Dream.Machine", "_class": "Dream.Machine",
"id": "M2", "id": "M2",
"results": { "results": {
"working_ratio": 100.0,
"blockage_ratio": 0.0, "blockage_ratio": 0.0,
"failure_ratio": 0.0, "failure_ratio": 0.0,
"waiting_ratio": 0.0, "waiting_ratio": 0.0
"working_ratio": 100.0
} }
}, },
{ {
"_class": "Dream.QueueJobShop", "_class": "Dream.QueueJobShop",
"id": "Q1" "id": "Q1",
"schedulingRule": "FIFO"
}, },
{ {
"_class": "Dream.QueuePreemptive", "_class": "Dream.QueueJobShop",
"id": "Q2" "id": "Q2",
"schedulingRule": "FIFO"
} }
], ],
"_class": "Dream.Simulation",
"general": { "general": {
"_class": "Dream.Configuration" "_class": "Dream.Configuration"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7