Skip to content
Snippets Groups Projects
Commit 1e681d7e authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge remote-tracking branch 'origin/master' into 3672 


Conflicts:
	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings


Signed-off-by: default avatarAlexander Diewald <diewald@fortiss.org>
parents 1cdb7e7e c88ea31f
No related branches found
No related tags found
1 merge request!7Dev Objectives: Fix layout in toolbar
Hide whitespace changes
Inline Side-by-side
Showing
with 100 additions and 94 deletions
org.fortiss.af3.rcp.application/html/.ratings
+ 3
− 2
View file @ 1e681d7e
......@@ -18,14 +18,15 @@ data_dictionary.html b3ae064896c7617b7adff889d129802c7832438b RED
dse_perspective.html f050d9fa27d2c20ce5dc14e56b37184676bda4c6 RED
efficient_deployment.html f51b3cf4a6dc9e172cdbe50c2703a13414d0f3cc RED
external_tools.html 49d87b1873ffd6c5132aafd7238464a565742a55 RED
getting_started.html 7a26d95b262da05052c6e798b22e01eb9c49da18 YELLOW
getting_started.html 856f0f694a2bdf70519703acda8dcd90657808da RED
hierarchical_state_automaton.html cebd924f514cd50f229c7745e173f76bd0c0038b RED
library.html 4dcbc369f70cc5ba943404da07e15955df65b3fc RED
loading_standard_examples.html a2693477f0afb902f2899d12b3166f01378f6d8d RED
manual_deployment.html 91f2636b00d59253f7007864d4e0ebdd0b713dad RED
mcdc.html e2c759d71cf926540a34cae6b5c65e3899dd7e36 GREEN
mode_automaton.html dc395eab03cb6920580f54e317c3d203e64cb496 RED
model_checking_with_af3.html e856030ffeaab17a2f69da94ea76b8b369c30297 RED
model_element_attributes.html 627723b0a950a43af5cbe16c9ffd608a951ccf49 RED
model_element_attributes.html b9b78c89164cad7dfa13e0df1f3beb5f58a3f1e3 RED
model_markers_view.html 9b555dfff011f385fdde640f81ddfe0e5b5edf40 RED
model_testing.html 1337b89d2933f98c3ce76fb70a5e2f96c34c8613 RED
non_determinism_analysis.html 6358a070d69a95bea3b521b2fad248cb002d7d2f RED
......
org.fortiss.af3.rcp.application/html/gettingStarted/img/boxback3.png deleted 100644 → 0
+ 0
− 0
View file @ 1cdb7e7e
org.fortiss.af3.rcp.application/html/gettingStarted/img/boxback3.png

5.35 KiB

org.fortiss.af3.rcp.application/html/gettingStarted/img/fortisslogo.jpg deleted 100644 → 0
+ 0
− 0
View file @ 1cdb7e7e
org.fortiss.af3.rcp.application/html/gettingStarted/img/fortisslogo.jpg

2.71 KiB

org.fortiss.af3.rcp.application/html/gettingStarted/img/infologo.jpg deleted 100644 → 0
+ 0
− 0
View file @ 1cdb7e7e
org.fortiss.af3.rcp.application/html/gettingStarted/img/infologo.jpg

1.38 KiB

org.fortiss.af3.rcp.application/html/gettingStarted/img/infologo2.jpg deleted 100644 → 0
+ 0
− 0
View file @ 1cdb7e7e
org.fortiss.af3.rcp.application/html/gettingStarted/img/infologo2.jpg

1.48 KiB

org.fortiss.af3.rcp.application/html/gettingStarted/img/tumlogo.jpg deleted 100644 → 0
+ 0
− 0
View file @ 1cdb7e7e
org.fortiss.af3.rcp.application/html/gettingStarted/img/tumlogo.jpg

1.22 KiB

org.fortiss.af3.rcp.application/html/gettingStarted/main_style.css
+ 6
− 13
View file @ 1e681d7e
......@@ -30,12 +30,11 @@ h1,h2,h3,h4,h5,h6
height: 100%;
margin: 0 auto; /* the auto margins (in conjunction with a width) center the page */
text-align: left; /* this overrides the text-align: center on the body element. */
background-color: #FFFFFF;
padding-bottom: 5px;
border-left: 1px solid #CCC;
border-right: 1px solid #CCC;
border-bottom: 1px solid #CCC;
border-top: 1px solid #CCC;
background-image: linear-gradient(#ffffff, #d6d9dd);
}
/* ---[ Container End ]---*/
#header
......@@ -312,15 +311,9 @@ h1,h2,h3,h4,h5,h6
.background /*class in inner page maincontent*/
{
height: 100%;
width: 99%;
margin-top: 4px;
margin-left: 3px;
border: 1px solid #7290AA;
border-width: 1px 1px 1px 1px;
background-image:url(img/boxback3.png);
background-repeat: repeat-x;
background-attachment:fixed;
}
......@@ -399,11 +392,11 @@ h1,h2,h3,h4,h5,h6
#footer
{
padding: 0; /* Diese Auffllung entspricht der linksbndigen Ausrichtung der Elemente in den divs, die darunter erscheinen. */
background:#FFF;
margin: 0;
height: 130px;
margin-left: 3px;
border-width: 1px 1px 1px 1px;
background: #d6d9dd;
margin-top: 10px;
margin-bottom: 10px;
}
#footer p {
......
org.fortiss.af3.rcp.application/html/getting_started.html
+ 32
− 54
View file @ 1e681d7e
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head><!--
Getting started help page.
......@@ -7,13 +7,13 @@ Getting started help page.
@ConQAT.Rating YELLOW Hash: 5E4F6D0999163FA8E7D1A1CD1A064658
-->
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
<meta content="This is the developers site of AutoFOCUS3, a CASE tool developped by fortiss for the model-based development of embedded systems." name="description" />
<meta content="This user documentation for AutoFOCUS3, a CASE tool developed by fortiss for the model-based development of embedded systems." name="description" />
<meta content="autofocus,fortiss" name="keywords" />
<title>AutoFOCUS3-Focus On The System</title>
<link href="gettingStarted/ie6.css" rel="stylesheet" type="text/css" />
<link href="gettingStarted/main_style.css" rel="stylesheet" type="text/css" />
<style type="text/css">body {
background-image: url(gettingStarted/img/grays2.gif);
background-image: repeating-linear-gradient(darkgray 5px, gray, darkgray 10px);
margin-top: 20px;
}
</style>
......@@ -37,8 +37,7 @@ Getting started help page.
</table>
</div>
<!-- end #header --><!-- start #maincontent --><br />
<br />
&nbsp;
<div id="maincontent">
<table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="900">
<tbody>
......@@ -49,7 +48,7 @@ Getting started help page.
<tbody>
<tr>
<td>
<h1>Main Features:</h1>
<h1>AutoFOCUS3 (AF3) Overview</h1>
</td>
</tr>
<tr>
......@@ -65,36 +64,36 @@ Getting started help page.
<h2>Requirements Engineering</h2>
</td>
<td align="center" bgcolor="#c7d2dc" width="50%">
<h2>Modeling and simulation</h2>
<h2>Modeling and Simulation</h2>
</td>
</tr>
<tr>
<td align="center" valign="top"><br />
<img alt="" border="1" height="200" src="gettingStarted/img/req2.png" width="200" /><br />
&nbsp;
<p style="margin-left: 50px;"><a href="MIRA.what_is_MIRA.html">What is MIRA</a><br />
<p style="margin-left: 50px;"><a href="MIRA.what_is_MIRA.html">What is MIRA?</a><br />
<a href="MIRA.requirements_analysis.html">Requirements Analysis</a><br />
<a href="MIRA.glossary.html">Glossary</a><br />
<a href="MIRA.requirement_source.html">Requirement Sources</a><br />
<a href="MIRA.requirements.html">Requirements</a><br />
<a href="MSC.html">Message Sequence Charts</a><br />
<a href="MIRA.aspects.html">Aspects</a><font color="#ff0000">New in 2.12</font></p>
<a href="MIRA.aspects.html">Aspects</a></p>
<p style="margin-left: 320px;">&nbsp;</p>
</td>
<td align="center" valign="top"><br />
<img alt="" border="1" height="200" src="gettingStarted/img/sim.png" width="200" /><br />
&nbsp;
<p style="margin-left: 50px;"><a href="model_element_attributes.html">General structure of the graphical interface</a><br />
<p style="margin-left: 50px;"><a href="model_element_attributes.html">Introduction to Graphical Modeling Interface</a><br />
<a href="component_architecture.html">Logical (Software) Architecture Modeling</a><br />
<a href="data_dictionary.html">Types and functions</a><br />
Behaviour Modeling:<br />
<a href="data_dictionary.html">Types and Functions</a><br />
Behaviour Modeling<br />
<a href="code_specification.html">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Code Specifications</a><br />
<a href="state_automaton.html">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- State Automata</a><br />
<a href="mode_automaton.html">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Mode Automata</a><br />
<a href="operatorpanels.html">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Interaction with the environment</a><br />
<a href="operatorpanels.html">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Interaction with the Environment</a><br />
<a href="simulation_with_af3.html">Simulation</a><br />
<a href="cosimulation_with_af3.html">Cosimulation, FMI Support</a><font color="#ff0000"> </font><br />
<a href="cosimulation_with_af3.html">Co-Simulation and FMI Support</a><font color="#ff0000"> </font><br />
<a href="library.html">Libraries</a><br />
<a href="refinement.html">Refinement</a><br />
<a href="refactoring.html">Refactoring</a><br />
......@@ -103,37 +102,40 @@ Getting started help page.
</tr>
<tr>
<td align="center" bgcolor="#c7d2dc" valign="middle">
<h2>Code generation and deployment</h2>
<h2>Deployment and Code Generation</h2>
</td>
<td align="center" bgcolor="#c7d2dc" valign="middle">
<h2>Testing and formal verification</h2>
<h2>Testing and Formal Verification</h2>
</td>
</tr>
<tr>
<td align="center" height="271" valign="top"><br />
<img alt="" border="1" height="200" hspace="80" src="gettingStarted/img/codedepl.png" width="200" /><br />
&nbsp;
<p style="margin-left: 50px;"><a href="platform_architecture.html">Hardware Architecture Modeling</a><br />
<a href="code_generation.html">Code Generation</a><br />
<a href="manual_deployment.html">Manual Deployment</a><br />
<a href="dse_perspective.html">DSE Perspective (beta)</a></p>
<p style="margin-left: 50px;">Technical Architecture Modeling<br />
<a href="platform_architecture.html">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Platform Architecture</a><br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Task Architecture<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Partition Architecture<br />
<a href="manual_deployment.html">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Deployments / Allocations</a><br />
<a href="dse_perspective.html">Design Space Exploration (DSE) Perspective</a><br/>
<a href="code_generation.html">Code Generation</a></p>
</td>
<td align="center" valign="top"><br />
<img alt="" border="1" height="200" hspace="80" src="gettingStarted/img/WAF3verification.png" width="200" /><br />
&nbsp;
<p style="margin-left: 50px;"><a href="model_markers_view.html">On the Fly Checks</a><br />
<a href="model_testing.html">Model Based Testing</a><br />
<p style="margin-left: 50px;"><a href="model_markers_view.html">On-the-fly Checks</a><br />
<a href="mcdc.html">MCDC Test Case Generation</a><br />
<a href="refinement_testing.html">Refinement Testing</a><br />
<a href="non_determinism_analysis.html">Nondeterminism Analysis</a><br />
<a href="non_determinism_analysis.html">Non-Determinism Analysis</a><br />
<a href="reachability_analysis.html">Reachability Analysis</a><br />
<a href="bound_check.html">Bound Check</a><br />
<a href="bound_check.html">Bound Checks</a><br />
<a href="model_checking_with_af3.html">Model Checking</a><br />
<a href="ocra_contracts.html">OCRA Contracts</a></p>
</td>
</tr>
<tr>
<td align="center" bgcolor="#c7d2dc" width="50%">
<h2>Assurance Case Modelling</h2>
<h2>Assurance Case Modeling</h2>
</td>
<td align="center" bgcolor="#c7d2dc" width="50%">
<h2>FOCUSer - FOCUS procEss AwaReness</h2>
......@@ -149,61 +151,37 @@ Getting started help page.
<td align="center" valign="top"><br />
<a href="process.html"><img alt="" border="1" height="200" hspace="80" src="./pictures/FOCUSER_requirements_process.png" width="200"/></a><br/>
<br />
<p style="margin-left: 50px;"><a href="process.html">Introduction</a></p><br/>
<p style="margin-left: 50px;"><a href="process.html">Introduction</a><br/>
<a href="process_definition.html">Defining Processes</a><br/>
<a href="process_usage.html">Using Processes</a><br/>
<a href="process_constraints.html">Existing Constraints</a><br/>
<a href="process_constraints.html">Supported Constraints</a><br/></p>
</td>
</tr>
</tbody>
</table>
<p>&nbsp;</p>
</td>
</tr>
</tbody>
</table>
<h2>&nbsp;</h2>
</td>
</tr>
</tbody>
</table>
<center>
<p style="margin-left: 320px;">For more details see our <a href="http://af3.fortiss.org/learnaf3.html" target="_blank">screencasts </a></p>
<p style="text-align:center"><br/>For more details see our <a href="http://af3.fortiss.org/docs/screencasts/" target="_blank">screencasts</a> and <a href="http://af3.fortiss.org/docs/tutorials/" target="_blank">tutorials</a>.</p>
</center>
<!-- end .mainfeatures --></div>
</td>
</tr>
</tbody>
</table>
<br />
<br />
<!-- end #mainContent --></div>
<!-- start #footer -->
<div id="footer">
<div class="div-table-partner">
<div class="div-table-row-partner">
<div class="div-table-col-partner"><a href="http://www4.in.tum.de/index.shtml" target="_blank"><img alt="" border="0" height="53" src="gettingStarted/img/infologo.jpg" width="54" /></a></div>
<div class="div-table-col-partner"><a href="http://www.in.tum.de/" target="_blank"><img alt="" border="0" height="57" src="gettingStarted/img/infologo2.jpg" width="59" /></a></div>
<div class="div-table-col-partner"><a href="http://portal.mytum.de/welcome/" target="_blank"><img alt="" border="0" height="49" src="gettingStarted/img/tumlogo.jpg" width="68" /></a></div>
<div class="div-table-col-partner"><a href="http://www.fortiss.org/" target="_blank"><img alt="" border="0" height="50" src="gettingStarted/img/fortisslogo.jpg" width="101" /></a></div>
</div>
</div>
<div class="div-table-copyright">
<div class="div-table-row-copyright">
<div align="center" class="div-table-col-copyright">
<h2>Copy Rights AutoFOCUS3 All Rights Reserved</h2>
</div>
</div>
</div>
<p style="text-align:center">&copy; 2019 <a href="https://www.fortiss.org/">fortiss GmbH</a> - Research Institute of the Free State of Bavaria associated with <a href="https://www.tum.de/">Technical University of Munich</a></p>
<!-- end #footer --></div>
<!-- end #container --></div>
</body>
</html>
</html>
\ No newline at end of file
org.fortiss.af3.rcp.application/html/mcdc.html 0 → 100644
+ 48
− 0
View file @ 1e681d7e
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>MCDC Test Case Generation</title>
</head>
<body>
<h2><font color="#336699"><u>MCDC Test Case Generation</u></font></h2>
<p>
AF3 has a semi-formal language to write requirements that allows to automatically generate test cases fulfilling the MCDC (Modified Condition/Decision Coverage) criterion.
Such requirements specify the value of outputs based on the value of input, thus the interface (inputs / outputs) shall be clearly defined.
Requirements are written using an if-then-else pattern.
</p>
<p>
For example, consider the following requirement:
</p>
<img src="./pictures/mcdc1.png">
</br>
</br>
<p>
Right-click on the requirement and select "Formal specification aspect", then move to the "Formal aspect" tab.
This will create a component that allows to define the interface.
</p>
<p>
You can add inputs and outputs to the interface using the palette on the right-hand-side.
</p>
<img src="./pictures/mcdc2.png">
<p>
In order to formally define the requirement, add a "Code specification" behavior to the component (drag&drop from the palette).
Double-click in the component to open the editor.
The requirement shall follow the if-then-else pattern where the guard (if-part) shall refer to the inputs and the branches (then and else parts)
shall be a list of assignments (one for each output) using only expressions on the inputs and constants.
</p>
<img src="./pictures/mcdc3.png">
<p>
Test cases can be automatically created by right-clicking on the requirement and selecting "Generate MCDC".
</p>
<p>
The test suite will be created as a child of the requirement: expand the arrow on the left of the requirement and double-click to open the test suite.
</p>
<img src="./pictures/mcdc4.png">
</body>
</html>
\ No newline at end of file
org.fortiss.af3.rcp.application/html/model_element_attributes.html
+ 1
− 1
View file @ 1e681d7e
......@@ -14,7 +14,7 @@
</head>
<body>
<h2><u><font color="#336699">General structure of the graphical interface</font></u></h2>
<h2><u><font color="#336699">Introduction to Graphical Modeling Interface</font></u></h2>
<p>The graphical interface provides three different entry points for modelling:</p>
......
org.fortiss.af3.rcp.application/html/pictures/mcdc1.png 0 → 100644
+ 0
− 0
View file @ 1e681d7e
org.fortiss.af3.rcp.application/html/pictures/mcdc1.png

613 KiB

org.fortiss.af3.rcp.application/html/pictures/mcdc2.png 0 → 100644
+ 0
− 0
View file @ 1e681d7e
org.fortiss.af3.rcp.application/html/pictures/mcdc2.png

413 KiB

org.fortiss.af3.rcp.application/html/pictures/mcdc3.png 0 → 100644
+ 0
− 0
View file @ 1e681d7e
org.fortiss.af3.rcp.application/html/pictures/mcdc3.png

255 KiB

org.fortiss.af3.rcp.application/html/pictures/mcdc4.png 0 → 100644
+ 0
− 0
View file @ 1e681d7e
org.fortiss.af3.rcp.application/html/pictures/mcdc4.png

560 KiB

org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
+ 1
− 1
View file @ 1e681d7e
ApplicationActionBarAdvisor.java 3e7c0fd992586e6ca7724b871eb0b2cf59244028 GREEN
ApplicationWorkbenchAdvisor.java ef25d5783a4f75e88334fd679834a6e0421f8c2f GREEN
ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN
CurrentObjectiveContributionItem.java d07dd8672f5e844f42ee5ec8b43f503f86893cd7 RED
CurrentObjectiveContributionItem.java 009db6cc965e70e4bf8d6abd85f330402ab3582b RED
UpcomingObjectiveContributionItem.java 5721c93ac6ea39842af09703ebc2b0f841bc9ed5 RED
org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java
+ 9
− 23
View file @ 1e681d7e
......@@ -43,7 +43,6 @@ import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.ISelectionService;
......@@ -66,9 +65,9 @@ import org.fortiss.tooling.kernel.model.constraints.SuccessConstraintInstanceSta
import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.ui.service.IConstraintUIService;
// TODO (SB, 3): Class comment
/**
*
* {@link ContributionItem} to select current development process objective.
*
* @author rahman
*
*/
......@@ -240,8 +239,8 @@ class CurrentObjectiveContributionItem extends WorkbenchWindowControlContributio
configNames.toArray(configNamesArray);
currentObjectiveCombo.setItems(configNamesArray);
String currObjName =
currentDevelopmentProcess.getCurrentObjective().getName();
String currObjName = currentDevelopmentProcess != null
? currentDevelopmentProcess.getCurrentObjective().getName() : null;
currentObjectiveCombo.setText(currObjName);
updateObjectiveByName(currObjName);
}
......@@ -365,14 +364,9 @@ class CurrentObjectiveContributionItem extends WorkbenchWindowControlContributio
}
}
// TODO (SB, 4): Also fix line-breaks, and punctuation and capitalization of @return
/**
* generates an object containing how many instances of a given constraints are satisfied and
* how many constraints in
* all exist in the given objective
*
* @param constraintName
* @return the value indicating whether the constraint is satisfied or not
* Generates an object containing how many instances of a given constraints are satisfied and
* how many constraints in all exist in the given objective.
*/
private ConstraintResultHolder getConstraintValueObjectByName(String constraintName) {
......@@ -394,21 +388,14 @@ class CurrentObjectiveContributionItem extends WorkbenchWindowControlContributio
return new ConstraintResultHolder(success, total);
}
/**
* Generates scores for configuration.
*
* @param process
* the root process
* @return The class containing the total and satisfied constraint count.
*/
/** Generates scores for configuration. */
private ConstraintResultHolder
generateScoresForConfig(ConstraintBasedDevelopmentProcess process) {
float totalConstraintCount = 0;
float satisfiedConstraintCount = 0;
EList<String> activeConstraints =
currentDevelopmentProcess.getCurrentObjective().getActiveConstraints();
EList<String> activeConstraints = process.getCurrentObjective().getActiveConstraints();
for(String activeConstraintName : activeConstraints) {
ConstraintResultHolder constraintValueObjectByName =
......@@ -422,9 +409,8 @@ class CurrentObjectiveContributionItem extends WorkbenchWindowControlContributio
/** {@inheritDoc} */
@Override
public void resourceChanged(IResourceChangeEvent event) {
// TODO (SB, 9): Why do you check for the existence of a Display that is never used?
if(event.getType() == IResourceChangeEvent.POST_CHANGE &&
currentDevelopmentProcess != null && Display.getCurrent() != null) {
currentDevelopmentProcess != null) {
generateScoresAndUpdateUI(currentDevelopmentProcess);
EList<ConstraintConfiguration> configurations =
currentDevelopmentProcess.getConfigurations();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment