Skip to content

Commit 742f18a

Browse files
dbinkeledbinkele
committed
Improve STF-Algorithm by subconcept-priorization (1323)
1 parent aa07722 commit 742f18a

File tree

8 files changed

+1206
-54
lines changed

8 files changed

+1206
-54
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps‎

Lines changed: 510 additions & 54 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/models/test.org.iets3.analysis.base.solvable.plugin.mps‎

Lines changed: 350 additions & 0 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/models/test.org.iets3.analysis.base.solvable.structure.mps‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</languages>
77
<imports>
88
<import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
9+
<import index="91fu" ref="r:8d20232d-87e2-425b-b4d7-a9790e401b85(de.slisson.mps.conditionalEditor.structure)" />
910
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
1011
</imports>
1112
<registry>
@@ -45,6 +46,7 @@
4546
<node concept="1TIwiD" id="7wEqFvbOyMV">
4647
<property role="EcuMT" value="8658850571204308155" />
4748
<property role="TrG5h" value="DummyISolvable" />
49+
<ref role="1TJDcQ" node="2qZCmtwh4Va" resolve="H4Dummy" />
4850
<node concept="1TJgyi" id="7wEqFvbOzBi" role="1TKVEl">
4951
<property role="IQ2nx" value="8658850571204311506" />
5052
<property role="TrG5h" value="sleepTime" />
@@ -54,5 +56,25 @@
5456
<ref role="PrY4T" to="l80j:4pkidg67Lfn" resolve="ISolvable" />
5557
</node>
5658
</node>
59+
<node concept="1TIwiD" id="2qZCmtwh4V7">
60+
<property role="EcuMT" value="2792127759361789639" />
61+
<property role="TrG5h" value="H1Dummy" />
62+
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
63+
</node>
64+
<node concept="1TIwiD" id="2qZCmtwh4V8">
65+
<property role="EcuMT" value="2792127759361789640" />
66+
<property role="TrG5h" value="H2Dummy" />
67+
<ref role="1TJDcQ" node="2qZCmtwh4V7" resolve="H1Dummy" />
68+
</node>
69+
<node concept="1TIwiD" id="2qZCmtwh4V9">
70+
<property role="EcuMT" value="2792127759361789641" />
71+
<property role="TrG5h" value="H3Dummy" />
72+
<ref role="1TJDcQ" node="2qZCmtwh4V8" resolve="H2Dummy" />
73+
</node>
74+
<node concept="1TIwiD" id="2qZCmtwh4Va">
75+
<property role="EcuMT" value="2792127759361789642" />
76+
<property role="TrG5h" value="H4Dummy" />
77+
<ref role="1TJDcQ" node="2qZCmtwh4V9" resolve="H3Dummy" />
78+
</node>
5779
</model>
5880

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,20 @@
1414
<dependencies>
1515
<dependency reexport="false">db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)</dependency>
1616
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
17+
<dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
18+
<dependency reexport="false">b8bb702e-43ed-4090-a902-d180d3e5f292(de.slisson.mps.conditionalEditor)</dependency>
1719
</dependencies>
1820
<languageVersions>
1921
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
2022
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
2123
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
2224
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
2325
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
26+
<language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
2427
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
2528
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
2629
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
30+
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
2731
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
2832
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
2933
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
@@ -35,9 +39,11 @@
3539
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
3640
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
3741
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
42+
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
3843
<language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
3944
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
4045
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
46+
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
4147
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
4248
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
4349
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -48,6 +54,8 @@
4854
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
4955
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
5056
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
57+
<language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
58+
<language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
5159
</languageVersions>
5260
<dependencyVersions>
5361
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -65,9 +73,11 @@
6573
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
6674
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
6775
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
76+
<module reference="b8bb702e-43ed-4090-a902-d180d3e5f292(de.slisson.mps.conditionalEditor)" version="0" />
6877
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
6978
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
7079
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
80+
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
7181
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
7282
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
7383
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
@@ -76,6 +86,7 @@
7686
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
7787
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
7888
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
89+
<module reference="18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)" version="0" />
7990
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
8091
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
8192
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
@@ -87,6 +98,7 @@
8798
</dependencyVersions>
8899
<extendedLanguages>
89100
<extendedLanguage>db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)</extendedLanguage>
101+
<extendedLanguage>b8bb702e-43ed-4090-a902-d180d3e5f292(de.slisson.mps.conditionalEditor)</extendedLanguage>
90102
</extendedLanguages>
91103
</language>
92104

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14661,6 +14661,21 @@
1466114661
</node>
1466214662
</node>
1466314663
</node>
14664+
<node concept="1SiIV0" id="4aAsKjbTJHl" role="3bR37C">
14665+
<node concept="3bR9La" id="4aAsKjbTJHm" role="1SiIV1">
14666+
<ref role="3bR37D" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
14667+
</node>
14668+
</node>
14669+
<node concept="1SiIV0" id="4aAsKjbTNo$" role="3bR37C">
14670+
<node concept="3bR9La" id="4aAsKjbTNo_" role="1SiIV1">
14671+
<ref role="3bR37D" to="90a9:7klUZA6XM5Q" resolve="de.slisson.mps.conditionalEditor" />
14672+
</node>
14673+
</node>
14674+
<node concept="1SiIV0" id="4aAsKjbTNoS" role="3bR37C">
14675+
<node concept="1Busua" id="4aAsKjbTNoT" role="1SiIV1">
14676+
<ref role="1Busuk" to="90a9:7klUZA6XM5Q" resolve="de.slisson.mps.conditionalEditor" />
14677+
</node>
14678+
</node>
1466414679
</node>
1466514680
<node concept="1E1JtD" id="6HOb1cDNJ3a" role="3989C9">
1466614681
<property role="BnDLt" value="true" />

‎code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/[email protected]‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@
189189
</concept>
190190
<concept id="8974276187400348183" name="jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement" flags="nn" index="1QHqEM" />
191191
</language>
192+
<language id="5a0fae25-8093-498f-81fe-3b264864819a" name="test.org.iets3.analysis.base.solvable">
193+
<concept id="8658850571204308155" name="test.org.iets3.analysis.base.solvable.structure.DummyISolvable" flags="ng" index="2NY4oc">
194+
<property id="8658850571204311506" name="sleepTime" index="2NY5d_" />
195+
</concept>
196+
</language>
192197
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
193198
<concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
194199
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -2308,5 +2313,32 @@
23082313
</node>
23092314
<node concept="3Tm1VV" id="3x8VOVH1smh" role="1B3o_S" />
23102315
</node>
2316+
<node concept="2NY4oc" id="2qZCmtwohm7">
2317+
<property role="2NY5d_" value="506" />
2318+
</node>
2319+
<node concept="2NY4oc" id="2qZCmtwohm8">
2320+
<property role="2NY5d_" value="957" />
2321+
</node>
2322+
<node concept="2NY4oc" id="2qZCmtwohma">
2323+
<property role="2NY5d_" value="921" />
2324+
</node>
2325+
<node concept="2NY4oc" id="2qZCmtwohmp">
2326+
<property role="2NY5d_" value="654" />
2327+
</node>
2328+
<node concept="2NY4oc" id="2qZCmtwohmr">
2329+
<property role="2NY5d_" value="339" />
2330+
</node>
2331+
<node concept="2NY4oc" id="2qZCmtwohms">
2332+
<property role="2NY5d_" value="680" />
2333+
</node>
2334+
<node concept="2NY4oc" id="2qZCmtwohmu">
2335+
<property role="2NY5d_" value="989" />
2336+
</node>
2337+
<node concept="2NY4oc" id="2qZCmtwohmx">
2338+
<property role="2NY5d_" value="869" />
2339+
</node>
2340+
<node concept="2NY4oc" id="2qZCmtwohmy">
2341+
<property role="2NY5d_" value="262" />
2342+
</node>
23112343
</model>
23122344

0 commit comments

Comments
 (0)