Browse Source

First changes to documentation

Yentl Van Tendeloo 8 years ago
parent
commit
4e4b1d5c53

BIN
doc/_build/doctrees/communication_models.doctree


BIN
doc/_build/doctrees/examples.doctree


BIN
doc/_build/doctrees/howto.doctree


BIN
doc/_build/doctrees/installation.doctree


+ 1 - 1
doc/_build/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: e73af8526ca0a08f40b3dea3312b2ada
+config: 8c4423737f848c226132033580b37c47
 tags: 645f666f9bcd5a90fca523b33c5a78b7

+ 14 - 17
doc/_build/html/_sources/howto.txt

@@ -15,18 +15,18 @@ compile.py
 ----------
 
 Compiles the provided code with the selected mode.
-This should also not be called by end-users, though it is possible.
+This should also not be called by end-tasks, though it is possible.
 
 Invocation::
 
-    python scripts/compile.py address file username object mode
+    python scripts/compile.py address file taskname object mode
 
 ============== ====================================== =====================
 Parameter name Description                            Example              
 ============== ====================================== =====================
 address        Address of the Modelverse              http://localhost:8001
 file           File to be compiled                    file.alc             
-username       Username to use when compiling         test_user            
+taskname       Taskname to use when compiling         test_task            
 object         Object name to export to               object.o             
 mode           Either CO (constructors) or PO (graph) PO                   
 ============== ====================================== =====================
@@ -40,13 +40,13 @@ Models being created are temporary, so they need to be exported before they can
 
 Invocation::
 
-    python scripts/execute_model.py address username file1 file2 ...
+    python scripts/execute_model.py address taskname file1 file2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 file           File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -76,7 +76,7 @@ generate_bootstrap.py
 ---------------------
 
 Creates the bootstrap file for the Modelverse State.
-This creates the necessary initial graph which contains links to all primitive code that is executed by the Modelverse before users can communicate with it.
+This creates the necessary initial graph which contains links to all primitive code that is executed by the Modelverse before tasks can communicate with it.
 Generally, this needs to be executed when any file in the *bootstrap/* folder is modified.
 Compilation is fairly smart, only recompiling parts that have changed.
 
@@ -88,17 +88,17 @@ link_and_load.py
 ----------------
 
 This takes a set of objects in the Modelverse, links them together in a single "executable" and executes it immediately.
-Generally not needed by end-users.
+Generally not needed by end-tasks.
 
 Invocation::
 
-    python scripts/link_and_load.py address username object1 object2 ...
+    python scripts/link_and_load.py address taskname object1 object2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 object         File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -106,17 +106,16 @@ make_all.py
 -----------
 
 Compile a set of files and executes them immediately.
-This uses constructors by default, which is the most elegant, but also the slowest.
 
 Invocation::
 
-    python scripts/make_all.py address username file1 file2 ...
+    python scripts/make_all.py address taskname file1 file2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 file           File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -124,18 +123,16 @@ make_parallel.py
 ----------------
 
 A parallel version of make_all.py.
-This uses the direct graph compilation, and compiles these graphs in parallel.
-This is much faster than make_all, though much less elegant.
 
 Invocation::
 
-    python scripts/make_parallel.py address username file1 file2 ...
+    python scripts/make_parallel.py address taskname file1 file2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 file           File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -143,7 +140,7 @@ prompt.py
 ---------
 
 A generic prompt interface to the Modelverse.
-You can log in as a specific user and start sending input messages to the Modelverse as that user.
+You can log in as a specific task and start sending input messages to the Modelverse as that task.
 All output sent by the Modelverse will be printed in the console.
 There is no logic in the prompt itself, making it completely generic.
 

+ 8 - 8
doc/_build/html/_sources/installation.txt

@@ -1,6 +1,7 @@
 Installation
 ============
 
+
 Dependencies
 ------------
 
@@ -8,13 +9,12 @@ The Modelverse reference implementation is relatively dependency-free.
 As its code is written in Python 2, a working Python 2.7 interpreter is necessary.
 
 To run the tests, this interpreter needs to have the `pytest <http://docs.pytest.org/en/latest/>`_ module installed.
-
-To run the statecharts, the `SCCD <https://msdl.uantwerpen.be/git/simon/SCCD>`_ module needs to be installed.
+To run the server, the `SCCD <https://msdl.uantwerpen.be/git/simon/SCCD>`_ module needs to be installed.
 
 Installation
 ------------
 
-The Modelverse is merely a set of scripts, and there is no real installation present.
+The Modelverse is merely a set of Python scripts, and there is no real installation, except for its dependencies.
 As such, you will only have to download the source code and are ready to use the Modelverse.
 
 0. Install dependencies.
@@ -27,14 +27,14 @@ As such, you will only have to download the source code and are ready to use the
 
     wget https://msdl.uantwerpen.be/git/yentl/modelverse/archive/master.zip
     unzip master.zip
+
 2. That's it! You can now run the scripts in the *scripts/* directory using Python.
 
 Tests
 -----
 
 To make sure that everything is working correctly, you can execute the tests with the script *scripts/run_tests.sh*.
-This test file will execute tests in parallel, using as many cores as it can.
-Nonetheless, total execution time is still rather slow (e.g., 1200 seconds on a i5-4570 using PyPy).
+Total execution time is rather slow, even with all advanced performance optimizations (e.g., 1200 seconds on a i5-4570 using PyPy).
 
 Executing the tests is as simple as the following command::
 
@@ -47,8 +47,8 @@ PyPy
 
 The default way of executing tests is probably through CPython.
 Note, however, that CPython is a very slow implementation of Python, which makes everything in the Modelverse slower.
-While it is not impossible to use CPython, using PyPy is highly recommended at the moment!
-Nonetheless, PyPy is often not the default interpretter present on the system.
+While it is not impossible to use CPython, using PyPy is highly recommended for the server!
+Nonetheless, PyPy is often not the default interpreter.
 You will therefore have to explicitly give control to PyPy instead of CPython.
 
 This is fairly simple: all scripts in *scripts/* execute their subprocesses using the Python interpreter used to start the script.
@@ -61,7 +61,7 @@ For SCCD, you can simply install it using PyPy instead of CPython.
 For pytest, you also need to install all of pytest's dependencies.
 The easiest way to do this is through *pip*, which you also have to install first::
 
-    wget https://bootstrap.pypa.io/get-pip.py
+    wget https://msdl.uantwerpen.be/files/get-pip.py
     pypy get-pip.py --user
     pypy -m pip install pytest --user
 

+ 5 - 5
doc/_build/html/actionlanguage.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Action Language &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Action Language &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Modelling Language" href="modellanguage.html" />
     <link rel="prev" title="How to run" href="howto.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="howto.html" title="How to run"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -425,7 +425,7 @@ Void function main():
         <li class="right" >
           <a href="howto.html" title="How to run"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/advanced.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Advanced examples &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Advanced examples &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Common problems and solutions" href="problems.html" />
     <link rel="prev" title="Examples" href="examples.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="examples.html" title="Examples"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -119,7 +119,7 @@ This part is still TODO, since this is probably not of interest to you.</p>
         <li class="right" >
           <a href="examples.html" title="Examples"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/communication_models.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Communication models &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Communication models &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="prev" title="Interface description" href="interface.html" /> 
   </head>
   <body role="document">
@@ -36,7 +36,7 @@
         <li class="right" >
           <a href="interface.html" title="Interface description"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -128,7 +128,7 @@ A more elaborate statechart implementation also exists, which does implements th
         <li class="right" >
           <a href="interface.html" title="Interface description"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/components.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Modelverse components &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Modelverse components &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="How to run" href="howto.html" />
     <link rel="prev" title="Installation" href="installation.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="installation.html" title="Installation"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -142,7 +142,7 @@ For example, a graphical tool could serve as an interface to the Modelverse, whe
         <li class="right" >
           <a href="installation.html" title="Installation"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/examples.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Examples &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Examples &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Advanced examples" href="advanced.html" />
     <link rel="prev" title="Modelling Language" href="modellanguage.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="modellanguage.html" title="Modelling Language"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -562,7 +562,7 @@ Doing that, your interface will see additional models with the <em>list</em> com
         <li class="right" >
           <a href="modellanguage.html" title="Modelling Language"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/genindex.html

@@ -7,7 +7,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Index &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Index &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" /> 
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" /> 
   </head>
   <body role="document">
     <div class="related" role="navigation" aria-label="related navigation">
@@ -33,7 +33,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -78,7 +78,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 27 - 30
doc/_build/html/howto.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>How to run &#8212; Modelverse 0.4.0 documentation</title>
+    <title>How to run &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Action Language" href="actionlanguage.html" />
     <link rel="prev" title="Modelverse components" href="components.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="components.html" title="Modelverse components"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -61,9 +61,9 @@ This script cannot be executed directly and is only a helper.</p>
 <div class="section" id="compile-py">
 <h2>compile.py<a class="headerlink" href="#compile-py" title="Permalink to this headline">¶</a></h2>
 <p>Compiles the provided code with the selected mode.
-This should also not be called by end-users, though it is possible.</p>
+This should also not be called by end-tasks, though it is possible.</p>
 <p>Invocation:</p>
-<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="nb">compile</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">file</span> <span class="n">username</span> <span class="nb">object</span> <span class="n">mode</span>
+<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="nb">compile</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">file</span> <span class="n">taskname</span> <span class="nb">object</span> <span class="n">mode</span>
 </pre></div>
 </div>
 <table border="1" class="docutils">
@@ -87,9 +87,9 @@ This should also not be called by end-users, though it is possible.</p>
 <td>File to be compiled</td>
 <td>file.alc</td>
 </tr>
-<tr class="row-even"><td>username</td>
-<td>Username to use when compiling</td>
-<td>test_user</td>
+<tr class="row-even"><td>taskname</td>
+<td>Taskname to use when compiling</td>
+<td>test_task</td>
 </tr>
 <tr class="row-odd"><td>object</td>
 <td>Object name to export to</td>
@@ -108,7 +108,7 @@ This should also not be called by end-users, though it is possible.</p>
 First, all models are added, and then the action language is executed, starting at function &#8220;main&#8221;.
 Models being created are temporary, so they need to be exported before they can be accessed in the action language.</p>
 <p>Invocation:</p>
-<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">execute_model</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">username</span> <span class="n">file1</span> <span class="n">file2</span> <span class="o">...</span>
+<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">execute_model</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">taskname</span> <span class="n">file1</span> <span class="n">file2</span> <span class="o">...</span>
 </pre></div>
 </div>
 <table border="1" class="docutils">
@@ -128,8 +128,8 @@ Models being created are temporary, so they need to be exported before they can
 <td>Address of the Modelverse</td>
 <td><a class="reference external" href="http://localhost:8001">http://localhost:8001</a></td>
 </tr>
-<tr class="row-odd"><td>username</td>
-<td>Username to use when compiling</td>
+<tr class="row-odd"><td>taskname</td>
+<td>Taskname to use when compiling</td>
 <td>test</td>
 </tr>
 <tr class="row-even"><td>file</td>
@@ -162,7 +162,7 @@ When changing the compiler, this file should be executed to flush these file cac
 <div class="section" id="generate-bootstrap-py">
 <h2>generate_bootstrap.py<a class="headerlink" href="#generate-bootstrap-py" title="Permalink to this headline">¶</a></h2>
 <p>Creates the bootstrap file for the Modelverse State.
-This creates the necessary initial graph which contains links to all primitive code that is executed by the Modelverse before users can communicate with it.
+This creates the necessary initial graph which contains links to all primitive code that is executed by the Modelverse before tasks can communicate with it.
 Generally, this needs to be executed when any file in the <em>bootstrap/</em> folder is modified.
 Compilation is fairly smart, only recompiling parts that have changed.</p>
 <p>Invocation:</p>
@@ -173,9 +173,9 @@ Compilation is fairly smart, only recompiling parts that have changed.</p>
 <div class="section" id="link-and-load-py">
 <h2>link_and_load.py<a class="headerlink" href="#link-and-load-py" title="Permalink to this headline">¶</a></h2>
 <p>This takes a set of objects in the Modelverse, links them together in a single &#8220;executable&#8221; and executes it immediately.
-Generally not needed by end-users.</p>
+Generally not needed by end-tasks.</p>
 <p>Invocation:</p>
-<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">link_and_load</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">username</span> <span class="n">object1</span> <span class="n">object2</span> <span class="o">...</span>
+<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">link_and_load</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">taskname</span> <span class="n">object1</span> <span class="n">object2</span> <span class="o">...</span>
 </pre></div>
 </div>
 <table border="1" class="docutils">
@@ -195,8 +195,8 @@ Generally not needed by end-users.</p>
 <td>Address of the Modelverse</td>
 <td><a class="reference external" href="http://localhost:8001">http://localhost:8001</a></td>
 </tr>
-<tr class="row-odd"><td>username</td>
-<td>Username to use when compiling</td>
+<tr class="row-odd"><td>taskname</td>
+<td>Taskname to use when compiling</td>
 <td>test</td>
 </tr>
 <tr class="row-even"><td>object</td>
@@ -208,10 +208,9 @@ Generally not needed by end-users.</p>
 </div>
 <div class="section" id="make-all-py">
 <h2>make_all.py<a class="headerlink" href="#make-all-py" title="Permalink to this headline">¶</a></h2>
-<p>Compile a set of files and executes them immediately.
-This uses constructors by default, which is the most elegant, but also the slowest.</p>
+<p>Compile a set of files and executes them immediately.</p>
 <p>Invocation:</p>
-<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">make_all</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">username</span> <span class="n">file1</span> <span class="n">file2</span> <span class="o">...</span>
+<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">make_all</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">taskname</span> <span class="n">file1</span> <span class="n">file2</span> <span class="o">...</span>
 </pre></div>
 </div>
 <table border="1" class="docutils">
@@ -231,8 +230,8 @@ This uses constructors by default, which is the most elegant, but also the slowe
 <td>Address of the Modelverse</td>
 <td><a class="reference external" href="http://localhost:8001">http://localhost:8001</a></td>
 </tr>
-<tr class="row-odd"><td>username</td>
-<td>Username to use when compiling</td>
+<tr class="row-odd"><td>taskname</td>
+<td>Taskname to use when compiling</td>
 <td>test</td>
 </tr>
 <tr class="row-even"><td>file</td>
@@ -244,11 +243,9 @@ This uses constructors by default, which is the most elegant, but also the slowe
 </div>
 <div class="section" id="make-parallel-py">
 <h2>make_parallel.py<a class="headerlink" href="#make-parallel-py" title="Permalink to this headline">¶</a></h2>
-<p>A parallel version of make_all.py.
-This uses the direct graph compilation, and compiles these graphs in parallel.
-This is much faster than make_all, though much less elegant.</p>
+<p>A parallel version of make_all.py.</p>
 <p>Invocation:</p>
-<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">make_parallel</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">username</span> <span class="n">file1</span> <span class="n">file2</span> <span class="o">...</span>
+<div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">make_parallel</span><span class="o">.</span><span class="n">py</span> <span class="n">address</span> <span class="n">taskname</span> <span class="n">file1</span> <span class="n">file2</span> <span class="o">...</span>
 </pre></div>
 </div>
 <table border="1" class="docutils">
@@ -268,8 +265,8 @@ This is much faster than make_all, though much less elegant.</p>
 <td>Address of the Modelverse</td>
 <td><a class="reference external" href="http://localhost:8001">http://localhost:8001</a></td>
 </tr>
-<tr class="row-odd"><td>username</td>
-<td>Username to use when compiling</td>
+<tr class="row-odd"><td>taskname</td>
+<td>Taskname to use when compiling</td>
 <td>test</td>
 </tr>
 <tr class="row-even"><td>file</td>
@@ -282,7 +279,7 @@ This is much faster than make_all, though much less elegant.</p>
 <div class="section" id="prompt-py">
 <h2>prompt.py<a class="headerlink" href="#prompt-py" title="Permalink to this headline">¶</a></h2>
 <p>A generic prompt interface to the Modelverse.
-You can log in as a specific user and start sending input messages to the Modelverse as that user.
+You can log in as a specific task and start sending input messages to the Modelverse as that task.
 All output sent by the Modelverse will be printed in the console.
 There is no logic in the prompt itself, making it completely generic.</p>
 <p>Invocation:</p>
@@ -394,7 +391,7 @@ To split them up, there just needs to be a statechart in between both of them (w
         <li class="right" >
           <a href="components.html" title="Modelverse components"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/index.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Welcome to Modelverse’s documentation! &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Welcome to Modelverse’s documentation! &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="#" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="#" />
     <link rel="next" title="Installation" href="installation.html" /> 
   </head>
   <body role="document">
@@ -36,7 +36,7 @@
         <li class="right" >
           <a href="installation.html" title="Installation"
              accesskey="N">next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="#">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -164,7 +164,7 @@
         <li class="right" >
           <a href="installation.html" title="Installation"
              >next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="#">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 12 - 13
doc/_build/html/installation.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Installation &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Installation &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Modelverse components" href="components.html" />
     <link rel="prev" title="Welcome to Modelverse’s documentation!" href="index.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="index.html" title="Welcome to Modelverse’s documentation!"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -55,12 +55,12 @@
 <h2>Dependencies<a class="headerlink" href="#dependencies" title="Permalink to this headline">¶</a></h2>
 <p>The Modelverse reference implementation is relatively dependency-free.
 As its code is written in Python 2, a working Python 2.7 interpreter is necessary.</p>
-<p>To run the tests, this interpreter needs to have the <a class="reference external" href="http://docs.pytest.org/en/latest/">pytest</a> module installed.</p>
-<p>To run the statecharts, the <a class="reference external" href="https://msdl.uantwerpen.be/git/simon/SCCD">SCCD</a> module needs to be installed.</p>
+<p>To run the tests, this interpreter needs to have the <a class="reference external" href="http://docs.pytest.org/en/latest/">pytest</a> module installed.
+To run the server, the <a class="reference external" href="https://msdl.uantwerpen.be/git/simon/SCCD">SCCD</a> module needs to be installed.</p>
 </div>
 <div class="section" id="id1">
 <h2>Installation<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
-<p>The Modelverse is merely a set of scripts, and there is no real installation present.
+<p>The Modelverse is merely a set of Python scripts, and there is no real installation, except for its dependencies.
 As such, you will only have to download the source code and are ready to use the Modelverse.</p>
 <ol class="arabic" start="0">
 <li><p class="first">Install dependencies.</p>
@@ -83,8 +83,7 @@ For example using git:</p>
 <div class="section" id="tests">
 <h2>Tests<a class="headerlink" href="#tests" title="Permalink to this headline">¶</a></h2>
 <p>To make sure that everything is working correctly, you can execute the tests with the script <em>scripts/run_tests.sh</em>.
-This test file will execute tests in parallel, using as many cores as it can.
-Nonetheless, total execution time is still rather slow (e.g., 1200 seconds on a i5-4570 using PyPy).</p>
+Total execution time is rather slow, even with all advanced performance optimizations (e.g., 1200 seconds on a i5-4570 using PyPy).</p>
 <p>Executing the tests is as simple as the following command:</p>
 <div class="highlight-default"><div class="highlight"><pre><span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">run_tests</span><span class="o">.</span><span class="n">py</span>
 </pre></div>
@@ -94,8 +93,8 @@ Nonetheless, total execution time is still rather slow (e.g., 1200 seconds on a
 <h3>PyPy<a class="headerlink" href="#pypy" title="Permalink to this headline">¶</a></h3>
 <p>The default way of executing tests is probably through CPython.
 Note, however, that CPython is a very slow implementation of Python, which makes everything in the Modelverse slower.
-While it is not impossible to use CPython, using PyPy is highly recommended at the moment!
-Nonetheless, PyPy is often not the default interpretter present on the system.
+While it is not impossible to use CPython, using PyPy is highly recommended for the server!
+Nonetheless, PyPy is often not the default interpreter.
 You will therefore have to explicitly give control to PyPy instead of CPython.</p>
 <p>This is fairly simple: all scripts in <em>scripts/</em> execute their subprocesses using the Python interpreter used to start the script.
 As such, the following command suffices to execute the Modelverse tests using PyPy:</p>
@@ -106,7 +105,7 @@ As such, the following command suffices to execute the Modelverse tests using Py
 For SCCD, you can simply install it using PyPy instead of CPython.
 For pytest, you also need to install all of pytest&#8217;s dependencies.
 The easiest way to do this is through <em>pip</em>, which you also have to install first:</p>
-<div class="highlight-default"><div class="highlight"><pre><span class="n">wget</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">bootstrap</span><span class="o">.</span><span class="n">pypa</span><span class="o">.</span><span class="n">io</span><span class="o">/</span><span class="n">get</span><span class="o">-</span><span class="n">pip</span><span class="o">.</span><span class="n">py</span>
+<div class="highlight-default"><div class="highlight"><pre><span class="n">wget</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">msdl</span><span class="o">.</span><span class="n">uantwerpen</span><span class="o">.</span><span class="n">be</span><span class="o">/</span><span class="n">files</span><span class="o">/</span><span class="n">get</span><span class="o">-</span><span class="n">pip</span><span class="o">.</span><span class="n">py</span>
 <span class="n">pypy</span> <span class="n">get</span><span class="o">-</span><span class="n">pip</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">user</span>
 <span class="n">pypy</span> <span class="o">-</span><span class="n">m</span> <span class="n">pip</span> <span class="n">install</span> <span class="n">pytest</span> <span class="o">--</span><span class="n">user</span>
 </pre></div>
@@ -178,7 +177,7 @@ The easiest way to do this is through <em>pip</em>, which you also have to insta
         <li class="right" >
           <a href="index.html" title="Welcome to Modelverse’s documentation!"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/interface.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Interface description &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Interface description &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Communication models" href="communication_models.html" />
     <link rel="prev" title="Internal workings" href="internal.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="internal.html" title="Internal workings"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -256,7 +256,7 @@ The content of this parameter should be a JSON encoded list of all individual va
         <li class="right" >
           <a href="internal.html" title="Internal workings"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/internal.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Internal workings &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Internal workings &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Interface description" href="interface.html" />
     <link rel="prev" title="Common problems and solutions" href="problems.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="problems.html" title="Common problems and solutions"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -353,7 +353,7 @@ A restart of the MvK is needed for Python to pick up the new functions.</p>
         <li class="right" >
           <a href="problems.html" title="Common problems and solutions"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/modellanguage.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Modelling Language &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Modelling Language &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Examples" href="examples.html" />
     <link rel="prev" title="Action Language" href="actionlanguage.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="actionlanguage.html" title="Action Language"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -278,7 +278,7 @@ SCD PetriNets{
         <li class="right" >
           <a href="actionlanguage.html" title="Action Language"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

BIN
doc/_build/html/objects.inv


+ 5 - 5
doc/_build/html/problems.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Common problems and solutions &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Common problems and solutions &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
     <link rel="next" title="Internal workings" href="internal.html" />
     <link rel="prev" title="Advanced examples" href="advanced.html" /> 
   </head>
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="advanced.html" title="Advanced examples"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -98,7 +98,7 @@
         <li class="right" >
           <a href="advanced.html" title="Advanced examples"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

+ 5 - 5
doc/_build/html/search.html

@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Search &#8212; Modelverse 0.4.0 documentation</title>
+    <title>Search &#8212; Modelverse 0.6.1 documentation</title>
     
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -14,7 +14,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.4.0',
+        VERSION:     '0.6.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/searchtools.js"></script>
-    <link rel="top" title="Modelverse 0.4.0 documentation" href="index.html" />
+    <link rel="top" title="Modelverse 0.6.1 documentation" href="index.html" />
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("searchindex.js"); });
   </script>
@@ -40,7 +40,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -88,7 +88,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.4.0 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">Modelverse 0.6.1 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">

File diff suppressed because it is too large
+ 1 - 1
doc/_build/html/searchindex.js


+ 2 - 2
doc/conf.py

@@ -57,9 +57,9 @@ author = u'Yentl Van Tendeloo'
 # built documents.
 #
 # The short X.Y version.
-version = u'0.4'
+version = u'0.6'
 # The full version, including alpha/beta/rc tags.
-release = u'0.4.0'
+release = u'0.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

+ 25 - 18
doc/howto.rst

@@ -15,18 +15,18 @@ compile.py
 ----------
 
 Compiles the provided code with the selected mode.
-This should also not be called by end-users, though it is possible.
+This should also not be called by end-tasks, though it is possible.
 
 Invocation::
 
-    python scripts/compile.py address file username object mode
+    python scripts/compile.py address file taskname object mode
 
 ============== ====================================== =====================
 Parameter name Description                            Example              
 ============== ====================================== =====================
 address        Address of the Modelverse              http://localhost:8001
 file           File to be compiled                    file.alc             
-username       Username to use when compiling         test_user            
+taskname       Taskname to use when compiling         test_task            
 object         Object name to export to               object.o             
 mode           Either CO (constructors) or PO (graph) PO                   
 ============== ====================================== =====================
@@ -40,13 +40,13 @@ Models being created are temporary, so they need to be exported before they can
 
 Invocation::
 
-    python scripts/execute_model.py address username file1 file2 ...
+    python scripts/execute_model.py address taskname file1 file2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 file           File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -76,7 +76,7 @@ generate_bootstrap.py
 ---------------------
 
 Creates the bootstrap file for the Modelverse State.
-This creates the necessary initial graph which contains links to all primitive code that is executed by the Modelverse before users can communicate with it.
+This creates the necessary initial graph which contains links to all primitive code that is executed by the Modelverse before tasks can communicate with it.
 Generally, this needs to be executed when any file in the *bootstrap/* folder is modified.
 Compilation is fairly smart, only recompiling parts that have changed.
 
@@ -88,17 +88,17 @@ link_and_load.py
 ----------------
 
 This takes a set of objects in the Modelverse, links them together in a single "executable" and executes it immediately.
-Generally not needed by end-users.
+Generally not needed by end-tasks.
 
 Invocation::
 
-    python scripts/link_and_load.py address username object1 object2 ...
+    python scripts/link_and_load.py address taskname object1 object2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 object         File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -106,17 +106,16 @@ make_all.py
 -----------
 
 Compile a set of files and executes them immediately.
-This uses constructors by default, which is the most elegant, but also the slowest.
 
 Invocation::
 
-    python scripts/make_all.py address username file1 file2 ...
+    python scripts/make_all.py address taskname file1 file2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 file           File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -124,18 +123,16 @@ make_parallel.py
 ----------------
 
 A parallel version of make_all.py.
-This uses the direct graph compilation, and compiles these graphs in parallel.
-This is much faster than make_all, though much less elegant.
 
 Invocation::
 
-    python scripts/make_parallel.py address username file1 file2 ...
+    python scripts/make_parallel.py address taskname file1 file2 ...
 
 ============== ======================================= =====================
 Parameter name Description                             Example
 ============== ======================================= =====================
 address        Address of the Modelverse               http://localhost:8001
-username       Username to use when compiling          test
+taskname       Taskname to use when compiling          test
 file           File to compile (either .mvc or .alc)   test.alc
 ============== ======================================= =====================
 
@@ -143,7 +140,7 @@ prompt.py
 ---------
 
 A generic prompt interface to the Modelverse.
-You can log in as a specific user and start sending input messages to the Modelverse as that user.
+You can log in as a specific task and start sending input messages to the Modelverse as that task.
 All output sent by the Modelverse will be printed in the console.
 There is no logic in the prompt itself, making it completely generic.
 
@@ -156,7 +153,7 @@ run_local_modelverse.py
 
 Locally runs an instance of the Modelverse at the requested port.
 This combines MvK and MvS at the same system, and actually makes a direct link between them, omitting the slow use of sockets.
-While this is kind of a hack at the moment, it is really necessary with the current low performance.
+While this is kind of a hack at the moment, it is really necessary for performance.
 To split them up, there just needs to be a statechart in between both of them (which is already written and working).
 
 Invocation::
@@ -177,3 +174,13 @@ Run the tests for all parts of the Modelverse.
 Invocation::
 
     python scripts/run_tests.py
+
+run_MvC_server.py
+-----------------
+
+Run the Modelverse with a modelling interface pre-loaded and fully operational.
+This is probably the only command you will need to start the Modelverse server.
+
+Invocation::
+
+    python scripts/run_MvC_server.py

+ 8 - 8
doc/installation.rst

@@ -1,6 +1,7 @@
 Installation
 ============
 
+
 Dependencies
 ------------
 
@@ -8,13 +9,12 @@ The Modelverse reference implementation is relatively dependency-free.
 As its code is written in Python 2, a working Python 2.7 interpreter is necessary.
 
 To run the tests, this interpreter needs to have the `pytest <http://docs.pytest.org/en/latest/>`_ module installed.
-
-To run the statecharts, the `SCCD <https://msdl.uantwerpen.be/git/simon/SCCD>`_ module needs to be installed.
+To run the server, the `SCCD <https://msdl.uantwerpen.be/git/simon/SCCD>`_ module needs to be installed.
 
 Installation
 ------------
 
-The Modelverse is merely a set of scripts, and there is no real installation present.
+The Modelverse is merely a set of Python scripts, and there is no real installation, except for its dependencies.
 As such, you will only have to download the source code and are ready to use the Modelverse.
 
 0. Install dependencies.
@@ -27,14 +27,14 @@ As such, you will only have to download the source code and are ready to use the
 
     wget https://msdl.uantwerpen.be/git/yentl/modelverse/archive/master.zip
     unzip master.zip
+
 2. That's it! You can now run the scripts in the *scripts/* directory using Python.
 
 Tests
 -----
 
 To make sure that everything is working correctly, you can execute the tests with the script *scripts/run_tests.sh*.
-This test file will execute tests in parallel, using as many cores as it can.
-Nonetheless, total execution time is still rather slow (e.g., 1200 seconds on a i5-4570 using PyPy).
+Total execution time is rather slow, even with all advanced performance optimizations (e.g., 1200 seconds on a i5-4570 using PyPy).
 
 Executing the tests is as simple as the following command::
 
@@ -47,8 +47,8 @@ PyPy
 
 The default way of executing tests is probably through CPython.
 Note, however, that CPython is a very slow implementation of Python, which makes everything in the Modelverse slower.
-While it is not impossible to use CPython, using PyPy is highly recommended at the moment!
-Nonetheless, PyPy is often not the default interpretter present on the system.
+While it is not impossible to use CPython, using PyPy is highly recommended for the server!
+Nonetheless, PyPy is often not the default interpreter.
 You will therefore have to explicitly give control to PyPy instead of CPython.
 
 This is fairly simple: all scripts in *scripts/* execute their subprocesses using the Python interpreter used to start the script.
@@ -61,7 +61,7 @@ For SCCD, you can simply install it using PyPy instead of CPython.
 For pytest, you also need to install all of pytest's dependencies.
 The easiest way to do this is through *pip*, which you also have to install first::
 
-    wget https://bootstrap.pypa.io/get-pip.py
+    wget https://msdl.uantwerpen.be/files/get-pip.py
     pypy get-pip.py --user
     pypy -m pip install pytest --user