Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
grbeni committed Mar 17, 2021
2 parents c863faf + b737c23 commit 6a3ce22
Showing 49 changed files with 5,880 additions and 3 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -63,9 +63,11 @@ Supporters of the Gamma project:

* [MTA-BME Lendület Cyber-Physical Systems Research Group](http://lendulet.inf.mit.bme.hu/),
* [Fault Tolerant Systems Research Group](https://inf.mit.bme.hu/en), [Department of Measurement and Information Systems](https://www.mit.bme.hu/eng/), [Budapest University of Technology and Economics](http://www.bme.hu/?language=en),
* [Új Nemzeti Kiválóság Program 2017-2018](http://www.kormany.hu/hu/emberi-eroforrasok-miniszteriuma/oktatasert-felelos-allamtitkarsag/hirek/az-uj-nemzeti-kivalosag-program-2017-2018-tanevi-palyazati-kiirasai),
* [Új Nemzeti Kiválóság Program 2019-2020](https://www.kormany.hu/hu/innovacios-es-technologiai-miniszterium/tudas-es-innovacio-menedzsmentert-felelos-allamtitkarsag/hirek/megjelentek-az-uj-nemzeti-kivalosag-program-palyazati-kiirasai-a-2019-2020-as-tanevre),
* [Emberi Erőforrás Fejlesztési Operatív Program (EFOP)](http://www.eit.bme.hu/news/20170927-palyazati-felhivas-szakmai-osztondij?language=en) (EFOP-3.6.2-16-2017-00013).
* [Új Nemzeti Kiválóság Program (ÚNKP) 2017-2018](http://unkp.gov.hu),
* [Új Nemzeti Kiválóság Program (ÚNKP) 2019-2020](http://unkp.gov.hu),
* [Új Nemzeti Kiválóság Program (ÚNKP) 2020-2021](http://www.unkp.gov.hu/palyazatok/felsooktatasi-doktori-hallgatoi-doktorjelolti-kutatoi-osztondij/felsooktatasi-doktori),
* [Emberi Erőforrás Fejlesztési Operatív Program (EFOP)](http://www.eit.bme.hu/news/20170927-palyazati-felhivas-szakmai-osztondij?language=en) (EFOP-3.6.2-16-2017-00013),
* [NRDI Fund of Hungary](https://itea3.org/project/embrace.html) (2019-2.1.1-EUREKA-2019-00001 EMBrACE project).

Special thanks to:

10 changes: 10 additions & 0 deletions tutorial/hu.bme.mit.gamma.tutorial.contract.finish/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="test-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
7 changes: 7 additions & 0 deletions tutorial/hu.bme.mit.gamma.tutorial.contract.finish/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/bin/
*.l2s
*.y2g
*.g2u
*.lgsm
*.gsts
*.uppaal
23 changes: 23 additions & 0 deletions tutorial/hu.bme.mit.gamma.tutorial.contract.finish/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>hu.bme.mit.gamma.tutorial.contract.finish</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package controller
import "/hu.bme.mit.gamma.tutorial.contract.finish/model/Interfaces/Interfaces.gcd"
@TransitionPriority = order-based
statechart Controller [
port PoliceInterrupt : requires PoliceInterrupt
port SecondaryPolice : provides PoliceInterrupt
port SecondaryControl : provides Control
port PriorityControl : provides Control
port PriorityPolice : provides PoliceInterrupt
] {
timeout SecondaryPreparesTimeout2
timeout InitTimeout3
timeout PriorityPreparesTimeout4
timeout SecondaryTimeout5
timeout PriorityTimeout6
transition from Entry0 to PriorityPrepares
transition from Entry1 to Init
transition from Init to Operating when timeout InitTimeout3
transition from Interrupted to Operating when PoliceInterrupt.police / raise
PriorityPolice.police; raise SecondaryPolice.police;
transition from Operating to Interrupted when PoliceInterrupt.police / raise
PriorityPolice.police; raise SecondaryPolice.police;
transition from Priority to PriorityPrepares when timeout PriorityTimeout6
transition from PriorityPrepares to Secondary when timeout PriorityPreparesTimeout4
transition from Secondary to SecondaryPrepares when timeout SecondaryTimeout5
transition from SecondaryPrepares to Priority when timeout SecondaryPreparesTimeout2
region main_region {
state Operating {
region operating {
initial Entry0
state PriorityPrepares {
entry / set PriorityPreparesTimeout4 := 1 s; raise PriorityControl.toggle;
}
state Secondary {
entry / set SecondaryTimeout5 := 2 s; raise PriorityControl.toggle; raise
SecondaryControl.toggle;
}
state SecondaryPrepares {
entry / set SecondaryPreparesTimeout2 := 1 s; raise SecondaryControl.toggle;
}
state Priority {
entry / set PriorityTimeout6 := 2 s; raise PriorityControl.toggle; raise
SecondaryControl.toggle;
}
}
}
initial Entry1
state Init {
entry / set InitTimeout3 := 2 s; raise PriorityControl.toggle;
}
state Interrupted
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import "Interfaces/Interfaces.gcd"
import external "Controller.sct"

statechart {
statechart : Controller
mappings {
map PriorityControl = Control as provided
map SecondaryControl = Control as provided
map PoliceInterrupt = PoliceInterrupt as required
map PriorityPolice = PoliceInterrupt as provided
map SecondaryPolice = PoliceInterrupt as provided
}
}
Loading

0 comments on commit 6a3ce22

Please sign in to comment.