Begin vql implementation + fix enums bug

2 files changed, 101 insertions, 37 deletions

diff --git a/Domains/crossingScenario/queries/crossingScenarioQueries.vql b/Domains/crossingScenario/queries/crossingScenarioQueries.vql
index fbd68472..7089d0da 100644
--- a/Domains/crossingScenario/queries/crossingScenarioQueries.vql
+++ b/Domains/crossingScenario/queries/crossingScenarioQueries.vql
@@ -3,51 +3,60 @@ package queries
 import "http://www.example.com/crossingScenario"
 import "http://www.eclipse.org/emf/2002/Ecore"
 
-//Minimal Failing Example
+////Minimal Failing Example
 @Constraint(severity = "error", key = {l}, message = "this defines the placedOn relation")
 pattern patterThatOnlyWorksWithInt(l : Lane) {
         Lane.referenceCoord(l, w);
-        check(w <= 2.0);
+        check(w <= 0-10.0);
 }
 
-////////////////
-////Lane
-////////////////
-//
-///////////width, numWidth
-//@Constraint(severity="error", key={l}, message="x")
-//pattern define_numWidth_small(l : Lane) { 
-//      Lane.width(l, Size::Small);
-//      Lane.numWidth(l, nw);
-//      check(nw <= 5);
-//} or {
-//      Lane.width(l, Size::Small);
-//      Lane.numWidth(l, nw);
-//      check(nw >= 10);
-//}
-//
-//@Constraint(severity="error", key={l}, message="x")
-//pattern define_numWidth_medium(l : Lane) { 
-//      Lane.width(l, Size::Medium);
-//      Lane.numWidth(l, nw);
-//      check(nw <= 10);
-//} or {
-//      Lane.width(l, Size::Medium);
-//      Lane.numWidth(l, nw);
-//      check(nw >= 15);
-//}
-//
+//////////////
+//Lane
+//////////////
+
+/////////width, numWidth
 //@Constraint(severity="error", key={l}, message="x")
-//pattern define_numWidth_large(l : Lane) { 
-//      Lane.width(l, Size::Large);
-//      Lane.numWidth(l, nw);
-//      check(nw <= 15);
-//} or {
-//      Lane.width(l, Size::Large);
+//pattern define_numWidth_small1(l : Lane) {
+//      Lane.width(l, Size::S_Small);
 //      Lane.numWidth(l, nw);
-//      check(nw >= 20);
+//      check(nw >= 5.0);
 //}
-//
+
+@Constraint(severity="error", key={l}, message="x")
+pattern define_numWidth_small(l : Lane) {
+        Lane.width(l, Size::S_Small);
+        Lane.numWidth(l, nw);
+        check(nw <= 5.0);
+} or {
+        Lane.width(l, Size::S_Small);
+        Lane.numWidth(l, nw);
+        check(nw >= 10.0);
+}
+
+@Constraint(severity="error", key={l}, message="x")
+pattern define_numWidth_medium(l : Lane) { 
+        Lane.width(l, ::S_Med);
+        Lane.numWidth(l, nw);
+        check(nw <= 10.0);
+}
+or {
+        Lane.width(l, Size::S_Med);
+        Lane.numWidth(l, nw);
+        check(nw >= 15.0);
+}
+
+@Constraint(severity="error", key={l}, message="x")
+pattern define_numWidth_large(l : Lane) { 
+        Lane.width(l, Size::S_Large);
+        Lane.numWidth(l, nw);
+        check(nw <= 15.0);
+}
+or {
+        Lane.width(l, Size::S_Large);
+        Lane.numWidth(l, nw);
+        check(nw >= 20.0);
+}
+
 ///////////referenceCoord
 //@Constraint(severity="error", key={l}, message="x")
 //pattern define_referenceCoord_horizontalAtOrigin(l:Lane) {
diff --git a/Domains/crossingScenario/queries/logProb2._vql b/Domains/crossingScenario/queries/logProb2._vql
new file mode 100644
index 00000000..284af8cb
--- /dev/null
+++ b/Domains/crossingScenario/queries/logProb2._vql
@@ -0,0 +1,55 @@
+package queries

+

+import epackage "http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage" 

+import epackage "http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem"

+import epackage "http://www.bme.hu/mit/inf/dslreasoner/logic/model/language"

+

+pattern UPMUSTPropagateConstraint1_pattern_queries_define_numWidth_small1(

+        problem:LogicProblem, interpretation:PartialInterpretation,

+        var_l,

+        up_1)

+{

+// Original Constraints

+// var_l exported

+find mustInRelationnumWidth_attribute_Lane(problem,interpretation,var_l,var_nw);

+var_virtual1 == const_S_Small_Size;

+DefinedElement.name(const_S_Small_Size,"S_Small literal Size");  //LogicProblem.elements(problem,const_S_Small_Size);

+find mustInRelationwidth_attribute_Lane(problem,interpretation,var_l,var_virtual1);

+// Propagation for constraint

+PrimitiveElement.valueSet(var_nw,setted_var_nw); RealElement.value(var_nw,value_var_nw);

+// Matching variables

+var_nw==up_1;

+}

+

+/**

+ * Matcher for detecting tuples t where []referenceCoord attribute Lane(source,target)

+ */pattern mustInRelationwidth_attribute_Lane(

+        problem:LogicProblem, interpretation:PartialInterpretation,

+        source: DefinedElement, target:DefinedElement)

+{

+        find interpretation(problem,interpretation);

+        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);

+        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"width attribute Lane");

+        PartialRelationInterpretation.relationlinks(relationIterpretation,link);

+        BinaryElementRelationLink.param1(link,source);

+        BinaryElementRelationLink.param2(link,target);

+}

+pattern mustInRelationnumWidth_attribute_Lane(

+        problem:LogicProblem, interpretation:PartialInterpretation,

+        source: DefinedElement, target:DefinedElement)

+{

+        find interpretation(problem,interpretation);

+        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);

+        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"numWidth attribute Lane");

+        PartialRelationInterpretation.relationlinks(relationIterpretation,link);

+        BinaryElementRelationLink.param1(link,source);

+        BinaryElementRelationLink.param2(link,target);

+}

+

+//////////

+// 0. Util

+//////////

+pattern interpretation(problem:LogicProblem, interpretation:PartialInterpretation) {

+        PartialInterpretation.problem(interpretation,problem); 

+}

+