Website update
diff --git a/tutorial/activity12.html b/tutorial/activity12.html index d68b3f2..6fe37a5 100644 --- a/tutorial/activity12.html +++ b/tutorial/activity12.html
@@ -488,12 +488,17 @@ variables int val -returnReg command ReturnMoney;reply(val) where val >= 0</code></pre> +returnReg command ReturnMoney;reply(val) where val >= 0 +observe returned := val</code></pre> </div> </div> +<div class="paragraph"> +<p>The last line specifies that the value has to be stored using variable <em>returned</em> +to obtain statistical information about the values returned.</p> +</div> </li> <li> -<p>Run the monitoring and inspect the results.</p> +<p>Run the monitoring and inspect the results. Note that the monitoring dashboard contains statistics about the data constraint.</p> </li> </ol> </div>
diff --git a/tutorial/activity13.html b/tutorial/activity13.html index 1623473..3450791 100644 --- a/tutorial/activity13.html +++ b/tutorial/activity13.html
@@ -477,23 +477,12 @@ <h2 id="_activity_13_define_component_and_add_functional_constraint"><a class="anchor" href="#_activity_13_define_component_and_add_functional_constraint"></a>Activity 13: Define component and add functional constraint</h2> <div class="sectionbody"> <div class="paragraph normal"> -<p>Create in the main project directory a file <em>VendingMachine.component</em> -using File > New > File, with the VendingMachine project as parent. -Insert the following text (you may copy the text below):</p> +<p>Extend the file <em>VendingMachine.component</em> +with the following text (you may copy the text below):</p> </div> <div class="listingblock"> <div class="content"> -<pre class="highlight"><code>import "IUser/IUser.interface" -import "IService/IService.interface" -import "ICoinCheck/ICoinCheck.interface" - -component VendingMachine - -provided port IUser vmUserPort -provided port IService vmServicePort -required port ICoinCheck vmCoinPort - -functional constraints +<pre class="highlight"><code>functional constraints OperationalConstraintInsertCoin { /* InsertCoin Command of IUser returns NOT_OPERATIONAL
diff --git a/tutorial/preparation.html b/tutorial/preparation.html index 4eb14b4..885e68f 100644 --- a/tutorial/preparation.html +++ b/tutorial/preparation.html
@@ -527,20 +527,20 @@ <p>A <em>src</em> folder with the Java implementation and a GUI of the vending machine.</p> </li> <li> -<p>File <em>VendingMachine.types</em> which defines a number of types, -in addition to the predefined types such as bool, int, real, and string.</p> -</li> -<li> -<p>The bin folder of the</p> -</li> -<li> <p>Folders <em>ICoinCheck</em>, <em>IService</em>, and <em>IUser</em> which contain the starting points for the interface specifications. They will be completed by the activities in this tutorial.</p> </li> <li> +<p>File <em>VendingMachine.component</em> which is the starting point of the component specification.</p> +</li> +<li> <p>File <em>VendingMachine.prj</em> in which generator tasks will be specified. Files with this extension should always be placed in the main project folder.</p> </li> +<li> +<p>File <em>VendingMachine.types</em> which defines a number of types, +in addition to the predefined types such as bool, int, real, and string.</p> +</li> </ul> </div> </div>