update model notebook example

48a19e14 · Michael Leuschel · b2e828b6 · 48a19e14
Commit 48a19e14 authored Jun 6, 2018 by Michael Leuschel
--- a/notebooks/models/scheduler.ipynb
+++ b/notebooks/models/scheduler.ipynb
@@ -11,12 +11,11 @@
     "name": "stdout",
     "output_type": "stream",
     "text": [
-      "[2018-05-16 15:53:50,753, T+11361] \"Shell-0\" de.prob.cli.PrologProcessProvider.makeProcess(PrologProcessProvider.java:64): [INFO] Starting ProB's Prolog Core. Path is /Users/leuschel/.prob/prob2-3.2.10-SNAPSHOT/probcli.sh\n",
-      "[2018-05-16 15:53:51,892, T+12500] \"Shell-0\" de.prob.cli.PortPattern.setValue(PortPattern.java:30): [INFO] Server has started and listens on port 62790\n",
-      "[2018-05-16 15:53:51,893, T+12501] \"Shell-0\" de.prob.cli.InterruptRefPattern.setValue(InterruptRefPattern.java:29): [INFO] Server can receive user interrupts via reference 21692\n",
-      "[2018-05-16 15:53:51,895, T+12503] \"ProB Output Logger for instance 6df67e5a\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] -- starting command loop --\u001b[0m\n",
-      "[2018-05-16 15:53:51,913, T+12521] \"ProB Output Logger for instance 6df67e5a\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] Connected: 127.0.0.1\u001b[0m\n",
-      "[2018-05-16 15:53:52,150, T+12758] \"ProB Output Logger for instance 6df67e5a\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] loading_classical_b(parser_version(2018-05-16 11:45:20.017),scheduler,[/Users/leuschel/git_root/JAVAPROB/prob2-jupyter-kernel/notebooks/models/scheduler.mch,/Users/leuschel/git_root/JAVAPROB/prob2-jupyter-kernel/notebooks/models/LibraryMeta.def])\u001b[0m\n"
+      "[2018-06-06 08:57:28,567, T+7800] \"Shell-0\" de.prob.cli.PrologProcessProvider.makeProcess(PrologProcessProvider.java:64): [INFO] Starting ProB's Prolog Core. Path is /Users/leuschel/git_root/prob_prolog/probcli.sh\n",
+      "[2018-06-06 08:57:29,600, T+8833] \"Shell-0\" de.prob.cli.PortPattern.setValue(PortPattern.java:30): [INFO] Server has started and listens on port 53579\n",
+      "[2018-06-06 08:57:29,601, T+8834] \"Shell-0\" de.prob.cli.InterruptRefPattern.setValue(InterruptRefPattern.java:29): [INFO] Server can receive user interrupts via reference 65646\n",
+      "[2018-06-06 08:57:29,603, T+8836] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] -- starting command loop --\u001b[0m\n",
+      "[2018-06-06 08:57:29,619, T+8852] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] Connected: 127.0.0.1\u001b[0m\n"
     ]
    },
    {
@@ -56,7 +55,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
   "metadata": {},
   "outputs": [
    {
@@ -66,10 +65,11 @@
       "Sets: PID\n",
       "Constants: (none)\n",
       "Variables: active, ready, waiting\n",
-       "Operations: rr <-- nr_ready, new(pp), del(pp), ready(rr), swap\n"
+       "Operations: \n",
+       "0: $initialise_machine()"
      ]
     },
-     "execution_count": 4,
+     "execution_count": 3,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -80,15 +80,15 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 4,
   "metadata": {},
   "outputs": [
    {
-     "ename": "UserErrorException",
-     "evalue": "NOT-INITIALISED",
+     "ename": "CommandExecutionException",
+     "evalue": ":eval: NOT-INITIALISED",
     "output_type": "error",
     "traceback": [
-      "\u001b[1m\u001b[31mNOT-INITIALISED\u001b[0m"
+      "\u001b[1m\u001b[31m:eval: NOT-INITIALISED\u001b[0m"
     ]
    }
   ],
@@ -98,36 +98,36 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 5,
   "metadata": {},
   "outputs": [
    {
     "data": {
      "text/plain": [
-       "Executed operation $initialise_machine"
+       "Executed operation 0: $initialise_machine()"
      ]
     },
-     "execution_count": 10,
+     "execution_count": 5,
     "metadata": {},
     "output_type": "execute_result"
    }
   ],
   "source": [
-    ":exec $initialise_machine"
+    ":exec INITIALISATION"
   ]
  },
  {
   "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 6,
   "metadata": {},
   "outputs": [
    {
     "data": {
      "text/plain": [
-       "Executed operation new"
+       "Executed operation 2: new(PID1)"
      ]
     },
-     "execution_count": 11,
+     "execution_count": 6,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -138,7 +138,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 7,
   "metadata": {},
   "outputs": [
    {
@@ -147,7 +147,7 @@
       "{PID1}"
      ]
     },
-     "execution_count": 12,
+     "execution_count": 7,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -158,25 +158,25 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 8,
   "metadata": {},
   "outputs": [
    {
     "name": "stdout",
     "output_type": "stream",
     "text": [
-      "[2018-05-16 15:57:55,578, T+256186] \"ProB Output Logger for instance 6df67e5a\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] \u001b[0m\n",
-      "[2018-05-16 15:57:55,579, T+256187] \"ProB Output Logger for instance 6df67e5a\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] ALL OPERATIONS COVERED\u001b[0m\n",
-      "[2018-05-16 15:57:55,579, T+256187] \"ProB Output Logger for instance 6df67e5a\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] \u001b[0m\n"
+      "[2018-06-06 08:57:52,255, T+31488] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] \u001b[0m\n",
+      "[2018-06-06 08:57:52,256, T+31489] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] ALL OPERATIONS COVERED\u001b[0m\n",
+      "[2018-06-06 08:57:52,257, T+31490] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] \u001b[0m\n"
     ]
    },
    {
     "data": {
      "text/plain": [
-       "Executed operation ready"
+       "Executed operation 9: ready(PID1)"
      ]
     },
-     "execution_count": 13,
+     "execution_count": 8,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -187,7 +187,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 9,
   "metadata": {},
   "outputs": [
    {
@@ -196,7 +196,7 @@
       "{PID1}"
      ]
     },
-     "execution_count": 14,
+     "execution_count": 9,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -207,16 +207,16 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 10,
   "metadata": {},
   "outputs": [
    {
     "data": {
      "text/plain": [
-       "Executed operation new"
+       "Executed operation 12: new(PID3)"
      ]
     },
-     "execution_count": 15,
+     "execution_count": 10,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -227,22 +227,132 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 11,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[2018-06-06 08:58:13,114, T+52347] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] finding_trace_from_to(root)\u001b[0m\n",
+      "[2018-06-06 08:58:13,119, T+52352] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] .\u001b[0m\n"
+     ]
+    },
+    {
+     "data": {
+      "text/markdown": [
+       "|Nr|Elements|\n",
+       "|---|---|\n",
+       "|1|PID3|\n"
+      ],
+      "text/plain": [
+       "Nr\tElements\n",
+       "1\tPID3\n"
+      ]
+     },
+     "execution_count": 11,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    ":table waiting"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 12,
   "metadata": {},
   "outputs": [
    {
     "data": {
      "text/plain": [
-       "{PID3}"
+       "∅"
      ]
     },
-     "execution_count": 16,
+     "execution_count": 12,
     "metadata": {},
     "output_type": "execute_result"
    }
   ],
   "source": [
-    "waiting"
+    "ready"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 13,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "{PID1}"
+      ]
+     },
+     "execution_count": 13,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "active"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "Executed operation 15: new(PID2)"
+      ]
+     },
+     "execution_count": 14,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    ":exec new"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 15,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[2018-06-06 09:14:55,680, T+1054913] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] finding_trace_from_to(root)\u001b[0m\n",
+      "[2018-06-06 09:14:55,681, T+1054914] \"ProB Output Logger for instance 56018fb8\" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] .\u001b[0m\n"
+     ]
+    },
+    {
+     "data": {
+      "text/markdown": [
+       "|Nr|Elements|\n",
+       "|---|---|\n",
+       "|1|PID2|\n",
+       "|2|PID3|\n"
+      ],
+      "text/plain": [
+       "Nr\tElements\n",
+       "1\tPID2\n",
+       "2\tPID3\n"
+      ]
+     },
+     "execution_count": 15,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    ":table waiting"
   ]
  },
  {

 %% Cell type:code id: tags:

 ``` prob
 :load scheduler.mch
 ```

 %% Output

-    [2018-05-16 15:53:50,753, T+11361] "Shell-0" de.prob.cli.PrologProcessProvider.makeProcess(PrologProcessProvider.java:64): [INFO] Starting ProB's Prolog Core. Path is /Users/leuschel/.prob/prob2-3.2.10-SNAPSHOT/probcli.sh
-    [2018-05-16 15:53:51,892, T+12500] "Shell-0" de.prob.cli.PortPattern.setValue(PortPattern.java:30): [INFO] Server has started and listens on port 62790
-    [2018-05-16 15:53:51,893, T+12501] "Shell-0" de.prob.cli.InterruptRefPattern.setValue(InterruptRefPattern.java:29): [INFO] Server can receive user interrupts via reference 21692
-    [2018-05-16 15:53:51,895, T+12503] "ProB Output Logger for instance 6df67e5a" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] -- starting command loop --[0m
-    [2018-05-16 15:53:51,913, T+12521] "ProB Output Logger for instance 6df67e5a" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] Connected: 127.0.0.1[0m
-    [2018-05-16 15:53:52,150, T+12758] "ProB Output Logger for instance 6df67e5a" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] loading_classical_b(parser_version(2018-05-16 11:45:20.017),scheduler,[/Users/leuschel/git_root/JAVAPROB/prob2-jupyter-kernel/notebooks/models/scheduler.mch,/Users/leuschel/git_root/JAVAPROB/prob2-jupyter-kernel/notebooks/models/LibraryMeta.def])[0m
+    [2018-06-06 08:57:28,567, T+7800] "Shell-0" de.prob.cli.PrologProcessProvider.makeProcess(PrologProcessProvider.java:64): [INFO] Starting ProB's Prolog Core. Path is /Users/leuschel/git_root/prob_prolog/probcli.sh
+    [2018-06-06 08:57:29,600, T+8833] "Shell-0" de.prob.cli.PortPattern.setValue(PortPattern.java:30): [INFO] Server has started and listens on port 53579
+    [2018-06-06 08:57:29,601, T+8834] "Shell-0" de.prob.cli.InterruptRefPattern.setValue(InterruptRefPattern.java:29): [INFO] Server can receive user interrupts via reference 65646
+    [2018-06-06 08:57:29,603, T+8836] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] -- starting command loop --[0m
+    [2018-06-06 08:57:29,619, T+8852] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] Connected: 127.0.0.1[0m

    Loaded machine: scheduler : []

 %% Cell type:code id: tags:

 ``` prob
 PID
 ```

 %% Output

    {PID1,PID2,PID3}

 %% Cell type:code id: tags:

 ``` prob
 :browse
 ```

 %% Output

    Machine: scheduler
    Sets: PID
    Constants: (none)
    Variables: active, ready, waiting
-    Operations: rr <-- nr_ready, new(pp), del(pp), ready(rr), swap
+    Operations:
+    0: $initialise_machine()

 %% Cell type:code id: tags:

 ``` prob
 active
 ```

 %% Output

-    NOT-INITIALISED
+    :eval: NOT-INITIALISED

 %% Cell type:code id: tags:

 ``` prob
-:exec $initialise_machine
+:exec INITIALISATION
 ```

 %% Output

-    Executed operation $initialise_machine
+    Executed operation 0: $initialise_machine()

 %% Cell type:code id: tags:

 ``` prob
 :exec new
 ```

 %% Output

-    Executed operation new
+    Executed operation 2: new(PID1)

 %% Cell type:code id: tags:

 ``` prob
 waiting
 ```

 %% Output

    {PID1}

 %% Cell type:code id: tags:

 ``` prob
 :exec ready
 ```

 %% Output

-    [2018-05-16 15:57:55,578, T+256186] "ProB Output Logger for instance 6df67e5a" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] [0m
-    [2018-05-16 15:57:55,579, T+256187] "ProB Output Logger for instance 6df67e5a" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] ALL OPERATIONS COVERED[0m
-    [2018-05-16 15:57:55,579, T+256187] "ProB Output Logger for instance 6df67e5a" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] [0m
+    [2018-06-06 08:57:52,255, T+31488] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] [0m
+    [2018-06-06 08:57:52,256, T+31489] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] ALL OPERATIONS COVERED[0m
+    [2018-06-06 08:57:52,257, T+31490] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] [0m

-    Executed operation ready
+    Executed operation 9: ready(PID1)

 %% Cell type:code id: tags:

 ``` prob
 active
 ```

 %% Output

    {PID1}

 %% Cell type:code id: tags:

 ``` prob
 :exec new pp=PID3
 ```

 %% Output

-    Executed operation new
+    Executed operation 12: new(PID3)

 %% Cell type:code id: tags:

 ``` prob
-waiting
+:table waiting
+```
+
+%% Output
+
+    [2018-06-06 08:58:13,114, T+52347] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] finding_trace_from_to(root)[0m
+    [2018-06-06 08:58:13,119, T+52352] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] .[0m
+
+    |Nr|Elements|
+    |---|---|
+    |1|PID3|
+    Nr	Elements
+    1	PID3
+
+%% Cell type:code id: tags:
+
+``` prob
+ready
+```
+
+%% Output
+
+    ∅
+
+%% Cell type:code id: tags:
+
+``` prob
+active
 ```

 %% Output

-    {PID3}
+    {PID1}
+
+%% Cell type:code id: tags:
+
+``` prob
+:exec new
+```
+
+%% Output
+
+    Executed operation 15: new(PID2)
+
+%% Cell type:code id: tags:
+
+``` prob
+:table waiting
+```
+
+%% Output
+
+    [2018-06-06 09:14:55,680, T+1054913] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] finding_trace_from_to(root)[0m
+    [2018-06-06 09:14:55,681, T+1054914] "ProB Output Logger for instance 56018fb8" de.prob.cli.ProBInstance.readAndLog(ConsoleListener.java:48): [INFO] .[0m
+
+    |Nr|Elements|
+    |---|---|
+    |1|PID2|
+    |2|PID3|
+    Nr	Elements
+    1	PID2
+    2	PID3

 %% Cell type:code id: tags:

 ``` prob
 ```