Skip to content

dream
dream
Commit b2f8d250 authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Sebastien Robin
Browse files
Options

topology01 unit test fixed and added tests for new topologies

parent 88f8b57e
Show whitespace changes
Inline Side-by-side
Showing with 384 additions and 67 deletions
dream/simulation/JSONInputs/Topology01.json
View file @ b2f8d250
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
"_class": "Dream.Configuration", "_class": "Dream.Configuration",
"confidenceLevel": "0.95", "confidenceLevel": "0.95",
"maxSimTime": "1440", "maxSimTime": "1440",
"numberOfReplications": "2", "numberOfReplications": "1",
"trace": "No" "trace": "No"
}, },
"nodes": { "nodes": {
......
dream/test/dump/Topology01.result
View file @ b2f8d250
...@@ -4,89 +4,37 @@ ...@@ -4,89 +4,37 @@
"_class": "Dream.Exit", "_class": "Dream.Exit",
"id": "E1", "id": "E1",
"results": { "results": {
"taktTime": { "throughput": 732,
"max": 1.965846994535519, "takt_time": 1.965846994535519,
"avg": 1.965846994535519, "lifespan": 7.646516393442623
"min": 1.965846994535519
},
"throughput": {
"max": 732,
"avg": 732,
"min": 732
},
"lifespan": {
"max": 7.646516393442623,
"avg": 7.646516393442623,
"min": 7.646516393442623
}
} }
}, },
{ {
"_class": "Dream.Machine", "_class": "Dream.Machine",
"id": "M1", "id": "M1",
"results": { "results": {
"working_ratio": { "working_ratio": 12.760416666666666,
"max": 12.760416666666666, "blockage_ratio": 78.17708333333333,
"avg": 12.760416666666666, "failure_ratio": 9.027777777777779,
"min": 12.760416666666666 "waiting_ratio": 0.034722222222222224
},
"blockage_ratio": {
"max": 78.17708333333333,
"avg": 78.17708333333333,
"min": 78.17708333333333
},
"failure_ratio": {
"max": 9.027777777777779,
"avg": 9.027777777777779,
"min": 9.027777777777779
},
"waiting_ratio": {
"max": 0.034722222222222224,
"avg": 0.034722222222222224,
"min": 0.034722222222222224
}
} }
}, },
{ {
"_class": "Dream.Machine", "_class": "Dream.Machine",
"id": "M2", "id": "M2",
"results": { "results": {
"working_ratio": { "working_ratio": 76.31944444444444,
"max": 76.31944444444444, "blockage_ratio": 0.0,
"avg": 76.31944444444444, "failure_ratio": 19.791666666666668,
"min": 76.31944444444444 "waiting_ratio": 3.888888888888889
},
"blockage_ratio": {
"max": 0.0,
"avg": 0.0,
"min": 0.0
},
"failure_ratio": {
"max": 19.791666666666668,
"avg": 19.791666666666668,
"min": 19.791666666666668
},
"waiting_ratio": {
"max": 3.888888888888889,
"avg": 3.888888888888889,
"min": 3.888888888888889
}
} }
}, },
{ {
"_class": "Dream.Repairman", "_class": "Dream.Repairman",
"id": "W1", "id": "W1",
"results": { "results": {
"working_ratio": { "working_ratio": 26.73611111111111,
"max": 26.73611111111111, "waiting_ratio": 73.26388888888889
"avg": 26.73611111111111,
"min": 26.73611111111111
},
"waiting_ratio": {
"max": 73.26388888888889,
"avg": 73.26388888888889,
"min": 73.26388888888889
}
} }
} }
], ],
......
dream/test/dump/Topology18.result 0 → 100644
View file @ b2f8d250
{
"elementList": [
{
"_class": "Dream.Exit",
"id": "E1",
"results": {
"throughput": 1,
"takt_time": 6,
"lifespan": 6
}
},
{
"_class": "Dream.Job",
"id": "J1",
"results": {
"schedule": {
"1": {
"entranceTime": 0,
"stationId": "M1"
},
"0": {
"entranceTime": 0,
"stationId": "Q1"
},
"3": {
"entranceTime": 1,
"stationId": "M3"
},
"2": {
"entranceTime": 1,
"stationId": "Q3"
},
"5": {
"entranceTime": 4,
"stationId": "M2"
},
"4": {
"entranceTime": 4,
"stationId": "Q2"
},
"6": {
"entranceTime": 6,
"stationId": "E1"
}
}
}
},
{
"_class": "Dream.Machine",
"id": "M1",
"results": {
"working_ratio": 16.666666666666668,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 83.33333333333333
}
},
{
"_class": "Dream.Machine",
"id": "M2",
"results": {
"working_ratio": 33.333333333333336,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 66.66666666666667
}
},
{
"_class": "Dream.Machine",
"id": "M3",
"results": {
"working_ratio": 50.0,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 50.0
}
}
],
"_class": "Dream.Simulation",
"general": {
"_class": "Dream.Configuration"
}
}
\ No newline at end of file
dream/test/dump/Topology19.result 0 → 100644
View file @ b2f8d250
{
"elementList": [
{
"_class": "Dream.Exit",
"id": "E1",
"results": {
"throughput": 2,
"takt_time": 6,
"lifespan": 9
}
},
{
"_class": "Dream.Job",
"id": "J1",
"results": {
"schedule": {
"1": {
"entranceTime": 0,
"stationId": "M1"
},
"0": {
"entranceTime": 0,
"stationId": "Q1"
},
"3": {
"entranceTime": 1,
"stationId": "M3"
},
"2": {
"entranceTime": 1,
"stationId": "Q3"
},
"5": {
"entranceTime": 4,
"stationId": "M2"
},
"4": {
"entranceTime": 4,
"stationId": "Q2"
},
"6": {
"entranceTime": 6,
"stationId": "E1"
}
}
}
},
{
"_class": "Dream.Job",
"id": "J2",
"results": {
"schedule": {
"1": {
"entranceTime": 0,
"stationId": "M2"
},
"0": {
"entranceTime": 0,
"stationId": "Q2"
},
"3": {
"entranceTime": 4,
"stationId": "M3"
},
"2": {
"entranceTime": 3,
"stationId": "Q3"
},
"5": {
"entranceTime": 6,
"stationId": "M2"
},
"4": {
"entranceTime": 5,
"stationId": "Q2"
},
"6": {
"entranceTime": 13,
"stationId": "E1"
}
}
}
},
{
"_class": "Dream.Machine",
"id": "M1",
"results": {
"working_ratio": 7.6923076923076925,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 92.3076923076923
}
},
{
"_class": "Dream.Machine",
"id": "M2",
"results": {
"working_ratio": 92.3076923076923,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 7.6923076923076925
}
},
{
"_class": "Dream.Machine",
"id": "M3",
"results": {
"working_ratio": 30.76923076923077,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 69.23076923076923
}
}
],
"_class": "Dream.Simulation",
"general": {
"_class": "Dream.Configuration"
}
}
\ No newline at end of file
dream/test/dump/Topology20.result 0 → 100644
View file @ b2f8d250
{
"elementList": [
{
"_class": "Dream.Exit",
"id": "E1",
"results": {
"throughput": 4,
"takt_time": 5,
"lifespan": 14
}
},
{
"_class": "Dream.Job",
"id": "J1",
"results": {
"schedule": {
"1": {
"entranceTime": 0,
"stationId": "M1"
},
"0": {
"entranceTime": 0,
"stationId": "Q1"
},
"3": {
"entranceTime": 1,
"stationId": "M3"
},
"2": {
"entranceTime": 1,
"stationId": "Q3"
},
"5": {
"entranceTime": 19,
"stationId": "M2"
},
"4": {
"entranceTime": 4,
"stationId": "Q2"
},
"6": {
"entranceTime": 23,
"stationId": "E1"
}
}
}
},
{
"_class": "Dream.Job",
"id": "J2",
"results": {
"schedule": {
"1": {
"entranceTime": 2,
"stationId": "M2"
},
"0": {
"entranceTime": 0,
"stationId": "Q2"
},
"3": {
"entranceTime": 5,
"stationId": "M3"
},
"2": {
"entranceTime": 5,
"stationId": "Q3"
},
"5": {
"entranceTime": 12,
"stationId": "M2"
},
"4": {
"entranceTime": 6,
"stationId": "Q2"
},
"6": {
"entranceTime": 19,
"stationId": "E1"
}
}
}
},
{
"_class": "Dream.Job",
"id": "J3",
"results": {
"schedule": {
"1": {
"entranceTime": 0,
"stationId": "M2"
},
"0": {
"entranceTime": 0,
"stationId": "Q2"
},
"3": {
"entranceTime": 4,
"stationId": "M3"
},
"2": {
"entranceTime": 2,
"stationId": "Q3"
},
"4": {
"entranceTime": 5,
"stationId": "E1"
}
}
}
},
{
"_class": "Dream.Job",
"id": "J4",
"results": {
"schedule": {
"1": {
"entranceTime": 5,
"stationId": "M2"
},
"0": {
"entranceTime": 0,
"stationId": "Q2"
},
"2": {
"entranceTime": 12,
"stationId": "E1"
}
}
}
},
{
"_class": "Dream.Machine",
"id": "M1",
"results": {
"working_ratio": 4.3478260869565215,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 95.65217391304348
}
},
{
"_class": "Dream.Machine",
"id": "M2",
"results": {
"working_ratio": 100.0,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 0.0
}
},
{
"_class": "Dream.Machine",
"id": "M3",
"results": {
"working_ratio": 21.73913043478261,
"blockage_ratio": 0.0,
"failure_ratio": 0.0,
"waiting_ratio": 78.26086956521739
}
}
],
"_class": "Dream.Simulation",
"general": {
"_class": "Dream.Configuration"
}
}
\ No newline at end of file
dream/test/testSimulationTopology.py
View file @ b2f8d250
...@@ -66,7 +66,7 @@ class SimulationTopology(TestCase): ...@@ -66,7 +66,7 @@ class SimulationTopology(TestCase):
self.assertEquals(stable_result, dump_result, "outputs are different") self.assertEquals(stable_result, dump_result, "outputs are different")
# Automatically create a test method for every topology # Automatically create a test method for every topology
for x in range(1, 18): for x in range(1, 21):
def getTestTopology(): def getTestTopology():
filename = "Topology%02i" % x filename = "Topology%02i" % x
def test_topology(self): def test_topology(self):
......
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