From bb231e3cc43aab160dde5bd2ffce2ac6ee829c85 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Wed, 5 Jul 2017 14:23:44 +0200 Subject: Bug with outgoing transitions in yakindu example. --- .../model/yakindu_simplified.aird | 28 +- .../model/yakindumm class diagram.svg | 513 +++++++++++++-------- .../partialsnapshot_mavo/yakindu/patterns.vql | 4 +- 3 files changed, 341 insertions(+), 204 deletions(-) (limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph') diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.aird b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.aird index 4676d4bf..bbfea220 100644 --- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.aird +++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.aird @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -227,6 +227,8 @@ + + diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindumm class diagram.svg b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindumm class diagram.svg index ec1eec69..356969f9 100644 --- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindumm class diagram.svg +++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindumm class diagram.svg @@ -1,52 +1,104 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -64,287 +116,370 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - -Pseudostate - - - - - - -Vertex - - - - - - -Region - + + +Pseudostate + + + + + + +Vertex + + + + + + +Region + - + Transition - - - - - -Statechart - - - - - - -Entry - - - - - - -Synchronization - - - - - - -State - - - - - - -RegularState - - - - - - -CompositeElement - - -[0..*] vertices - - - - - -[0..*] regions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[1..1] target -[0..*] incomingTransitions - - - - - -[1..1] source -[0..*] outgoingTransitions - - - - + + + + + +Statechart + + + + + + +Entry + + + + + + +Synchronization + + + + + + +State + + + + + + +RegularState + + + + + + +CompositeElement + + + + + + +Choice + + + + + + +Exit + + + + + + +FinalState + + +[0..*] vertices + + + + + +[0..*] regions + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[1..1] target +[0..*] incomingTransitions + + + + + +[0..1] source +[0..*] outgoingTransitions + + + + + + + + + + + + + + + + + diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql index e964cfc7..f4bfa3c1 100644 --- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql +++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql @@ -50,7 +50,7 @@ pattern multipleTransitionFromEntry(e : Entry, t1 : Transition, t2: Transition) @Constraint(severity="error", message="error", key = {e}) pattern outgoingFromExit(t : Transition, e : Exit) { - find transition(t, e, _); + Exit.outgoingTransitions(e,t); } ///////// @@ -59,7 +59,7 @@ pattern outgoingFromExit(t : Transition, e : Exit) { @Constraint(severity="error", message="error", key = {f}) pattern outgoingFromFinal(t : Transition, f : FinalState) { - find transition(t, f, _); + FinalState.outgoingTransitions(f,t); } ///////// -- cgit v1.2.3-70-g09d2