From 49984d5626186c978c5469549a0836add6209c20 Mon Sep 17 00:00:00 2001 From: Alexandre Hamez Date: Mon, 26 Sep 2016 22:43:36 +0200 Subject: [PATCH] Add models to tests --- tests/test_models/models/net/conf.json | 57 +++++++++++++++----------- tests/test_models/models/net/p5.net | 36 ++++++++++++++++ tests/test_models/models/net/p6.net | 43 +++++++++++++++++++ 3 files changed, 111 insertions(+), 25 deletions(-) create mode 100644 tests/test_models/models/net/p5.net create mode 100644 tests/test_models/models/net/p6.net diff --git a/tests/test_models/models/net/conf.json b/tests/test_models/models/net/conf.json index bc3f90c..92a9f1e 100644 --- a/tests/test_models/models/net/conf.json +++ b/tests/test_models/models/net/conf.json @@ -1,27 +1,34 @@ { - "arguments": [ - "", - "--order-force", - "--dead-states", - "--order-force --dead-states", - "--order-lexical" - ], - "models": { - "CSRepetitions-PT-02.net": { - "states": 7424 - }, - "inhibitor.net": { - "states": 12 - }, - "reset.net": { - "states": 2 - }, - "rpr555.net": { - "states": 966 - }, - "test.net": { - "states": 6 - } + "arguments": [ + "", + "--order-force", + "--dead-states", + "--order-force --dead-states", + "--order-lexical", + "--dead-transitions" + ], + "models": { + "CSRepetitions-PT-02.net": { + "states": 7424 }, - "type": "net" -} + "inhibitor.net": { + "states": 12 + }, + "reset.net": { + "states": 2 + }, + "rpr555.net": { + "states": 966 + }, + "test.net": { + "states": 6 + }, + "p5.net": { + "states": 2164 + }, + "p6.net": { + "states": 10054 + } + }, + "type": "net" +} \ No newline at end of file diff --git a/tests/test_models/models/net/p5.net b/tests/test_models/models/net/p5.net new file mode 100644 index 0000000..d763800 --- /dev/null +++ b/tests/test_models/models/net/p5.net @@ -0,0 +1,36 @@ +net {(1.philo | 2.philo | 3.philo | 4.philo | 5.philo)} +tr {1.e} {1.p6} {1.p3} -> {1.p4-eats} +tr {1.t} {1.p2-thinks} -> {1.p1} {1.p5} +tr {1.t0|2.t4} : b0 {2.p4-eats} -> {1.f} {2.f} {2.p2-thinks} +tr {1.t2} {1.f} {1.p5} -> {1.p6} +tr {1.t3|2.t1} : a0 {1.f} {2.p1} -> {2.p3} +tr {2.e} {2.p6} {2.p3} -> {2.p4-eats} +tr {2.t} {2.p2-thinks} -> {2.p1} {2.p5} +tr {2.t0|3.t4} : b1 {3.p4-eats} -> {2.f} {3.f} {3.p2-thinks} +tr {2.t2} {2.f} {2.p5} -> {2.p6} +tr {2.t3|3.t1} : a1 {2.f} {3.p1} -> {3.p3} +tr {3.e} {3.p6} {3.p3} -> {3.p4-eats} +tr {3.t} {3.p2-thinks} -> {3.p1} {3.p5} +tr {3.t0|4.t4} : b2 {4.p4-eats} -> {3.f} {4.f} {4.p2-thinks} +tr {3.t2} {3.f} {3.p5} -> {3.p6} +tr {3.t3|4.t1} : a2 {3.f} {4.p1} -> {4.p3} +tr {4.e} {4.p6} {4.p3} -> {4.p4-eats} +tr {4.t} {4.p2-thinks} -> {4.p1} {4.p5} +tr {4.t0|5.t4} : b3 {5.p4-eats} -> {4.f} {5.f} {5.p2-thinks} +tr {4.t2} {4.f} {4.p5} -> {4.p6} +tr {4.t3|5.t1} : a3 {4.f} {5.p1} -> {5.p3} +tr {5.e} {5.p6} {5.p3} -> {5.p4-eats} +tr {5.t} {5.p2-thinks} -> {5.p1} {5.p5} +tr {5.t0|1.t4} : b4 {1.p4-eats} -> {1.f} {1.p2-thinks} {5.f} +tr {5.t2} {5.f} {5.p5} -> {5.p6} +tr {5.t3|1.t1} : a4 {1.p1} {5.f} -> {1.p3} +pl {1.f} (1) +pl {1.p2-thinks} (1) +pl {2.f} (1) +pl {2.p2-thinks} (1) +pl {3.f} (1) +pl {3.p2-thinks} (1) +pl {4.f} (1) +pl {4.p2-thinks} (1) +pl {5.f} (1) +pl {5.p2-thinks} (1) diff --git a/tests/test_models/models/net/p6.net b/tests/test_models/models/net/p6.net new file mode 100644 index 0000000..4798fa9 --- /dev/null +++ b/tests/test_models/models/net/p6.net @@ -0,0 +1,43 @@ +net {(1.philo | 2.philo | 3.philo | 4.philo | 5.philo | 6.philo)} +tr {1.e} {1.p6} {1.p3} -> {1.p4-eats} +tr {1.t} {1.p2-thinks} -> {1.p1} {1.p5} +tr {1.t0|2.t4} : b0 {2.p4-eats} -> {1.f} {2.f} {2.p2-thinks} +tr {1.t2} {1.f} {1.p5} -> {1.p6} +tr {1.t3|2.t1} : a0 {1.f} {2.p1} -> {2.p3} +tr {2.e} {2.p6} {2.p3} -> {2.p4-eats} +tr {2.t} {2.p2-thinks} -> {2.p1} {2.p5} +tr {2.t0|3.t4} : b1 {3.p4-eats} -> {2.f} {3.f} {3.p2-thinks} +tr {2.t2} {2.f} {2.p5} -> {2.p6} +tr {2.t3|3.t1} : a1 {2.f} {3.p1} -> {3.p3} +tr {3.e} {3.p6} {3.p3} -> {3.p4-eats} +tr {3.t} {3.p2-thinks} -> {3.p1} {3.p5} +tr {3.t0|4.t4} : b2 {4.p4-eats} -> {3.f} {4.f} {4.p2-thinks} +tr {3.t2} {3.f} {3.p5} -> {3.p6} +tr {3.t3|4.t1} : a2 {3.f} {4.p1} -> {4.p3} +tr {4.e} {4.p6} {4.p3} -> {4.p4-eats} +tr {4.t} {4.p2-thinks} -> {4.p1} {4.p5} +tr {4.t0|5.t4} : b3 {5.p4-eats} -> {4.f} {5.f} {5.p2-thinks} +tr {4.t2} {4.f} {4.p5} -> {4.p6} +tr {4.t3|5.t1} : a3 {4.f} {5.p1} -> {5.p3} +tr {5.e} {5.p6} {5.p3} -> {5.p4-eats} +tr {5.t} {5.p2-thinks} -> {5.p1} {5.p5} +tr {5.t0|6.t4} : b4 {6.p4-eats} -> {5.f} {6.f} {6.p2-thinks} +tr {5.t2} {5.f} {5.p5} -> {5.p6} +tr {5.t3|6.t1} : a4 {5.f} {6.p1} -> {6.p3} +tr {6.e} {6.p6} {6.p3} -> {6.p4-eats} +tr {6.t} {6.p2-thinks} -> {6.p1} {6.p5} +tr {6.t0|1.t4} : b5 {1.p4-eats} -> {1.f} {1.p2-thinks} {6.f} +tr {6.t2} {6.f} {6.p5} -> {6.p6} +tr {6.t3|1.t1} : a5 {1.p1} {6.f} -> {1.p3} +pl {1.f} (1) +pl {1.p2-thinks} (1) +pl {2.f} (1) +pl {2.p2-thinks} (1) +pl {3.f} (1) +pl {3.p2-thinks} (1) +pl {4.f} (1) +pl {4.p2-thinks} (1) +pl {5.f} (1) +pl {5.p2-thinks} (1) +pl {6.f} (1) +pl {6.p2-thinks} (1)