Update local copy of manual (v4.6).

manual/Appendices/AllOnOnePage.html

@@ -116,6 +116,7 @@ <h1>Explicit Model Files</h1>
 <div class='vspace'></div><ul><li><a href='AllOnOnePage.html#sta'>State (.sta) files</a>
 </li><li><a href='AllOnOnePage.html#tra'>Transitions (.tra) files</a>
 </li><li><a href='AllOnOnePage.html#trarows'>Transitions (.tra) files (row form)</a>
+</li><li><a href='AllOnOnePage.html#lab'>Labels (.lab) files</a>
 </li><li><a href='AllOnOnePage.html#rews'>State rewards (.rews) files</a>
 </li><li><a href='AllOnOnePage.html#rewt'>Transition rewards (.rewt) files</a>
 </li></ul><div class='vspace'></div><hr />
@@ -285,6 +286,25 @@ <h1>Explicit Model Files</h1>
   <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=8' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
+<div class='vspace'></div><hr />
+<p class='vspace'><a name='lab' id='lab'></a>
+</p><h3>Labels (.lab) files</h3>
+<p>These contain an explicit list of which <a class='wikilink' href='../ThePRISMLanguage/FormulasAndLabels.html'>labels</a> are satisfied in each state.
+The first line lists the labels, assigning each one an index.
+The remaining lines list indices of all states satisfying one or more labels,
+followed by a list of the the indices of labels that that are satisfied in it.
+This includes the built-in labels <code>"init"</code> (initial states) and <code>deadlock</code> (deadlock states).
+An example is shown below, where, for example, both <code>"heads"</code> and <code>"end"</code> are satisfied in state 2.
+</p>
+<div class='vspace'></div>
+<div class='sourceblock ' id='sourceblock9'>
+  <div class='sourceblocktext'><div class="text">0=&quot;init&quot; 1=&quot;deadlock&quot; 2=&quot;heads&quot; 3=&quot;tails&quot; 4=&quot;end&quot;<br />
+0: 0<br />
+2: 2 4<br />
+3: 3 4</div></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=9' type='text/plain'>[&#036;[Get Code]]</a></div>
+</div>
+
 <div class='vspace'></div><hr />
 <p class='vspace'><a name='rews' id='rews'></a>
 </p><h3>State rewards (.srew) files</h3>
@@ -293,12 +313,12 @@ <h1>Explicit Model Files</h1>
 <p class='vspace'>For the <a class='urllink' href='../uploads/lec3.pm'>lec3.pm</a> (6-state) DTMC example from above, we get rewards in 3 states (0, 4 and 5):
 </p>
 <div class='vspace'></div>
-<div class='sourceblock ' id='sourceblock9'>
+<div class='sourceblock ' id='sourceblock10'>
   <div class='sourceblocktext'><div class="text">6 3<br />
 0 2<br />
 4 1<br />
 5 1</div></div>
-  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=9' type='text/plain'>[&#036;[Get Code]]</a></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=10' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
 <div class='vspace'></div><hr />
@@ -310,25 +330,25 @@ <h1>Explicit Model Files</h1>
 <p class='vspace'>For the <a class='urllink' href='../uploads/lec3.pm'>lec3.pm</a> (6-state) DTMC example from above, we get non-zero transition rewards on 4 transitions:
 </p>
 <div class='vspace'></div>
-<div class='sourceblock ' id='sourceblock10'>
+<div class='sourceblock ' id='sourceblock11'>
   <div class='sourceblocktext'><div class="text">6 4<br />
 1 0 1<br />
 1 2 1<br />
 1 4 1<br />
 2 5 2</div></div>
-  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=10' type='text/plain'>[&#036;[Get Code]]</a></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=11' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
 <p class='vspace'>And or the <a class='urllink' href='../uploads/lec12mdpa.nm'>lec12mdpa.nm</a> (4-state) MDP example, we get non-zero transition rewards on 4 transitions:
 </p>
 <div class='vspace'></div>
-<div class='sourceblock ' id='sourceblock11'>
+<div class='sourceblock ' id='sourceblock12'>
   <div class='sourceblocktext'><div class="text">4 5 4<br />
 1 0 2 6<br />
 1 0 3 6<br />
 1 1 0 5<br />
 1 1 1 5</div></div>
-  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=11' type='text/plain'>[&#036;[Get Code]]</a></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/AllOnOnePage?action=sourceblock&amp;num=12' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
 </div>

manual/Appendices/ExplicitModelFiles.html

@@ -119,6 +119,7 @@
 <div class='vspace'></div><ul><li><a href='ExplicitModelFiles.html#sta'>State (.sta) files</a>
 </li><li><a href='ExplicitModelFiles.html#tra'>Transitions (.tra) files</a>
 </li><li><a href='ExplicitModelFiles.html#trarows'>Transitions (.tra) files (row form)</a>
+</li><li><a href='ExplicitModelFiles.html#lab'>Labels (.lab) files</a>
 </li><li><a href='ExplicitModelFiles.html#rews'>State rewards (.rews) files</a>
 </li><li><a href='ExplicitModelFiles.html#rewt'>Transition rewards (.rewt) files</a>
 </li></ul><div class='vspace'></div><hr />
@@ -288,6 +289,25 @@
   <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=8' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
+<div class='vspace'></div><hr />
+<p class='vspace'><a name='lab' id='lab'></a>
+</p><h3>Labels (.lab) files</h3>
+<p>These contain an explicit list of which <a class='wikilink' href='../ThePRISMLanguage/FormulasAndLabels.html'>labels</a> are satisfied in each state.
+The first line lists the labels, assigning each one an index.
+The remaining lines list indices of all states satisfying one or more labels,
+followed by a list of the the indices of labels that that are satisfied in it.
+This includes the built-in labels <code>"init"</code> (initial states) and <code>deadlock</code> (deadlock states).
+An example is shown below, where, for example, both <code>"heads"</code> and <code>"end"</code> are satisfied in state 2.
+</p>
+<div class='vspace'></div>
+<div class='sourceblock ' id='sourceblock9'>
+  <div class='sourceblocktext'><div class="text">0=&quot;init&quot; 1=&quot;deadlock&quot; 2=&quot;heads&quot; 3=&quot;tails&quot; 4=&quot;end&quot;<br />
+0: 0<br />
+2: 2 4<br />
+3: 3 4</div></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=9' type='text/plain'>[&#036;[Get Code]]</a></div>
+</div>
+
 <div class='vspace'></div><hr />
 <p class='vspace'><a name='rews' id='rews'></a>
 </p><h3>State rewards (.srew) files</h3>
@@ -296,12 +316,12 @@
 <p class='vspace'>For the <a class='urllink' href='../uploads/lec3.pm'>lec3.pm</a> (6-state) DTMC example from above, we get rewards in 3 states (0, 4 and 5):
 </p>
 <div class='vspace'></div>
-<div class='sourceblock ' id='sourceblock9'>
+<div class='sourceblock ' id='sourceblock10'>
   <div class='sourceblocktext'><div class="text">6 3<br />
 0 2<br />
 4 1<br />
 5 1</div></div>
-  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=9' type='text/plain'>[&#036;[Get Code]]</a></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=10' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
 <div class='vspace'></div><hr />
@@ -313,25 +333,25 @@
 <p class='vspace'>For the <a class='urllink' href='../uploads/lec3.pm'>lec3.pm</a> (6-state) DTMC example from above, we get non-zero transition rewards on 4 transitions:
 </p>
 <div class='vspace'></div>
-<div class='sourceblock ' id='sourceblock10'>
+<div class='sourceblock ' id='sourceblock11'>
   <div class='sourceblocktext'><div class="text">6 4<br />
 1 0 1<br />
 1 2 1<br />
 1 4 1<br />
 2 5 2</div></div>
-  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=10' type='text/plain'>[&#036;[Get Code]]</a></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=11' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
 <p class='vspace'>And or the <a class='urllink' href='../uploads/lec12mdpa.nm'>lec12mdpa.nm</a> (4-state) MDP example, we get non-zero transition rewards on 4 transitions:
 </p>
 <div class='vspace'></div>
-<div class='sourceblock ' id='sourceblock11'>
+<div class='sourceblock ' id='sourceblock12'>
   <div class='sourceblocktext'><div class="text">4 5 4<br />
 1 0 2 6<br />
 1 0 3 6<br />
 1 1 0 5<br />
 1 1 1 5</div></div>
-  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=11' type='text/plain'>[&#036;[Get Code]]</a></div>
+  <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/Appendices/ExplicitModelFiles?action=sourceblock&amp;num=12' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>
 
 </div>

manual/ConfiguringPRISM/AllOnOnePage.html

@@ -230,6 +230,12 @@ <h3>Computation engines</h3>
 
 <p class='vspace'>Note also that precise details regarding the memory usage of the current engine are displayed during model checking (from the GUI, check the "Log" tab). This can provide valuable feedback when experimenting with different engines.
 </p>
+<p class='vspace'>PRISM also has some basic support for automatically selecting the engine (and other settings) heuristically,
+based on the size and type of the model, and the property being checked.
+Use, for example, <code>-heuristic speed</code> from the command-line to choose options
+which target computation speed rather than saving memory.
+This is also available from the "Heuristic" option under the "PRISM" tab of the "Options" dialog in the GUI.
+</p>
 <div class='vspace'></div><h3>Approximate/statistical model checking</h3>
 <p>Although it is not treated as a separate "engine", like those above,
 PRISM also provides approximate/statistical model checking,

manual/ConfiguringPRISM/ComputationEngines.html

@@ -149,6 +149,12 @@ <h3>Computation engines</h3>
 
 <p class='vspace'>Note also that precise details regarding the memory usage of the current engine are displayed during model checking (from the GUI, check the "Log" tab). This can provide valuable feedback when experimenting with different engines.
 </p>
+<p class='vspace'>PRISM also has some basic support for automatically selecting the engine (and other settings) heuristically,
+based on the size and type of the model, and the property being checked.
+Use, for example, <code>-heuristic speed</code> from the command-line to choose options
+which target computation speed rather than saving memory.
+This is also available from the "Heuristic" option under the "PRISM" tab of the "Options" dialog in the GUI.
+</p>
 <div class='vspace'></div><h3>Approximate/statistical model checking</h3>
 <p>Although it is not treated as a separate "engine", like those above,
 PRISM also provides approximate/statistical model checking,

manual/InstallingPRISM/AllOnOnePage.html

@@ -123,7 +123,7 @@ <h3>Prerequisites</h3>
 <div class='vspace'></div>
 <div class='sourceblock ' id='sourceblock1'>
   <div class='sourceblocktext'><div class="shell"><span style="font-weight:bold;">cd "c:\Program Files\prism-4.5-win\bin"</span><br/>
-<span style="font-weight:bold;">prism ..\examples\dice\dice.pm</span><br/>
+<span style="font-weight:bold;">prism ..\prism-examples\simple\dice\dice.pm</span><br/>
 </div></div>
   <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/InstallingPRISM/AllOnOnePage?action=sourceblock&amp;num=1' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>

manual/InstallingPRISM/Main.html

@@ -126,7 +126,7 @@ <h3>Prerequisites</h3>
 <div class='vspace'></div>
 <div class='sourceblock ' id='sourceblock1'>
   <div class='sourceblocktext'><div class="shell"><span style="font-weight:bold;">cd "c:\Program Files\prism-4.5-win\bin"</span><br/>
-<span style="font-weight:bold;">prism ..\examples\dice\dice.pm</span><br/>
+<span style="font-weight:bold;">prism ..\prism-examples\simple\dice\dice.pm</span><br/>
 </div></div>
   <div class='sourceblocklink'><a href='http://www.prismmodelchecker.org/manual/InstallingPRISM/Instructions?action=sourceblock&amp;num=1' type='text/plain'>[&#036;[Get Code]]</a></div>
 </div>