From 4997514952011f2f096c41cada2215ab54ff604a Mon Sep 17 00:00:00 2001
From: Michael Leuschel <leuschel@uni-duesseldorf.de>
Date: Thu, 4 Feb 2021 14:17:28 +0100
Subject: [PATCH] add saved trace for train example
---
Makefile | 6 +-
Train/Track.svg | 10 +-
traces/SimpleTrainTrack.prob2trace | 456 +++++++++++++++++++++++++++++
3 files changed, 466 insertions(+), 6 deletions(-)
create mode 100644 traces/SimpleTrainTrack.prob2trace
diff --git a/Makefile b/Makefile
index 842e1c0..35c47fa 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,8 @@ all:
$(PROBCLI) Button/button.mch -animate 15 -visb Button/button.json traces/html/button.html
$(PROBCLI) Lift/Lift.mch -property 'groundf=-1 & topf=2' -animate 20 -visb Lift/lift_groups.json traces/html/lift_groups.html
$(PROBCLI) N-Queens/QueensWithEvents.mch -property 'n=8' -animate 15 -visb N-Queens/queens_8.json traces/html/queens8.html
- $(PROBCLI) Physics/MovingParticles3.mch -animate 30 -visb Physics/three_bodies.json traces/html/three_bodies.html
+ $(PROBCLI) Physics/MovingParticles3.mch -animate 500 -visb Physics/three_bodies.json traces/html/three_bodies.html
+ $(PROBCLI) Train/SimpleTrainTrack.mch -trace_replay json traces/SimpleTrainTrack.prob2trace -visb Train/Track.json traces/html/Track.html
+
+track:
+ $(PROBCLI) Train/SimpleTrainTrack.mch -trace_replay json traces/SimpleTrainTrack.prob2trace -visb Train/Track.json traces/html/Track.html
\ No newline at end of file
diff --git a/Train/Track.svg b/Train/Track.svg
index 220bb0c..01582a7 100644
--- a/Train/Track.svg
+++ b/Train/Track.svg
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns="http://www.w3.org/2000/svg"
- width="750"
- height="300"
- viewBox="0 5 150 65"
+ width="900"
+ height="400"
+ viewBox="5 15 150 30"
version="1.1"
id="svg5154">
@@ -68,8 +68,8 @@
class = "ttd blue-cleared-ttd"
transform="translate(10,23)" />
- <text text-align="left" x="5" y="41"
+ <text text-align="left" x="5" y="28"
font-size ="2" fill="gray" font-family="sans-serif">
- <tspan x="15" dy = "0.6em" id="visb_debug_messages">.TXT</tspan>
+ <tspan x="15" dy = "0.6em" id="visb_debug_messages"> </tspan>
</text>
</svg>
\ No newline at end of file
diff --git a/traces/SimpleTrainTrack.prob2trace b/traces/SimpleTrainTrack.prob2trace
new file mode 100644
index 0000000..14248fd
--- /dev/null
+++ b/traces/SimpleTrainTrack.prob2trace
@@ -0,0 +1,456 @@
+{
+ "description": "",
+ "transitionList": [
+ {
+ "name": "$setup_constants",
+ "params": null,
+ "results": null,
+ "destState": {
+ "TrackElementNumber": "30",
+ "train_length": "2",
+ "TTD_TrackElements": "{(ttd1↦{0,1,2,3,4,5,6,7,8,9,10}),(ttd2↦{11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}),(ttd3↦{26,27,28,29,30})}",
+ "TRACK": "{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30}"
+ },
+ "destStateNotChanged": [],
+ "preds": null
+ },
+ {
+ "name": "$initialise_machine",
+ "params": null,
+ "results": null,
+ "destState": {
+ "train_rear_end": "0",
+ "occ": "∅"
+ },
+ "destStateNotChanged": [],
+ "preds": null
+ },
+ {
+ "name": "TTD_Occupied",
+ "params": {
+ "ttd": "ttd1"
+ },
+ "results": {},
+ "destState": {
+ "occ": "{ttd1}"
+ },
+ "destStateNotChanged": [
+ "train_rear_end"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "1"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "2"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "3"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "4"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "5"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "6"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "7"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "8"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "9"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "10"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TTD_Occupied",
+ "params": {
+ "ttd": "ttd2"
+ },
+ "results": {},
+ "destState": {
+ "occ": "{ttd1,ttd2}"
+ },
+ "destStateNotChanged": [
+ "train_rear_end"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "11"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TTD_Free",
+ "params": {
+ "ttd": "ttd1"
+ },
+ "results": {},
+ "destState": {
+ "occ": "{ttd2}"
+ },
+ "destStateNotChanged": [
+ "train_rear_end"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "12"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "13"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "14"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "15"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "16"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "17"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "18"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "19"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "20"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "21"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "22"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "23"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "24"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "25"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TTD_Occupied",
+ "params": {
+ "ttd": "ttd3"
+ },
+ "results": {},
+ "destState": {
+ "occ": "{ttd2,ttd3}"
+ },
+ "destStateNotChanged": [
+ "train_rear_end"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "26"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TTD_Free",
+ "params": {
+ "ttd": "ttd2"
+ },
+ "results": {},
+ "destState": {
+ "occ": "{ttd3}"
+ },
+ "destStateNotChanged": [
+ "train_rear_end"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "27"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "28"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ },
+ {
+ "name": "TrainMoveForward",
+ "params": {},
+ "results": {},
+ "destState": {
+ "train_rear_end": "29"
+ },
+ "destStateNotChanged": [
+ "occ"
+ ],
+ "preds": null
+ }
+ ],
+ "metadata": {
+ "fileType": "Trace",
+ "formatVersion": 1,
+ "savedAt": "2021-02-04T09:31:25.718975Z",
+ "creator": "User",
+ "proB2KernelVersion": "4.0.0-SNAPSHOT",
+ "proBCliVersion": "1.11.0-nightly",
+ "modelName": "SimpleTrainTrack"
+ }
+}
\ No newline at end of file
--
GitLab