Quellcode durchsuchen

Query only needs set of Places

Yentl Van Tendeloo vor 8 Jahren
Ursprung
Commit
a4ea2e7fae
4 geänderte Dateien mit 5 neuen und 27 gelöschten Zeilen
  1. 0 9
      models/matches.mvc
  2. 3 3
      models/plant_model.mvc
  3. 0 7
      models/query.mvc
  4. 2 8
      models/query_model.mvc

+ 0 - 9
models/matches.mvc

@@ -8,17 +8,11 @@ A B {
         {Contains} Success success {}
         {Contains} Query match {
             LHS {
-                Pre_Query/State {
-                    label = "0"
-                }
                 Pre_ReachabilityGraph/State {
                     label = "1"
                 }
             }
             NAC {
-                Pre_Query/State pre_0 {
-                    label = "0"
-                }
                 Pre_ReachabilityGraph/State pre_1 {
                     label = "1"
                 }
@@ -28,9 +22,6 @@ A B {
                 Pre_ReachabilityGraph/Place pre_3 {
                     label = "3"
                 }
-                Pre_Query/Contains (pre_0, pre_2) {
-                    label = "4"
-                }
                 Pre_ReachabilityGraph/Contains (pre_1, pre_3) {
                     label = "5"
                 }

+ 3 - 3
models/plant_model.mvc

@@ -12,15 +12,15 @@ B C{
         isInitial = False
     }
     PW_Plant/NormalState lm {
-        name = "low_medium"
+        name = "low_mid"
         isInitial = False
     }
     PW_Plant/ErrorState mm {
-        name = "medium_medium"
+        name = "medium_mid"
         isInitial = False
     }
     PW_Plant/ErrorState hm {
-        name = "high_medium"
+        name = "high_mid"
         isInitial = False
     }
     PW_Plant/NormalState lb {

+ 0 - 7
models/query.mvc

@@ -6,15 +6,8 @@ SimpleClassDiagrams Query {
     SimpleAttribute String {}
     SimpleAttribute Natural {}
 
-    Class State {
-        name : String
-    }
     Class Place {
         name : String
         tokens : Natural
     }
-    Association Transition (State, State) {
-        name : String
-    }
-    Association Contains (State, Place) {}
 }

+ 2 - 8
models/query_model.mvc

@@ -1,12 +1,6 @@
 A B {
-    Query/State a {
-        name = "illegal"
-    }
-
-    Query/Place med_mid {
-        name = "med_mid"
+    Query/Place high_mid {
+        name = "high_mid"
         tokens = 1
     }
-
-    Query/Contains (a, med_mid) {}
 }