Skip to content

Bufix/assignment causes behave unexpectedly #1650 #1444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: maintenance/mps20241
Choose a base branch
from
Open

Bufix/assignment causes behave unexpectedly #1650 #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
308e7aa
Detect changes to 'compulsory' attributes (#1650)
dbinkele Sep 18, 2025
7c35db0
Make 'assignmentCause' read-only (#1650)
dbinkele Sep 18, 2025
390a2bf
Remove call to depracted method (#1650)
dbinkele Sep 18, 2025
20fb578
migrate (#1650)
dbinkele Sep 18, 2025
4cdb9de
Improve Code Structure & increase time out (#1650)
dbinkele Sep 19, 2025
27c2563
Remove test offending code line (#1650)
dbinkele Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions ...riability.configuration.base/models/org.iets3.variability.configuration.base.behavior.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,8 +1242,8 @@
<ref role="37wK5l" node="6SMbav4Irm1" resolve="configurationRoot" />
</node>
</node>
<node concept="2qgKlT" id="6tuBwY6S72J" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW$_kz" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down Expand Up @@ -5079,6 +5079,30 @@
</node>
</node>
</node>
<node concept="13i0hz" id="1OonrpWrKwH" role="13h7CS">
<property role="TrG5h" value="runManuallyAsync" />
<ref role="13i0hy" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
<node concept="3Tm1VV" id="1OonrpWrKwI" role="1B3o_S" />
<node concept="3clFbS" id="1OonrpWrKwU" role="3clF47">
<node concept="3clFbF" id="1OonrpWrVQr" role="3cqZAp">
<node concept="2OqwBi" id="1OonrpWrWhs" role="3clFbG">
<node concept="13iPFW" id="1OonrpWrVQm" role="2Oq$k0" />
<node concept="2qgKlT" id="1OonrpWrXEp" role="2OqNvi">
<ref role="37wK5l" node="2tL1yL1z_3M" resolve="solverResultsAsync" />
</node>
</node>
</node>
</node>
<node concept="3uibUv" id="1OonrpWrKwV" role="3clF45">
<ref role="3uigEE" to="5zyv:~CompletableFuture" resolve="CompletableFuture" />
<node concept="3uibUv" id="1OonrpWrKwW" role="11_B2D">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3uibUv" id="1OonrpWrKwX" role="11_B2D">
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="1iVIHkN4kr5" role="13h7CS">
<property role="TrG5h" value="unassignedAttributes" />
<node concept="3Tm1VV" id="1iVIHkN4kr6" role="1B3o_S" />
Expand Down Expand Up @@ -15254,12 +15278,12 @@
<node concept="3clFbJ" id="5cx1lEoFsLD" role="3cqZAp">
<node concept="3clFbS" id="5cx1lEoFsLE" role="3clFbx">
<node concept="3clFbF" id="5cx1lEoFsLF" role="3cqZAp">
<node concept="2OqwBi" id="5cx1lEoFsLG" role="3clFbG">
<node concept="2OqwBi" id="1OonrpW$Au3" role="3clFbG">
<node concept="37vLTw" id="5cx1lEoFsLH" role="2Oq$k0">
<ref role="3cqZAo" node="5cx1lEoFsM2" resolve="config" />
</node>
<node concept="2qgKlT" id="6tuBwY6LK6k" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down Expand Up @@ -16031,8 +16055,8 @@
<node concept="37vLTw" id="1gnhaEd8tWO" role="2Oq$k0">
<ref role="3cqZAo" node="1gnhaEd8izs" resolve="config" />
</node>
<node concept="2qgKlT" id="1gnhaEd8tWP" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW$C2k" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down
4 changes: 2 additions & 2 deletions ...bility.configuration.base/models/org.iets3.variability.configuration.base.constraints.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,8 @@
<ref role="37wK5l" to="lte6:6SMbav4Irm1" resolve="configurationRoot" />
</node>
</node>
<node concept="2qgKlT" id="6tuBwY6XkEG" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down
53 changes: 29 additions & 24 deletions ...variability.configuration.base/models/org.iets3.variability.configuration.base.editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@
<child id="1164824815888" name="cellMenuPart" index="OY2wv" />
</concept>
<concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
</concept>
<concept id="1149850725784" name="jetbrains.mps.lang.editor.structure.CellModel_AttributedNodeCell" flags="ng" index="2SsqMj" />
<concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
<property id="1186403713874" name="color" index="Vb096" />
Expand Down Expand Up @@ -656,11 +659,8 @@
</node>
</node>
</node>
<node concept="3F0A7n" id="zJQZm7$hC4" role="1QoVPY">
<ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
<node concept="VechU" id="67408HOpX3w" role="3F10Kt">
<property role="Vb096" value="hGRnIZc/lightBlue" />
</node>
<node concept="PMmxH" id="fgtKqAw$65" role="1QoVPY">
<ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
</node>
</node>
</node>
Expand Down Expand Up @@ -727,11 +727,8 @@
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0A7n" id="zJQZm87vi4" role="3EZMnx">
<ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
<node concept="VechU" id="zJQZm87vib" role="3F10Kt">
<property role="Vb096" value="hGRnIZc/lightBlue" />
</node>
<node concept="PMmxH" id="fgtKqAw$lS" role="3EZMnx">
<ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
</node>
</node>
<node concept="3EZMnI" id="zJQZm8svLE" role="1QoS34">
Expand All @@ -747,11 +744,8 @@
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0A7n" id="zJQZm8sw3F" role="3EZMnx">
<ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
<node concept="VechU" id="zJQZm8sw3G" role="3F10Kt">
<property role="Vb096" value="hGRnIZc/lightBlue" />
</node>
<node concept="PMmxH" id="fgtKqAw$lR" role="3EZMnx">
<ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
</node>
</node>
</node>
Expand All @@ -768,11 +762,8 @@
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0A7n" id="zJQZm8swpY" role="3EZMnx">
<ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
<node concept="VechU" id="zJQZm8swpZ" role="3F10Kt">
<property role="Vb096" value="hGRnIZc/lightBlue" />
</node>
<node concept="PMmxH" id="fgtKqAw$lQ" role="3EZMnx">
<ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2244,8 +2235,8 @@
<ref role="37wK5l" to="lte6:6SMbav4Irm1" resolve="configurationRoot" />
</node>
</node>
<node concept="2qgKlT" id="6tuBwY6Xl$8" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW$Qu6" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down Expand Up @@ -3679,8 +3670,8 @@
<node concept="37vLTw" id="7PDiqB3$ty8" role="2Oq$k0">
<ref role="3cqZAo" node="7PDiqB3$txT" resolve="fmc" />
</node>
<node concept="2qgKlT" id="6tuBwY6Xlay" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down Expand Up @@ -4034,5 +4025,19 @@
</node>
</node>
</node>
<node concept="PKFIW" id="fgtKqAsHZd">
<property role="TrG5h" value="AssignmentCauseEditor" />
<ref role="1XX52x" to="4ndm:30ECcbtLqSm" resolve="FeatureAttributeAssignment" />
<node concept="3F0A7n" id="fgtKqAsHZf" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
<node concept="VechU" id="fgtKqAsJCM" role="3F10Kt">
<property role="Vb096" value="hGRnIZc/lightBlue" />
</node>
<node concept="xShMh" id="fgtKqA$5_r" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
</node>
</model>

16 changes: 8 additions & 8 deletions ...ability.configuration.base/models/org.iets3.variability.configuration.base.intentions.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,12 +1875,12 @@
</node>
<node concept="3clFbF" id="7EMjvkEduhB" role="3cqZAp">
<node concept="2OqwBi" id="7EMjvkEdv37" role="3clFbG">
<node concept="2qgKlT" id="6tuBwY72MUF" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
</node>
<node concept="37vLTw" id="4rT4o_z3oB3" role="2Oq$k0">
<ref role="3cqZAo" node="4rT4o_z3oAX" resolve="fmc" />
</node>
<node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -2495,12 +2495,12 @@
</node>
<node concept="3clFbF" id="1nsh0in5b7n" role="3cqZAp">
<node concept="2OqwBi" id="1nsh0in5b7o" role="3clFbG">
<node concept="2qgKlT" id="1nsh0in5b7p" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
</node>
<node concept="37vLTw" id="1nsh0in5b7q" role="2Oq$k0">
<ref role="3cqZAo" node="1nsh0in5b7c" resolve="fmc" />
</node>
<node concept="2qgKlT" id="1OonrpW_b3x" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -2538,8 +2538,8 @@
<node concept="3clFbF" id="6SMbav4IjL1" role="3cqZAp">
<node concept="2OqwBi" id="6SMbav4IjXh" role="3clFbG">
<node concept="2Sf5sV" id="6SMbav4IjKZ" role="2Oq$k0" />
<node concept="2qgKlT" id="6tuBwY72NaG" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW_NZG" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down
12 changes: 6 additions & 6 deletions ...iability.configuration.base/models/org.iets3.variability.configuration.base.listeners.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<node concept="2OqwBi" id="9gaRKr9Y8m" role="3clFbG">
<node concept="j_vvf" id="9gaRKr9XOP" role="2Oq$k0" />
<node concept="2qgKlT" id="9gaRKr9YLf" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand All @@ -203,8 +203,8 @@
<node concept="3clFbF" id="9gaRKr9YWB" role="3cqZAp">
<node concept="2OqwBi" id="9gaRKr9ZfR" role="3clFbG">
<node concept="j_vvf" id="9gaRKr9YWA" role="2Oq$k0" />
<node concept="2qgKlT" id="9gaRKr9ZT1" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW_f60" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand All @@ -228,8 +228,8 @@
</node>
</node>
</node>
<node concept="2qgKlT" id="9gaRKr9Qg4" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand All @@ -250,7 +250,7 @@
</node>
</node>
<node concept="2qgKlT" id="9gaRKr9QCU" role="2OqNvi">
<ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
<ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
</node>
</node>
</node>
Expand Down
Loading