diff options
7 files changed, 302 insertions, 49 deletions
diff --git a/subprojects/frontend/src/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar index 6fb188d8..58c398a3 100644 --- a/subprojects/frontend/src/language/problem.grammar +++ b/subprojects/frontend/src/language/problem.grammar | |||
@@ -57,7 +57,12 @@ Conjunction { ("," | Literal)+ } | |||
57 | 57 | ||
58 | OrOp { ";" } | 58 | OrOp { ";" } |
59 | 59 | ||
60 | Literal { Modality? NotOp? Modality? Atom ((":" | "=") LogicValue)? } | 60 | Literal { |
61 | Modality? ( | ||
62 | NotOp? Modality? Atom ((":" | "=") LogicValue)? | | ||
63 | ckw<"count"> "{" Modality? Atom "}" ComparisonOp int | ||
64 | ) | ||
65 | } | ||
61 | 66 | ||
62 | Atom { RelationName "+"? ParameterList<Argument> } | 67 | Atom { RelationName "+"? ParameterList<Argument> } |
63 | 68 | ||
@@ -141,6 +146,8 @@ sep1<separator, content> { content (separator content)* } | |||
141 | "\"" (![\\"\n] | "\\" (![\n] | "\n"))* "\"" | 146 | "\"" (![\\"\n] | "\\" (![\n] | "\n"))* "\"" |
142 | } | 147 | } |
143 | 148 | ||
149 | ComparisonOp { ">" | ">=" | "<" | "<=" | "=:=" | "=!=" } | ||
150 | |||
144 | NotOp { "!" } | 151 | NotOp { "!" } |
145 | 152 | ||
146 | UnknownOp { "?" } | 153 | UnknownOp { "?" } |
diff --git a/subprojects/frontend/src/language/problemLanguageSupport.ts b/subprojects/frontend/src/language/problemLanguageSupport.ts index 550532ef..65fb50dc 100644 --- a/subprojects/frontend/src/language/problemLanguageSupport.ts +++ b/subprojects/frontend/src/language/problemLanguageSupport.ts | |||
@@ -30,7 +30,7 @@ const parserWithMetadata = (parser as LRParser).configure({ | |||
30 | 'problem class enum pred rule indiv scope': t.definitionKeyword, | 30 | 'problem class enum pred rule indiv scope': t.definitionKeyword, |
31 | 'abstract extends refers contains opposite error default': t.modifier, | 31 | 'abstract extends refers contains opposite error default': t.modifier, |
32 | 'true false unknown error': t.keyword, | 32 | 'true false unknown error': t.keyword, |
33 | 'may must current': t.operatorKeyword, | 33 | 'may must current count': t.operatorKeyword, |
34 | 'new delete': t.operatorKeyword, | 34 | 'new delete': t.operatorKeyword, |
35 | NotOp: t.operator, | 35 | NotOp: t.operator, |
36 | UnknownOp: t.operator, | 36 | UnknownOp: t.operator, |
diff --git a/subprojects/language-model/problem.aird b/subprojects/language-model/problem.aird index 35d8b873..f1332549 100644 --- a/subprojects/language-model/problem.aird +++ b/subprojects/language-model/problem.aird | |||
@@ -7,7 +7,7 @@ | |||
7 | <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> | 7 | <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> |
8 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> | 8 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> |
9 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> | 9 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> |
10 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="42c1a549-bdd6-4309-808b-d93f37160905"> | 10 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="64f6664f-dd08-49f2-896c-4f190f761e4b"> |
11 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 11 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
12 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> | 12 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> |
13 | </ownedRepresentationDescriptors> | 13 | </ownedRepresentationDescriptors> |
@@ -546,7 +546,66 @@ | |||
546 | <styles xmi:type="notation:FilteringStyle" xmi:id="_eKwNAxEKEe2AArBmfNpEZA"/> | 546 | <styles xmi:type="notation:FilteringStyle" xmi:id="_eKwNAxEKEe2AArBmfNpEZA"/> |
547 | </children> | 547 | </children> |
548 | <styles xmi:type="notation:ShapeStyle" xmi:id="_eKvl8REKEe2AArBmfNpEZA" fontName="Noto Sans" fontHeight="8"/> | 548 | <styles xmi:type="notation:ShapeStyle" xmi:id="_eKvl8REKEe2AArBmfNpEZA" fontName="Noto Sans" fontHeight="8"/> |
549 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKvl8hEKEe2AArBmfNpEZA" x="2064" y="180" width="120" height="100"/> | 549 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eKvl8hEKEe2AArBmfNpEZA" x="2072" y="180" width="120" height="100"/> |
550 | </children> | ||
551 | <children xmi:type="notation:Node" xmi:id="_BnoHYBg0Ee2_erjsEmF9GQ" type="2003" element="_BmVG4Bg0Ee2_erjsEmF9GQ"> | ||
552 | <children xmi:type="notation:Node" xmi:id="_BnrxwBg0Ee2_erjsEmF9GQ" type="5007"/> | ||
553 | <children xmi:type="notation:Node" xmi:id="_BnsY0Bg0Ee2_erjsEmF9GQ" type="7004"> | ||
554 | <styles xmi:type="notation:SortingStyle" xmi:id="_BnsY0Rg0Ee2_erjsEmF9GQ"/> | ||
555 | <styles xmi:type="notation:FilteringStyle" xmi:id="_BnsY0hg0Ee2_erjsEmF9GQ"/> | ||
556 | </children> | ||
557 | <styles xmi:type="notation:ShapeStyle" xmi:id="_BnoHYRg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
558 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BnoHYhg0Ee2_erjsEmF9GQ" x="1390" y="1452" width="120" height="100"/> | ||
559 | </children> | ||
560 | <children xmi:type="notation:Node" xmi:id="_GWV5QBg0Ee2_erjsEmF9GQ" type="2003" element="_GVp8wBg0Ee2_erjsEmF9GQ"> | ||
561 | <children xmi:type="notation:Node" xmi:id="_GWWgUBg0Ee2_erjsEmF9GQ" type="5007"/> | ||
562 | <children xmi:type="notation:Node" xmi:id="_GWWgURg0Ee2_erjsEmF9GQ" type="7004"> | ||
563 | <children xmi:type="notation:Node" xmi:id="_UBurMBg0Ee2_erjsEmF9GQ" type="3010" element="_UBW3wBg0Ee2_erjsEmF9GQ"> | ||
564 | <styles xmi:type="notation:FontStyle" xmi:id="_UBurMRg0Ee2_erjsEmF9GQ" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
565 | <layoutConstraint xmi:type="notation:Location" xmi:id="_UBurMhg0Ee2_erjsEmF9GQ"/> | ||
566 | </children> | ||
567 | <children xmi:type="notation:Node" xmi:id="_VabjgBg0Ee2_erjsEmF9GQ" type="3010" element="_VZ5YABg0Ee2_erjsEmF9GQ"> | ||
568 | <styles xmi:type="notation:FontStyle" xmi:id="_VabjgRg0Ee2_erjsEmF9GQ" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
569 | <layoutConstraint xmi:type="notation:Location" xmi:id="_Vabjghg0Ee2_erjsEmF9GQ"/> | ||
570 | </children> | ||
571 | <styles xmi:type="notation:SortingStyle" xmi:id="_GWWgUhg0Ee2_erjsEmF9GQ"/> | ||
572 | <styles xmi:type="notation:FilteringStyle" xmi:id="_GWWgUxg0Ee2_erjsEmF9GQ"/> | ||
573 | </children> | ||
574 | <styles xmi:type="notation:ShapeStyle" xmi:id="_GWV5QRg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
575 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWV5Qhg0Ee2_erjsEmF9GQ" x="1539" y="1452" width="120" height="123"/> | ||
576 | </children> | ||
577 | <children xmi:type="notation:Node" xmi:id="_LinJ0Bg0Ee2_erjsEmF9GQ" type="2003" element="_LiM6IBg0Ee2_erjsEmF9GQ"> | ||
578 | <children xmi:type="notation:Node" xmi:id="_LinJ0xg0Ee2_erjsEmF9GQ" type="5007"/> | ||
579 | <children xmi:type="notation:Node" xmi:id="_LinJ1Bg0Ee2_erjsEmF9GQ" type="7004"> | ||
580 | <children xmi:type="notation:Node" xmi:id="_OO7mIBg0Ee2_erjsEmF9GQ" type="3010" element="_OOZaoBg0Ee2_erjsEmF9GQ"> | ||
581 | <styles xmi:type="notation:FontStyle" xmi:id="_OO7mIRg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
582 | <layoutConstraint xmi:type="notation:Location" xmi:id="_OO7mIhg0Ee2_erjsEmF9GQ"/> | ||
583 | </children> | ||
584 | <children xmi:type="notation:Node" xmi:id="_PTR_EBg0Ee2_erjsEmF9GQ" type="3010" element="_PSulcBg0Ee2_erjsEmF9GQ"> | ||
585 | <styles xmi:type="notation:FontStyle" xmi:id="_PTR_ERg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
586 | <layoutConstraint xmi:type="notation:Location" xmi:id="_PTR_Ehg0Ee2_erjsEmF9GQ"/> | ||
587 | </children> | ||
588 | <children xmi:type="notation:Node" xmi:id="_PqiBcBg0Ee2_erjsEmF9GQ" type="3010" element="_PqAdABg0Ee2_erjsEmF9GQ"> | ||
589 | <styles xmi:type="notation:FontStyle" xmi:id="_PqiBcRg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
590 | <layoutConstraint xmi:type="notation:Location" xmi:id="_PqiBchg0Ee2_erjsEmF9GQ"/> | ||
591 | </children> | ||
592 | <children xmi:type="notation:Node" xmi:id="_QGBqoBg0Ee2_erjsEmF9GQ" type="3010" element="_QFxL8Bg0Ee2_erjsEmF9GQ"> | ||
593 | <styles xmi:type="notation:FontStyle" xmi:id="_QGBqoRg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
594 | <layoutConstraint xmi:type="notation:Location" xmi:id="_QGBqohg0Ee2_erjsEmF9GQ"/> | ||
595 | </children> | ||
596 | <children xmi:type="notation:Node" xmi:id="_RN1AMBg0Ee2_erjsEmF9GQ" type="3010" element="_RNWfEBg0Ee2_erjsEmF9GQ"> | ||
597 | <styles xmi:type="notation:FontStyle" xmi:id="_RN1AMRg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
598 | <layoutConstraint xmi:type="notation:Location" xmi:id="_RN1AMhg0Ee2_erjsEmF9GQ"/> | ||
599 | </children> | ||
600 | <children xmi:type="notation:Node" xmi:id="_SGDosBg0Ee2_erjsEmF9GQ" type="3010" element="_SFkggBg0Ee2_erjsEmF9GQ"> | ||
601 | <styles xmi:type="notation:FontStyle" xmi:id="_SGDosRg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
602 | <layoutConstraint xmi:type="notation:Location" xmi:id="_SGDoshg0Ee2_erjsEmF9GQ"/> | ||
603 | </children> | ||
604 | <styles xmi:type="notation:SortingStyle" xmi:id="_LinJ1Rg0Ee2_erjsEmF9GQ"/> | ||
605 | <styles xmi:type="notation:FilteringStyle" xmi:id="_LinJ1hg0Ee2_erjsEmF9GQ"/> | ||
606 | </children> | ||
607 | <styles xmi:type="notation:ShapeStyle" xmi:id="_LinJ0Rg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
608 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LinJ0hg0Ee2_erjsEmF9GQ" x="2223" y="180" width="143" height="135"/> | ||
550 | </children> | 609 | </children> |
551 | <styles xmi:type="notation:DiagramStyle" xmi:id="_CsZB8qA4EeuqkpDnuik1sg"/> | 610 | <styles xmi:type="notation:DiagramStyle" xmi:id="_CsZB8qA4EeuqkpDnuik1sg"/> |
552 | <edges xmi:type="notation:Edge" xmi:id="_4eaYwKA8EeuqkpDnuik1sg" type="4001" element="_4eU5TqA8EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg"> | 611 | <edges xmi:type="notation:Edge" xmi:id="_4eaYwKA8EeuqkpDnuik1sg" type="4001" element="_4eU5TqA8EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg"> |
@@ -679,23 +738,23 @@ | |||
679 | </edges> | 738 | </edges> |
680 | <edges xmi:type="notation:Edge" xmi:id="_w-zMkKA8EeuqkpDnuik1sg" type="4001" element="_w-iG36A8EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg"> | 739 | <edges xmi:type="notation:Edge" xmi:id="_w-zMkKA8EeuqkpDnuik1sg" type="4001" element="_w-iG36A8EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg"> |
681 | <children xmi:type="notation:Node" xmi:id="_w-zMlKA8EeuqkpDnuik1sg" type="6001"> | 740 | <children xmi:type="notation:Node" xmi:id="_w-zMlKA8EeuqkpDnuik1sg" type="6001"> |
682 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zMlaA8EeuqkpDnuik1sg" x="-630" y="-58"/> | 741 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zMlaA8EeuqkpDnuik1sg" x="-624" y="-56"/> |
683 | </children> | 742 | </children> |
684 | <children xmi:type="notation:Node" xmi:id="_w-zzoKA8EeuqkpDnuik1sg" type="6002"> | 743 | <children xmi:type="notation:Node" xmi:id="_w-zzoKA8EeuqkpDnuik1sg" type="6002"> |
685 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzoaA8EeuqkpDnuik1sg" x="554" y="79"/> | 744 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzoaA8EeuqkpDnuik1sg" x="556" y="77"/> |
686 | </children> | 745 | </children> |
687 | <children xmi:type="notation:Node" xmi:id="_w-zzoqA8EeuqkpDnuik1sg" type="6003"> | 746 | <children xmi:type="notation:Node" xmi:id="_w-zzoqA8EeuqkpDnuik1sg" type="6003"> |
688 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzo6A8EeuqkpDnuik1sg" x="-230" y="72"/> | 747 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzo6A8EeuqkpDnuik1sg" x="-232" y="58"/> |
689 | </children> | 748 | </children> |
690 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_w-zMkaA8EeuqkpDnuik1sg" routing="Rectilinear"/> | 749 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_w-zMkaA8EeuqkpDnuik1sg" routing="Rectilinear"/> |
691 | <styles xmi:type="notation:FontStyle" xmi:id="_w-zMkqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 750 | <styles xmi:type="notation:FontStyle" xmi:id="_w-zMkqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
692 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-zMk6A8EeuqkpDnuik1sg" points="[0, 6, 1421, 6]$[-379, 6, 1042, 6]$[-379, -63, 1042, -63]$[-1034, -63, 387, -63]$[-1034, -1, 387, -1]$[-1421, -1, 0, -1]"/> | 751 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-zMk6A8EeuqkpDnuik1sg" points="[0, 6, 1421, 6]$[-379, 6, 1042, 6]$[-379, -61, 1042, -61]$[-1034, -61, 387, -61]$[-1034, -13, 387, -13]$[-1421, -13, 0, -13]"/> |
693 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpKA8EeuqkpDnuik1sg" id="(0.0,0.44954128440366975)"/> | 752 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpKA8EeuqkpDnuik1sg" id="(0.0,0.44954128440366975)"/> |
694 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpaA8EeuqkpDnuik1sg" id="(1.0,0.5)"/> | 753 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpaA8EeuqkpDnuik1sg" id="(1.0,0.5)"/> |
695 | </edges> | 754 | </edges> |
696 | <edges xmi:type="notation:Edge" xmi:id="_W89dcNbFEeuymriYTNxK2g" type="4001" element="_Z7FrQKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg"> | 755 | <edges xmi:type="notation:Edge" xmi:id="_W89dcNbFEeuymriYTNxK2g" type="4001" element="_Z7FrQKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg"> |
697 | <children xmi:type="notation:Node" xmi:id="_W89ddNbFEeuymriYTNxK2g" type="6001"> | 756 | <children xmi:type="notation:Node" xmi:id="_W89ddNbFEeuymriYTNxK2g" type="6001"> |
698 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W89dddbFEeuymriYTNxK2g" x="-338" y="-67"/> | 757 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W89dddbFEeuymriYTNxK2g" x="-315" y="-56"/> |
699 | </children> | 758 | </children> |
700 | <children xmi:type="notation:Node" xmi:id="_W8-EgNbFEeuymriYTNxK2g" type="6002"> | 759 | <children xmi:type="notation:Node" xmi:id="_W8-EgNbFEeuymriYTNxK2g" type="6002"> |
701 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-EgdbFEeuymriYTNxK2g" x="-22" y="3"/> | 760 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-EgdbFEeuymriYTNxK2g" x="-22" y="3"/> |
@@ -705,7 +764,7 @@ | |||
705 | </children> | 764 | </children> |
706 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_W89dcdbFEeuymriYTNxK2g" routing="Rectilinear"/> | 765 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_W89dcdbFEeuymriYTNxK2g" routing="Rectilinear"/> |
707 | <styles xmi:type="notation:FontStyle" xmi:id="_W89dctbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 766 | <styles xmi:type="notation:FontStyle" xmi:id="_W89dctbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
708 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W89dc9bFEeuymriYTNxK2g" points="[-75, 50, 505, 414]$[-182, 50, 398, 414]$[-182, -384, 398, -20]$[-569, -384, 11, -20]"/> | 767 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W89dc9bFEeuymriYTNxK2g" points="[-75, 50, 505, 414]$[-182, 50, 398, 414]$[-182, -385, 398, -21]$[-569, -385, 11, -21]"/> |
709 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SoNbFEeuymriYTNxK2g" id="(0.635593220338983,0.0)"/> | 768 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SoNbFEeuymriYTNxK2g" id="(0.635593220338983,0.0)"/> |
710 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SodbFEeuymriYTNxK2g" id="(0.9067796610169492,0.6938775510204082)"/> | 769 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SodbFEeuymriYTNxK2g" id="(0.9067796610169492,0.6938775510204082)"/> |
711 | </edges> | 770 | </edges> |
@@ -1126,17 +1185,17 @@ | |||
1126 | </edges> | 1185 | </edges> |
1127 | <edges xmi:type="notation:Edge" xmi:id="_mQXegKA9EeuqkpDnuik1sg" type="4001" element="_mQFKsqA9EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg"> | 1186 | <edges xmi:type="notation:Edge" xmi:id="_mQXegKA9EeuqkpDnuik1sg" type="4001" element="_mQFKsqA9EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg"> |
1128 | <children xmi:type="notation:Node" xmi:id="_mQYFkKA9EeuqkpDnuik1sg" type="6001"> | 1187 | <children xmi:type="notation:Node" xmi:id="_mQYFkKA9EeuqkpDnuik1sg" type="6001"> |
1129 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFkaA9EeuqkpDnuik1sg" x="-88" y="-10"/> | 1188 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFkaA9EeuqkpDnuik1sg" x="-140" y="-10"/> |
1130 | </children> | 1189 | </children> |
1131 | <children xmi:type="notation:Node" xmi:id="_mQYFkqA9EeuqkpDnuik1sg" type="6002"> | 1190 | <children xmi:type="notation:Node" xmi:id="_mQYFkqA9EeuqkpDnuik1sg" type="6002"> |
1132 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFk6A9EeuqkpDnuik1sg" x="-88" y="10"/> | 1191 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFk6A9EeuqkpDnuik1sg" x="-140" y="10"/> |
1133 | </children> | 1192 | </children> |
1134 | <children xmi:type="notation:Node" xmi:id="_mQYFlKA9EeuqkpDnuik1sg" type="6003"> | 1193 | <children xmi:type="notation:Node" xmi:id="_mQYFlKA9EeuqkpDnuik1sg" type="6003"> |
1135 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFlaA9EeuqkpDnuik1sg" x="-88" y="10"/> | 1194 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFlaA9EeuqkpDnuik1sg" x="-140" y="10"/> |
1136 | </children> | 1195 | </children> |
1137 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_mQXegaA9EeuqkpDnuik1sg" routing="Tree"/> | 1196 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_mQXegaA9EeuqkpDnuik1sg" routing="Tree"/> |
1138 | <styles xmi:type="notation:FontStyle" xmi:id="_mQXegqA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/> | 1197 | <styles xmi:type="notation:FontStyle" xmi:id="_mQXegqA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/> |
1139 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQXeg6A9EeuqkpDnuik1sg" points="[0, -4, 1313, 142]$[0, -51, 1313, 95]$[-1312, -51, 1, 95]$[-1312, -97, 1, 49]"/> | 1198 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQXeg6A9EeuqkpDnuik1sg" points="[0, -4, 1356, 143]$[0, -28, 1356, 119]$[-1355, -28, 1, 119]$[-1355, -98, 1, 49]"/> |
1140 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFlqA9EeuqkpDnuik1sg" id="(0.4745762711864407,0.03669724770642201)"/> | 1199 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFlqA9EeuqkpDnuik1sg" id="(0.4745762711864407,0.03669724770642201)"/> |
1141 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFl6A9EeuqkpDnuik1sg" id="(0.5,0.5)"/> | 1200 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFl6A9EeuqkpDnuik1sg" id="(0.5,0.5)"/> |
1142 | </edges> | 1201 | </edges> |
@@ -1222,18 +1281,18 @@ | |||
1222 | </edges> | 1281 | </edges> |
1223 | <edges xmi:type="notation:Edge" xmi:id="_zKMY0AGyEey7cfH5K6RyCw" type="4001" element="_zJpmRgGyEey7cfH5K6RyCw" source="_pdJrwAGyEey7cfH5K6RyCw" target="_xsq_MKA8EeuqkpDnuik1sg"> | 1282 | <edges xmi:type="notation:Edge" xmi:id="_zKMY0AGyEey7cfH5K6RyCw" type="4001" element="_zJpmRgGyEey7cfH5K6RyCw" source="_pdJrwAGyEey7cfH5K6RyCw" target="_xsq_MKA8EeuqkpDnuik1sg"> |
1224 | <children xmi:type="notation:Node" xmi:id="_zKM_4AGyEey7cfH5K6RyCw" type="6001"> | 1283 | <children xmi:type="notation:Node" xmi:id="_zKM_4AGyEey7cfH5K6RyCw" type="6001"> |
1225 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_4QGyEey7cfH5K6RyCw" x="-463" y="19"/> | 1284 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_4QGyEey7cfH5K6RyCw" x="-341" y="8"/> |
1226 | </children> | 1285 | </children> |
1227 | <children xmi:type="notation:Node" xmi:id="_zKM_4gGyEey7cfH5K6RyCw" type="6002"> | 1286 | <children xmi:type="notation:Node" xmi:id="_zKM_4gGyEey7cfH5K6RyCw" type="6002"> |
1228 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_4wGyEey7cfH5K6RyCw" x="-91" y="10"/> | 1287 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_4wGyEey7cfH5K6RyCw" x="-23"/> |
1229 | </children> | 1288 | </children> |
1230 | <children xmi:type="notation:Node" xmi:id="_zKM_5AGyEey7cfH5K6RyCw" type="6003"> | 1289 | <children xmi:type="notation:Node" xmi:id="_zKM_5AGyEey7cfH5K6RyCw" type="6003"> |
1231 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_5QGyEey7cfH5K6RyCw" x="-88" y="10"/> | 1290 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_5QGyEey7cfH5K6RyCw" x="-84" y="10"/> |
1232 | </children> | 1291 | </children> |
1233 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_zKMY0QGyEey7cfH5K6RyCw" routing="Rectilinear"/> | 1292 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_zKMY0QGyEey7cfH5K6RyCw" routing="Rectilinear"/> |
1234 | <styles xmi:type="notation:FontStyle" xmi:id="_zKMY0gGyEey7cfH5K6RyCw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 1293 | <styles xmi:type="notation:FontStyle" xmi:id="_zKMY0gGyEey7cfH5K6RyCw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
1235 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zKMY0wGyEey7cfH5K6RyCw" points="[-7, -15, -830, 120]$[-7, -63, -830, 72]$[859, -63, 36, 72]$[859, -109, 36, 26]"/> | 1294 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zKMY0wGyEey7cfH5K6RyCw" points="[-84, -5, -852, 120]$[-84, -53, -852, 72]$[804, -53, 36, 72]$[804, -99, 36, 26]"/> |
1236 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zKNm8AGyEey7cfH5K6RyCw" id="(0.4482758620689655,0.15306122448979592)"/> | 1295 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zKNm8AGyEey7cfH5K6RyCw" id="(0.8275862068965517,0.05102040816326531)"/> |
1237 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zKNm8QGyEey7cfH5K6RyCw" id="(0.0,0.7346938775510204)"/> | 1296 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zKNm8QGyEey7cfH5K6RyCw" id="(0.0,0.7346938775510204)"/> |
1238 | </edges> | 1297 | </edges> |
1239 | <edges xmi:type="notation:Edge" xmi:id="_vd7aQKA9EeuqkpDnuik1sg" type="4001" element="_vdptgqA9EeuqkpDnuik1sg" source="_QUDYMKA9EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg"> | 1298 | <edges xmi:type="notation:Edge" xmi:id="_vd7aQKA9EeuqkpDnuik1sg" type="4001" element="_vdptgqA9EeuqkpDnuik1sg" source="_QUDYMKA9EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg"> |
@@ -1302,17 +1361,17 @@ | |||
1302 | </edges> | 1361 | </edges> |
1303 | <edges xmi:type="notation:Edge" xmi:id="_s7wgoAGyEey7cfH5K6RyCw" type="4001" element="_s68oXAGyEey7cfH5K6RyCw" source="_pdJrwAGyEey7cfH5K6RyCw" target="_e73WIKA9EeuqkpDnuik1sg"> | 1362 | <edges xmi:type="notation:Edge" xmi:id="_s7wgoAGyEey7cfH5K6RyCw" type="4001" element="_s68oXAGyEey7cfH5K6RyCw" source="_pdJrwAGyEey7cfH5K6RyCw" target="_e73WIKA9EeuqkpDnuik1sg"> |
1304 | <children xmi:type="notation:Node" xmi:id="_s7xuwAGyEey7cfH5K6RyCw" type="6001"> | 1363 | <children xmi:type="notation:Node" xmi:id="_s7xuwAGyEey7cfH5K6RyCw" type="6001"> |
1305 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7xuwQGyEey7cfH5K6RyCw" x="-12" y="-10"/> | 1364 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7xuwQGyEey7cfH5K6RyCw" x="-60" y="-10"/> |
1306 | </children> | 1365 | </children> |
1307 | <children xmi:type="notation:Node" xmi:id="_s7yV0AGyEey7cfH5K6RyCw" type="6002"> | 1366 | <children xmi:type="notation:Node" xmi:id="_s7yV0AGyEey7cfH5K6RyCw" type="6002"> |
1308 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7yV0QGyEey7cfH5K6RyCw" x="-12" y="10"/> | 1367 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7yV0QGyEey7cfH5K6RyCw" x="-60" y="10"/> |
1309 | </children> | 1368 | </children> |
1310 | <children xmi:type="notation:Node" xmi:id="_s7yV0gGyEey7cfH5K6RyCw" type="6003"> | 1369 | <children xmi:type="notation:Node" xmi:id="_s7yV0gGyEey7cfH5K6RyCw" type="6003"> |
1311 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7yV0wGyEey7cfH5K6RyCw" x="-12" y="10"/> | 1370 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7yV0wGyEey7cfH5K6RyCw" x="-60" y="10"/> |
1312 | </children> | 1371 | </children> |
1313 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_s7wgoQGyEey7cfH5K6RyCw" routing="Tree"/> | 1372 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_s7wgoQGyEey7cfH5K6RyCw" routing="Tree"/> |
1314 | <styles xmi:type="notation:FontStyle" xmi:id="_s7wgogGyEey7cfH5K6RyCw" fontName="Noto Sans" fontHeight="8"/> | 1373 | <styles xmi:type="notation:FontStyle" xmi:id="_s7wgogGyEey7cfH5K6RyCw" fontName="Noto Sans" fontHeight="8"/> |
1315 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s7wgowGyEey7cfH5K6RyCw" points="[0, -6, -654, 192]$[0, -42, -654, 156]$[655, -42, 1, 156]$[655, -100, 1, 98]"/> | 1374 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s7wgowGyEey7cfH5K6RyCw" points="[0, -6, -654, 192]$[0, -30, -654, 168]$[655, -30, 1, 168]$[655, -100, 1, 98]"/> |
1316 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s71ZIAGyEey7cfH5K6RyCw" id="(0.5310344827586206,0.061224489795918366)"/> | 1375 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s71ZIAGyEey7cfH5K6RyCw" id="(0.5310344827586206,0.061224489795918366)"/> |
1317 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s71ZIQGyEey7cfH5K6RyCw" id="(0.5,0.0)"/> | 1376 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s71ZIQGyEey7cfH5K6RyCw" id="(0.5,0.0)"/> |
1318 | </edges> | 1377 | </edges> |
@@ -1328,7 +1387,7 @@ | |||
1328 | </children> | 1387 | </children> |
1329 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_s4W8oStaEeySS4mYSornnA" routing="Tree"/> | 1388 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_s4W8oStaEeySS4mYSornnA" routing="Tree"/> |
1330 | <styles xmi:type="notation:FontStyle" xmi:id="_s4W8oitaEeySS4mYSornnA" fontName="Segoe UI" fontHeight="8"/> | 1389 | <styles xmi:type="notation:FontStyle" xmi:id="_s4W8oitaEeySS4mYSornnA" fontName="Segoe UI" fontHeight="8"/> |
1331 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s4W8oytaEeySS4mYSornnA" points="[-1, -49, 819, 198]$[-1, -103, 819, 144]$[-819, -103, 1, 144]$[-819, -149, 1, 98]"/> | 1390 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s4W8oytaEeySS4mYSornnA" points="[0, -49, 820, 198]$[0, -79, 820, 168]$[-819, -79, 1, 168]$[-819, -149, 1, 98]"/> |
1332 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s4kYACtaEeySS4mYSornnA" id="(0.5,0.0)"/> | 1391 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s4kYACtaEeySS4mYSornnA" id="(0.5,0.0)"/> |
1333 | </edges> | 1392 | </edges> |
1334 | <edges xmi:type="notation:Edge" xmi:id="_n5uykKBJEeuqkpDnuik1sg" type="4001" element="_n5fiHqBJEeuqkpDnuik1sg" source="_zaq8oKA9EeuqkpDnuik1sg" target="_Ren3cKBJEeuqkpDnuik1sg"> | 1393 | <edges xmi:type="notation:Edge" xmi:id="_n5uykKBJEeuqkpDnuik1sg" type="4001" element="_n5fiHqBJEeuqkpDnuik1sg" source="_zaq8oKA9EeuqkpDnuik1sg" target="_Ren3cKBJEeuqkpDnuik1sg"> |
@@ -1763,6 +1822,38 @@ | |||
1763 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OTxJYBEOEe2n4oe17zFkvg" id="(0.3728813559322034,0.0)"/> | 1822 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OTxJYBEOEe2n4oe17zFkvg" id="(0.3728813559322034,0.0)"/> |
1764 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OTxJYREOEe2n4oe17zFkvg" id="(0.4322033898305085,1.0)"/> | 1823 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OTxJYREOEe2n4oe17zFkvg" id="(0.4322033898305085,1.0)"/> |
1765 | </edges> | 1824 | </edges> |
1825 | <edges xmi:type="notation:Edge" xmi:id="_I15r8Bg0Ee2_erjsEmF9GQ" type="4001" element="_I1ifnBg0Ee2_erjsEmF9GQ" source="_BnoHYBg0Ee2_erjsEmF9GQ" target="_V6pfMKA7EeuqkpDnuik1sg"> | ||
1826 | <children xmi:type="notation:Node" xmi:id="_I16TABg0Ee2_erjsEmF9GQ" type="6001"> | ||
1827 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I16TARg0Ee2_erjsEmF9GQ" y="-10"/> | ||
1828 | </children> | ||
1829 | <children xmi:type="notation:Node" xmi:id="_I166EBg0Ee2_erjsEmF9GQ" type="6002"> | ||
1830 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I166ERg0Ee2_erjsEmF9GQ" y="10"/> | ||
1831 | </children> | ||
1832 | <children xmi:type="notation:Node" xmi:id="_I166Ehg0Ee2_erjsEmF9GQ" type="6003"> | ||
1833 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I166Exg0Ee2_erjsEmF9GQ" y="10"/> | ||
1834 | </children> | ||
1835 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_I15r8Rg0Ee2_erjsEmF9GQ" routing="Tree"/> | ||
1836 | <styles xmi:type="notation:FontStyle" xmi:id="_I15r8hg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
1837 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I15r8xg0Ee2_erjsEmF9GQ" points="[0, 0, -80, 144]$[80, -144, 0, 0]"/> | ||
1838 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I18IMBg0Ee2_erjsEmF9GQ" id="(0.5847457627118644,0.0)"/> | ||
1839 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I18IMRg0Ee2_erjsEmF9GQ" id="(0.5,0.5)"/> | ||
1840 | </edges> | ||
1841 | <edges xmi:type="notation:Edge" xmi:id="_JYusMBg0Ee2_erjsEmF9GQ" type="4001" element="_JYUchxg0Ee2_erjsEmF9GQ" source="_GWV5QBg0Ee2_erjsEmF9GQ" target="_V6pfMKA7EeuqkpDnuik1sg"> | ||
1842 | <children xmi:type="notation:Node" xmi:id="_JYusNBg0Ee2_erjsEmF9GQ" type="6001"> | ||
1843 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYusNRg0Ee2_erjsEmF9GQ" y="-10"/> | ||
1844 | </children> | ||
1845 | <children xmi:type="notation:Node" xmi:id="_JYvTQBg0Ee2_erjsEmF9GQ" type="6002"> | ||
1846 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYvTQRg0Ee2_erjsEmF9GQ" y="10"/> | ||
1847 | </children> | ||
1848 | <children xmi:type="notation:Node" xmi:id="_JYvTQhg0Ee2_erjsEmF9GQ" type="6003"> | ||
1849 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYvTQxg0Ee2_erjsEmF9GQ" y="10"/> | ||
1850 | </children> | ||
1851 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_JYusMRg0Ee2_erjsEmF9GQ" routing="Tree"/> | ||
1852 | <styles xmi:type="notation:FontStyle" xmi:id="_JYusMhg0Ee2_erjsEmF9GQ" fontName="Noto Sans" fontHeight="8"/> | ||
1853 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JYusMxg0Ee2_erjsEmF9GQ" points="[0, 0, -36, 70]$[36, -70, 0, 0]"/> | ||
1854 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JYvTRBg0Ee2_erjsEmF9GQ" id="(0.3813559322033898,0.0)"/> | ||
1855 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JYvTRRg0Ee2_erjsEmF9GQ" id="(0.5,0.5)"/> | ||
1856 | </edges> | ||
1766 | </data> | 1857 | </data> |
1767 | </ownedAnnotationEntries> | 1858 | </ownedAnnotationEntries> |
1768 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_Csiy8KA4EeuqkpDnuik1sg" source="DANNOTATION_CUSTOMIZATION_KEY"> | 1859 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_Csiy8KA4EeuqkpDnuik1sg" source="DANNOTATION_CUSTOMIZATION_KEY"> |
@@ -2142,14 +2233,15 @@ | |||
2142 | </ownedStyle> | 2233 | </ownedStyle> |
2143 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | 2234 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> |
2144 | </ownedDiagramElements> | 2235 | </ownedDiagramElements> |
2145 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_V6YZcKA7EeuqkpDnuik1sg" name="NegativeLiteral" tooltipText="" outgoingEdges="_yCjlHKA7EeuqkpDnuik1sg _UJJy0qBDEeuqkpDnuik1sg _9OddBqA7EeuqkpDnuik1sg" width="12" height="10"> | 2236 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_V6YZcKA7EeuqkpDnuik1sg" name="CompoundLiteral" tooltipText="" outgoingEdges="_yCjlHKA7EeuqkpDnuik1sg _UJJy0qBDEeuqkpDnuik1sg _9OddBqA7EeuqkpDnuik1sg" incomingEdges="_I1ifnBg0Ee2_erjsEmF9GQ _JYUchxg0Ee2_erjsEmF9GQ" width="12" height="10"> |
2146 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | 2237 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/> |
2147 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | 2238 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/> |
2148 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 2239 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
2149 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | 2240 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> |
2150 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | 2241 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> |
2151 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_V6ZAgKA7EeuqkpDnuik1sg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | 2242 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_F-O7RBg0Ee2_erjsEmF9GQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> |
2152 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | 2243 | <labelFormat>italic</labelFormat> |
2244 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> | ||
2153 | </ownedStyle> | 2245 | </ownedStyle> |
2154 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 2246 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
2155 | </ownedDiagramElements> | 2247 | </ownedDiagramElements> |
@@ -2178,8 +2270,8 @@ | |||
2178 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | 2270 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> |
2179 | </ownedDiagramElements> | 2271 | </ownedDiagramElements> |
2180 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yCjlHKA7EeuqkpDnuik1sg" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_rRcdoKA7EeuqkpDnuik1sg"> | 2272 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yCjlHKA7EeuqkpDnuik1sg" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_rRcdoKA7EeuqkpDnuik1sg"> |
2181 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | 2273 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/> |
2182 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | 2274 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/> |
2183 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-1Te36A7EeuqkpDnuik1sg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> | 2275 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-1Te36A7EeuqkpDnuik1sg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> |
2184 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/> | 2276 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/> |
2185 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_-1Te4KA7EeuqkpDnuik1sg" showIcon="false"> | 2277 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_-1Te4KA7EeuqkpDnuik1sg" showIcon="false"> |
@@ -2203,8 +2295,8 @@ | |||
2203 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | 2295 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> |
2204 | </ownedDiagramElements> | 2296 | </ownedDiagramElements> |
2205 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_9OddBqA7EeuqkpDnuik1sg" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_4k00sKA6EeuqkpDnuik1sg"> | 2297 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_9OddBqA7EeuqkpDnuik1sg" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_4k00sKA6EeuqkpDnuik1sg"> |
2206 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | 2298 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/> |
2207 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | 2299 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/> |
2208 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_9OeD4KA7EeuqkpDnuik1sg" targetArrow="InputClosedArrow" routingStyle="tree"> | 2300 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_9OeD4KA7EeuqkpDnuik1sg" targetArrow="InputClosedArrow" routingStyle="tree"> |
2209 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | 2301 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> |
2210 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_9OeD4aA7EeuqkpDnuik1sg" showIcon="false"> | 2302 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_9OeD4aA7EeuqkpDnuik1sg" showIcon="false"> |
@@ -2479,8 +2571,8 @@ | |||
2479 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | 2571 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> |
2480 | </ownedDiagramElements> | 2572 | </ownedDiagramElements> |
2481 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_UJJy0qBDEeuqkpDnuik1sg" name="[0..1] atom" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_6J_bsKA6EeuqkpDnuik1sg"> | 2573 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_UJJy0qBDEeuqkpDnuik1sg" name="[0..1] atom" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_6J_bsKA6EeuqkpDnuik1sg"> |
2482 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NegativeLiteral/atom"/> | 2574 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CompoundLiteral/atom"/> |
2483 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NegativeLiteral/atom"/> | 2575 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CompoundLiteral/atom"/> |
2484 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_UJKZ0KBDEeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> | 2576 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_UJKZ0KBDEeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> |
2485 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_UJKZ0qBDEeuqkpDnuik1sg" showIcon="false"> | 2577 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_UJKZ0qBDEeuqkpDnuik1sg" showIcon="false"> |
2486 | <customFeatures>labelSize</customFeatures> | 2578 | <customFeatures>labelSize</customFeatures> |
@@ -3476,6 +3568,127 @@ | |||
3476 | </ownedStyle> | 3568 | </ownedStyle> |
3477 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | 3569 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> |
3478 | </ownedDiagramElements> | 3570 | </ownedDiagramElements> |
3571 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_BmVG4Bg0Ee2_erjsEmF9GQ" name="NegativeLiteral" tooltipText="" outgoingEdges="_I1ifnBg0Ee2_erjsEmF9GQ" width="12" height="10"> | ||
3572 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | ||
3573 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | ||
3574 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
3575 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
3576 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
3577 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_BmVt8Bg0Ee2_erjsEmF9GQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | ||
3578 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | ||
3579 | </ownedStyle> | ||
3580 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
3581 | </ownedDiagramElements> | ||
3582 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GVp8wBg0Ee2_erjsEmF9GQ" name="CountLiteral" tooltipText="" outgoingEdges="_JYUchxg0Ee2_erjsEmF9GQ" width="12" height="10"> | ||
3583 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CountLiteral"/> | ||
3584 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CountLiteral"/> | ||
3585 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
3586 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
3587 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
3588 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_WJ5Rlxg0Ee2_erjsEmF9GQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | ||
3589 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | ||
3590 | </ownedStyle> | ||
3591 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
3592 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_UBW3wBg0Ee2_erjsEmF9GQ" name="op : ComparisonOp = LESS" tooltipText=""> | ||
3593 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//CountLiteral/op"/> | ||
3594 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//CountLiteral/op"/> | ||
3595 | <ownedStyle xmi:type="diagram:BundledImage" uid="_U6amsxg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3596 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
3597 | </ownedStyle> | ||
3598 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
3599 | </ownedElements> | ||
3600 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_VZ5YABg0Ee2_erjsEmF9GQ" name="threshold : EInt = 0" tooltipText=""> | ||
3601 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//CountLiteral/threshold"/> | ||
3602 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//CountLiteral/threshold"/> | ||
3603 | <ownedStyle xmi:type="diagram:BundledImage" uid="_WJ878Rg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3604 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
3605 | </ownedStyle> | ||
3606 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
3607 | </ownedElements> | ||
3608 | </ownedDiagramElements> | ||
3609 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_I1ifnBg0Ee2_erjsEmF9GQ" sourceNode="_BmVG4Bg0Ee2_erjsEmF9GQ" targetNode="_V6YZcKA7EeuqkpDnuik1sg"> | ||
3610 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | ||
3611 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/> | ||
3612 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_I1ifnRg0Ee2_erjsEmF9GQ" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
3613 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | ||
3614 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_I1ifnhg0Ee2_erjsEmF9GQ" showIcon="false"> | ||
3615 | <labelFormat>italic</labelFormat> | ||
3616 | </beginLabelStyle> | ||
3617 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_I1ifnxg0Ee2_erjsEmF9GQ" showIcon="false"/> | ||
3618 | </ownedStyle> | ||
3619 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
3620 | </ownedDiagramElements> | ||
3621 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_JYUchxg0Ee2_erjsEmF9GQ" sourceNode="_GVp8wBg0Ee2_erjsEmF9GQ" targetNode="_V6YZcKA7EeuqkpDnuik1sg"> | ||
3622 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CountLiteral"/> | ||
3623 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CountLiteral"/> | ||
3624 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WKE35Bg0Ee2_erjsEmF9GQ" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
3625 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | ||
3626 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_WKE35Rg0Ee2_erjsEmF9GQ" showIcon="false"> | ||
3627 | <labelFormat>italic</labelFormat> | ||
3628 | </beginLabelStyle> | ||
3629 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WKE35hg0Ee2_erjsEmF9GQ" showIcon="false"/> | ||
3630 | </ownedStyle> | ||
3631 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
3632 | </ownedDiagramElements> | ||
3633 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_LiM6IBg0Ee2_erjsEmF9GQ" name="ComparisonOp" tooltipText="" width="12" height="10"> | ||
3634 | <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//ComparisonOp"/> | ||
3635 | <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//ComparisonOp"/> | ||
3636 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
3637 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
3638 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
3639 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_LiNhMBg0Ee2_erjsEmF9GQ" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> | ||
3640 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> | ||
3641 | </ownedStyle> | ||
3642 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/> | ||
3643 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_OOZaoBg0Ee2_erjsEmF9GQ" name="LESS" tooltipText=""> | ||
3644 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/LESS"/> | ||
3645 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/LESS"/> | ||
3646 | <ownedStyle xmi:type="diagram:BundledImage" uid="_OOaBsBg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3647 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
3648 | </ownedStyle> | ||
3649 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
3650 | </ownedElements> | ||
3651 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_PSulcBg0Ee2_erjsEmF9GQ" name="LESS_EQ" tooltipText=""> | ||
3652 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/LESS_EQ"/> | ||
3653 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/LESS_EQ"/> | ||
3654 | <ownedStyle xmi:type="diagram:BundledImage" uid="_PSulcRg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3655 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
3656 | </ownedStyle> | ||
3657 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
3658 | </ownedElements> | ||
3659 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_PqAdABg0Ee2_erjsEmF9GQ" name="GREATER" tooltipText=""> | ||
3660 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/GREATER"/> | ||
3661 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/GREATER"/> | ||
3662 | <ownedStyle xmi:type="diagram:BundledImage" uid="_PqBEEBg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3663 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
3664 | </ownedStyle> | ||
3665 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
3666 | </ownedElements> | ||
3667 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_QFxL8Bg0Ee2_erjsEmF9GQ" name="GREATER_EQ" tooltipText=""> | ||
3668 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/GREATER_EQ"/> | ||
3669 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/GREATER_EQ"/> | ||
3670 | <ownedStyle xmi:type="diagram:BundledImage" uid="_QFxzABg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3671 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
3672 | </ownedStyle> | ||
3673 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
3674 | </ownedElements> | ||
3675 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_RNWfEBg0Ee2_erjsEmF9GQ" name="EQ" tooltipText=""> | ||
3676 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/EQ"/> | ||
3677 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/EQ"/> | ||
3678 | <ownedStyle xmi:type="diagram:BundledImage" uid="_RNWfERg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3679 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
3680 | </ownedStyle> | ||
3681 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
3682 | </ownedElements> | ||
3683 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_SFkggBg0Ee2_erjsEmF9GQ" name="NOT_EQ" tooltipText=""> | ||
3684 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/NOT_EQ"/> | ||
3685 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ComparisonOp/NOT_EQ"/> | ||
3686 | <ownedStyle xmi:type="diagram:BundledImage" uid="_SFlHkBg0Ee2_erjsEmF9GQ" labelAlignment="LEFT"> | ||
3687 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
3688 | </ownedStyle> | ||
3689 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
3690 | </ownedElements> | ||
3691 | </ownedDiagramElements> | ||
3479 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 3692 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
3480 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_CsWlsKA4EeuqkpDnuik1sg"/> | 3693 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_CsWlsKA4EeuqkpDnuik1sg"/> |
3481 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> | 3694 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore index 16683952..5f42341d 100644 --- a/subprojects/language-model/src/main/resources/model/problem.ecore +++ b/subprojects/language-model/src/main/resources/model/problem.ecore | |||
@@ -48,7 +48,7 @@ | |||
48 | eType="#//Argument" containment="true"/> | 48 | eType="#//Argument" containment="true"/> |
49 | </eClassifiers> | 49 | </eClassifiers> |
50 | <eClassifiers xsi:type="ecore:EClass" name="ImplicitVariable" eSuperTypes="#//Variable"/> | 50 | <eClassifiers xsi:type="ecore:EClass" name="ImplicitVariable" eSuperTypes="#//Variable"/> |
51 | <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//ExistentialQuantifier #//Literal"> | 51 | <eClassifiers xsi:type="ecore:EClass" name="CompoundLiteral" abstract="true" eSuperTypes="#//ExistentialQuantifier #//Literal"> |
52 | <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/> | 52 | <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/> |
53 | </eClassifiers> | 53 | </eClassifiers> |
54 | <eClassifiers xsi:type="ecore:EClass" name="ExistentialQuantifier" abstract="true" | 54 | <eClassifiers xsi:type="ecore:EClass" name="ExistentialQuantifier" abstract="true" |
@@ -177,4 +177,18 @@ | |||
177 | <eLiterals name="MUST" value="2"/> | 177 | <eLiterals name="MUST" value="2"/> |
178 | <eLiterals name="CURRENT" value="3"/> | 178 | <eLiterals name="CURRENT" value="3"/> |
179 | </eClassifiers> | 179 | </eClassifiers> |
180 | <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//CompoundLiteral"/> | ||
181 | <eClassifiers xsi:type="ecore:EClass" name="CountLiteral" eSuperTypes="#//CompoundLiteral"> | ||
182 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="#//ComparisonOp"/> | ||
183 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="threshold" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" | ||
184 | defaultValueLiteral="0"/> | ||
185 | </eClassifiers> | ||
186 | <eClassifiers xsi:type="ecore:EEnum" name="ComparisonOp"> | ||
187 | <eLiterals name="LESS"/> | ||
188 | <eLiterals name="LESS_EQ" value="1"/> | ||
189 | <eLiterals name="GREATER" value="2"/> | ||
190 | <eLiterals name="GREATER_EQ" value="3"/> | ||
191 | <eLiterals name="EQ" value="4"/> | ||
192 | <eLiterals name="NOT_EQ" value="5"/> | ||
193 | </eClassifiers> | ||
180 | </ecore:EPackage> | 194 | </ecore:EPackage> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel index 5a1da4d4..60dec198 100644 --- a/subprojects/language-model/src/main/resources/model/problem.genmodel +++ b/subprojects/language-model/src/main/resources/model/problem.genmodel | |||
@@ -22,6 +22,14 @@ | |||
22 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/MUST"/> | 22 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/MUST"/> |
23 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/CURRENT"/> | 23 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/CURRENT"/> |
24 | </genEnums> | 24 | </genEnums> |
25 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//ComparisonOp"> | ||
26 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/LESS"/> | ||
27 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/LESS_EQ"/> | ||
28 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/GREATER"/> | ||
29 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/GREATER_EQ"/> | ||
30 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/EQ"/> | ||
31 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/NOT_EQ"/> | ||
32 | </genEnums> | ||
25 | <genClasses ecoreClass="problem.ecore#//Problem"> | 33 | <genClasses ecoreClass="problem.ecore#//Problem"> |
26 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> | 34 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> |
27 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/> | 35 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/> |
@@ -61,8 +69,8 @@ | |||
61 | <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/arguments"/> | 69 | <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/arguments"/> |
62 | </genClasses> | 70 | </genClasses> |
63 | <genClasses ecoreClass="problem.ecore#//ImplicitVariable"/> | 71 | <genClasses ecoreClass="problem.ecore#//ImplicitVariable"/> |
64 | <genClasses ecoreClass="problem.ecore#//NegativeLiteral"> | 72 | <genClasses ecoreClass="problem.ecore#//CompoundLiteral"> |
65 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NegativeLiteral/atom"/> | 73 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//CompoundLiteral/atom"/> |
66 | </genClasses> | 74 | </genClasses> |
67 | <genClasses ecoreClass="problem.ecore#//ExistentialQuantifier"> | 75 | <genClasses ecoreClass="problem.ecore#//ExistentialQuantifier"> |
68 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExistentialQuantifier/implicitVariables"/> | 76 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExistentialQuantifier/implicitVariables"/> |
@@ -153,5 +161,10 @@ | |||
153 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NewAction/parent"/> | 161 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NewAction/parent"/> |
154 | </genClasses> | 162 | </genClasses> |
155 | <genClasses ecoreClass="problem.ecore#//NewVariable"/> | 163 | <genClasses ecoreClass="problem.ecore#//NewVariable"/> |
164 | <genClasses ecoreClass="problem.ecore#//NegativeLiteral"/> | ||
165 | <genClasses ecoreClass="problem.ecore#//CountLiteral"> | ||
166 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//CountLiteral/op"/> | ||
167 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//CountLiteral/threshold"/> | ||
168 | </genClasses> | ||
156 | </genPackages> | 169 | </genPackages> |
157 | </genmodel:GenModel> | 170 | </genmodel:GenModel> |
diff --git a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext index ba885e3c..93d066af 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext +++ b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext | |||
@@ -58,11 +58,17 @@ Consequent: | |||
58 | actions+=Action ("," actions+=Action)*; | 58 | actions+=Action ("," actions+=Action)*; |
59 | 59 | ||
60 | Literal: | 60 | Literal: |
61 | Atom | NegativeLiteral; | 61 | Atom | NegativeLiteral | CountLiteral; |
62 | 62 | ||
63 | NegativeLiteral: | 63 | NegativeLiteral: |
64 | modality=Modality? "!" atom=Atom; | 64 | modality=Modality? "!" atom=Atom; |
65 | 65 | ||
66 | enum ComparisonOp: | ||
67 | LESS="<" | LESS_EQ="<=" | GREATER=">" | GREATER_EQ=">=" | EQ="=:=" | NOT_EQ="=!=" ; | ||
68 | |||
69 | CountLiteral: | ||
70 | modality=Modality? "count" "{" atom=Atom "}" op=ComparisonOp threshold=INT; | ||
71 | |||
66 | Action: | 72 | Action: |
67 | AssertionAction | DeleteAction | NewAction; | 73 | AssertionAction | DeleteAction | NewAction; |
68 | 74 | ||
@@ -174,7 +180,7 @@ QualifiedName hidden(): | |||
174 | 180 | ||
175 | Identifier: | 181 | Identifier: |
176 | ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" | | 182 | ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" | |
177 | "indiv" | "problem" | "new" | "delete" | "rule" | "may" | "must" | "current"; | 183 | "indiv" | "problem" | "new" | "delete" | "rule" | "may" | "must" | "current" | "count"; |
178 | 184 | ||
179 | Integer returns ecore::EInt hidden(): | 185 | Integer returns ecore::EInt hidden(): |
180 | "-"? INT; | 186 | "-"? INT; |
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java b/subprojects/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java index 4d19006f..b76c4bf7 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java +++ b/subprojects/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java | |||
@@ -18,11 +18,11 @@ import com.google.inject.name.Named; | |||
18 | 18 | ||
19 | import tools.refinery.language.model.problem.Argument; | 19 | import tools.refinery.language.model.problem.Argument; |
20 | import tools.refinery.language.model.problem.Atom; | 20 | import tools.refinery.language.model.problem.Atom; |
21 | import tools.refinery.language.model.problem.CompoundLiteral; | ||
21 | import tools.refinery.language.model.problem.Conjunction; | 22 | import tools.refinery.language.model.problem.Conjunction; |
22 | import tools.refinery.language.model.problem.ExistentialQuantifier; | 23 | import tools.refinery.language.model.problem.ExistentialQuantifier; |
23 | import tools.refinery.language.model.problem.ImplicitVariable; | 24 | import tools.refinery.language.model.problem.ImplicitVariable; |
24 | import tools.refinery.language.model.problem.Literal; | 25 | import tools.refinery.language.model.problem.Literal; |
25 | import tools.refinery.language.model.problem.NegativeLiteral; | ||
26 | import tools.refinery.language.model.problem.Parameter; | 26 | import tools.refinery.language.model.problem.Parameter; |
27 | import tools.refinery.language.model.problem.ParametricDefinition; | 27 | import tools.refinery.language.model.problem.ParametricDefinition; |
28 | import tools.refinery.language.model.problem.Problem; | 28 | import tools.refinery.language.model.problem.Problem; |
@@ -76,16 +76,16 @@ public class DerivedVariableComputer { | |||
76 | createVariables(conjunction, newVariables); | 76 | createVariables(conjunction, newVariables); |
77 | newVariables.addAll(knownVariables); | 77 | newVariables.addAll(knownVariables); |
78 | for (Literal literal : conjunction.getLiterals()) { | 78 | for (Literal literal : conjunction.getLiterals()) { |
79 | if (literal instanceof NegativeLiteral negativeLiteral) { | 79 | if (literal instanceof CompoundLiteral compoundLiteral) { |
80 | installDeriveNegativeLiteralState(negativeLiteral, newVariables); | 80 | installDerivedCompoundLiteralState(compoundLiteral, newVariables); |
81 | } | 81 | } |
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||
85 | protected void installDeriveNegativeLiteralState(NegativeLiteral negativeLiteral, Set<String> knownVariables) { | 85 | protected void installDerivedCompoundLiteralState(CompoundLiteral compoundLiteral, Set<String> knownVariables) { |
86 | Set<String> newVariables = new HashSet<>(); | 86 | Set<String> newVariables = new HashSet<>(); |
87 | createSigletonVariablesAndCollectVariables(negativeLiteral.getAtom(), knownVariables, newVariables); | 87 | createSigletonVariablesAndCollectVariables(compoundLiteral.getAtom(), knownVariables, newVariables); |
88 | createVariables(negativeLiteral, newVariables); | 88 | createVariables(compoundLiteral, newVariables); |
89 | } | 89 | } |
90 | 90 | ||
91 | protected void createSigletonVariablesAndCollectVariables(Atom atom, Set<String> knownVariables, | 91 | protected void createSigletonVariablesAndCollectVariables(Atom atom, Set<String> knownVariables, |
@@ -169,9 +169,9 @@ public class DerivedVariableComputer { | |||
169 | if (literal instanceof Atom atom) { | 169 | if (literal instanceof Atom atom) { |
170 | discardDerivedAtomState(atom); | 170 | discardDerivedAtomState(atom); |
171 | } | 171 | } |
172 | if (literal instanceof NegativeLiteral negativeLiteral) { | 172 | if (literal instanceof CompoundLiteral compoundLiteral) { |
173 | negativeLiteral.getImplicitVariables().clear(); | 173 | compoundLiteral.getImplicitVariables().clear(); |
174 | discardDerivedAtomState(negativeLiteral.getAtom()); | 174 | discardDerivedAtomState(compoundLiteral.getAtom()); |
175 | } | 175 | } |
176 | } | 176 | } |
177 | } | 177 | } |