From 6bc002e9040b7a00863b94ae89f62c8896c3452f Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 08:32:40 +0200 Subject: [PATCH 01/20] Add first implementation of the breadth-first traversal class (issue #2435). --- .../models/com/mbeddr/mpsutil/common/util.mps | 512 ++++++++++++++++++ 1 file changed, 512 insertions(+) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps index 8f4c62fc59..52135daba5 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps @@ -234,6 +234,7 @@ + @@ -341,6 +342,10 @@ + + + + @@ -348,6 +353,7 @@ + @@ -357,13 +363,16 @@ + + + @@ -374,6 +383,11 @@ + + + + + @@ -4182,5 +4196,503 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bfc47c9f25764ba497f4d4d46bb4dd39664ef09a Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 11:27:42 +0200 Subject: [PATCH 02/20] Add a lot of javadoc, extend static API (issue #2435). --- .../models/com/mbeddr/mpsutil/common/util.mps | 550 ++++++++++++++++++ 1 file changed, 550 insertions(+) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps index 52135daba5..ea50c18ec7 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps @@ -4258,6 +4258,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4320,6 +4354,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4432,8 +4500,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4449,6 +4825,13 @@ + + + + + + + @@ -4478,6 +4861,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4633,6 +5042,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4650,6 +5085,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4668,6 +5149,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4688,11 +5195,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 02e14c6b794131b8ae5b049fd002e18e3d49fca7 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 12:09:45 +0200 Subject: [PATCH 03/20] Fix logic bug in traversal (issue #2435). --- .../models/com/mbeddr/mpsutil/common/util.mps | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps index ea50c18ec7..528da6683b 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps @@ -4968,12 +4968,10 @@ - - - - - - + + + + From 8c65f1d46337aebde38dc9c22e5cee4d38b1044a Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 12:14:40 +0200 Subject: [PATCH 04/20] Provide a first set of tests (issue #2435). --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 1008 ++++++++++++++++- 1 file changed, 1007 insertions(+), 1 deletion(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index a47ca16840..65cab1f9af 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -6,12 +6,16 @@ + + + + @@ -21,14 +25,36 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -37,20 +63,29 @@ + + + + + + + + + @@ -66,15 +101,30 @@ + + + + + + + + + + + - + + + + + @@ -82,8 +132,13 @@ + + + + + @@ -105,8 +160,17 @@ + + + + + + + + + @@ -119,9 +183,24 @@ + + + + + + + + + + + + + + + @@ -377,6 +456,7 @@ + @@ -909,5 +989,931 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 026cfc03d9576d2a14463193edc9a0bb55cb5cdb Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 12:30:55 +0200 Subject: [PATCH 05/20] Add more tests (issue #2435). --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 862 ++++++++++++++---- 1 file changed, 692 insertions(+), 170 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index 65cab1f9af..e2987df5e2 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -64,7 +64,9 @@ - + + + @@ -133,6 +135,7 @@ + @@ -1000,7 +1003,7 @@ - + @@ -1076,55 +1079,131 @@ - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -1301,136 +1380,47 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - - - - + + + + + - - - - + + + + - + - - + + - - + + - - + + @@ -1449,7 +1439,7 @@ - + @@ -1461,7 +1451,7 @@ - + @@ -1470,7 +1460,7 @@ - + @@ -1489,7 +1479,7 @@ - + @@ -1514,7 +1504,7 @@ - + @@ -1543,7 +1533,7 @@ - + @@ -1562,7 +1552,7 @@ - + @@ -1594,7 +1584,7 @@ - + @@ -1641,7 +1631,7 @@ - + @@ -1660,7 +1650,7 @@ - + @@ -1692,7 +1682,7 @@ - + @@ -1701,7 +1691,7 @@ - + @@ -1720,7 +1710,7 @@ - + @@ -1765,7 +1755,7 @@ - + @@ -1812,7 +1802,7 @@ - + @@ -1831,7 +1821,7 @@ - + @@ -1876,7 +1866,7 @@ - + @@ -1905,7 +1895,7 @@ - + @@ -1914,6 +1904,538 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 324aecacfde99965ffb7ac0fbfc4a2a730f30f80 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 12:37:06 +0200 Subject: [PATCH 06/20] Add test cases checking traversal order (issue #2435). --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 265 ++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index e2987df5e2..3dc2252de4 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -32,6 +32,7 @@ + @@ -54,6 +55,9 @@ + + + @@ -98,6 +102,7 @@ + @@ -187,6 +192,15 @@ + + + + + + + + + @@ -198,7 +212,18 @@ + + + + + + + + + + + @@ -1468,6 +1493,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1997,6 +2142,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From eb708b828834dcd68ac8b522d238f2ef4b02b98f Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 12:47:46 +0200 Subject: [PATCH 07/20] Complete test suite by adding tests for inheritance-based API (issue #2435). --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 715 +++++++++++++++++- 1 file changed, 696 insertions(+), 19 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index 3dc2252de4..6679335f47 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -38,6 +38,12 @@ + + + + + + @@ -63,6 +69,7 @@ + @@ -99,6 +106,7 @@ + @@ -121,6 +129,7 @@ + @@ -1223,12 +1232,6 @@ - - - - - - @@ -1407,6 +1410,11 @@ + + + + + @@ -2056,6 +2064,11 @@ + + + + + @@ -2070,7 +2083,7 @@ - + @@ -2113,7 +2126,7 @@ - + @@ -2134,7 +2147,7 @@ - + @@ -2273,7 +2286,7 @@ - + @@ -2327,7 +2340,7 @@ - + @@ -2346,7 +2359,7 @@ - + @@ -2425,7 +2438,7 @@ - + @@ -2444,7 +2457,7 @@ - + @@ -2485,7 +2498,7 @@ - + @@ -2504,7 +2517,7 @@ - + @@ -2596,7 +2609,7 @@ - + @@ -2615,7 +2628,7 @@ - + @@ -2689,7 +2702,7 @@ - + @@ -2702,5 +2715,669 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fd5fe9ae662665d5f57ff8aab0400693e1475346 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 13:14:22 +0200 Subject: [PATCH 08/20] Remove need for test base class (issue #2435). --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 506 ++++++++++-------- 1 file changed, 288 insertions(+), 218 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index 6679335f47..f765119c2d 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -1026,215 +1026,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1410,6 +1201,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2057,13 +1932,130 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2711,13 +2703,94 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3375,9 +3448,6 @@ - - - From 39f04b4812ea423214bf6b32881d67a15bcd21cf Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 14:45:43 +0200 Subject: [PATCH 09/20] Update CHANGELOG. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aeb4a93a7..7839a4814c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month. +# May 2024 + +## com.mbeddr.mpsutil + +### Added + +- A new generic class `Traversal` is provided. It allows to do breadth-first traversals on data structures like graphs or trees. It is robust against cycles. + # April 2024 ## com.mbeddr.core From 701bb9f338518769fb1d7906409025b427d05f8a Mon Sep 17 00:00:00 2001 From: dbinkele Date: Wed, 15 May 2024 15:11:49 +0200 Subject: [PATCH 10/20] Resolve dependencies (#2435) --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index 6679335f47..00ccf53d14 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -11,11 +11,12 @@ - + + @@ -249,11 +250,11 @@ - + - + @@ -300,7 +301,7 @@ - + @@ -394,7 +395,7 @@ - + @@ -482,7 +483,7 @@ - + @@ -505,11 +506,11 @@ - + - + @@ -521,11 +522,11 @@ - + - + @@ -572,7 +573,7 @@ - + @@ -587,7 +588,7 @@ - + @@ -640,7 +641,7 @@ - + @@ -734,7 +735,7 @@ - + @@ -826,7 +827,7 @@ - + @@ -890,7 +891,7 @@ - + @@ -928,7 +929,7 @@ - + @@ -1011,7 +1012,7 @@ - + From daaab174fcad1d99d726d9b0b66a954880f64946 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Wed, 15 May 2024 15:12:09 +0200 Subject: [PATCH 11/20] Resolve dependencies cntd (#2435) --- code/languages/com.mbeddr.mpsutil/.mps/modules.xml | 6 ------ .../test.com.mbeddr.mpsutil.common.msd | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml index 6ccfeedfe1..1d26df75a7 100644 --- a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml +++ b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml @@ -200,12 +200,6 @@ - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd index 17b3c33196..251b042a54 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd @@ -13,14 +13,16 @@ c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common) - b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 822a7acd-f487-45f5-bbb9-1ce595a1705f(com.mbeddr.mpsutil.ecore.stubs) + + @@ -31,6 +33,7 @@ + From 40da0b6f7e2498314ad0de125c07f1fe6d91a081 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Wed, 15 May 2024 16:11:15 +0200 Subject: [PATCH 12/20] Improve tests (#2435) --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 728 ++++++++++-------- .../test.com.mbeddr.mpsutil.common.msd | 2 + 2 files changed, 400 insertions(+), 330 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index 438e215983..aceb63fab4 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -17,6 +17,7 @@ + @@ -33,7 +34,6 @@ - @@ -62,9 +62,6 @@ - - - @@ -111,7 +108,6 @@ - @@ -202,9 +198,6 @@ - - - @@ -225,15 +218,9 @@ - - - - - - @@ -1312,7 +1299,7 @@ - + @@ -1429,7 +1416,7 @@ - + @@ -1447,52 +1434,32 @@ - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + - - + + + + + + @@ -1516,21 +1483,15 @@ - - - - - - - - - - - - - + + + + + + + + - @@ -2218,52 +2179,35 @@ - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + + + + - - + + + + + + @@ -2287,21 +2231,15 @@ - - - - - - - - - - - - - + + + + + + + + - @@ -2429,6 +2367,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2518,21 +2499,15 @@ - - - - - - - - - - - - - + + + + + + + + - @@ -2600,6 +2575,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2629,21 +2647,15 @@ - - - - - - - - - - - - - + + + + + + + + - @@ -2795,11 +2807,7 @@ - - - - - + @@ -2823,13 +2831,6 @@ - - - - - - - @@ -2946,19 +2947,40 @@ - - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + @@ -2993,60 +3015,38 @@ - - - - + + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - @@ -3076,21 +3076,15 @@ - - - - - - - - - - - - - + + + + + + + + - @@ -3115,19 +3109,37 @@ - - - - + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + @@ -3165,56 +3177,71 @@ - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - + + - - + + - - - - + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + @@ -3251,17 +3278,37 @@ - - - - + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + @@ -3294,21 +3341,15 @@ - - - - - - - - - - - - - + + + + + + + + - @@ -3351,19 +3392,34 @@ - - - - - - - + + + + + + + + + + + + - - + + + + + + + + + + + + @@ -3394,21 +3450,15 @@ - - - - - - - - - - - - - + + + + + + + + - @@ -3433,19 +3483,37 @@ - - - - + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd index 251b042a54..4345b09302 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd @@ -15,6 +15,7 @@ c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 822a7acd-f487-45f5-bbb9-1ce595a1705f(com.mbeddr.mpsutil.ecore.stubs) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) @@ -31,6 +32,7 @@ + From 8c7d9cf8e42322f5a70e74542ed108fa5ff86a3f Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 16:15:46 +0200 Subject: [PATCH 13/20] Use linked_hashset for visited nodes to remember order (issue #2435). --- .../models/com/mbeddr/mpsutil/common/util.mps | 93 ++++++++++++++++++- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps index 528da6683b..84f1ec5006 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps @@ -23,6 +23,7 @@ + @@ -85,6 +86,9 @@ + + + @@ -345,7 +349,6 @@ - @@ -373,6 +376,7 @@ + @@ -4817,9 +4821,9 @@ - - - + + + @@ -4931,6 +4935,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4959,6 +4992,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5017,6 +5079,29 @@ + + + + + + + + + + + + + + + + + + + + + + + From c871d0a3451829c44fb3ccee79899d2a0938820d Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 16:37:58 +0200 Subject: [PATCH 14/20] Update test build script (issue #2435). --- .../models/com/mbeddr/platform/build.mps | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index fc0d461a57..b754155e6a 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -22830,11 +22830,6 @@ - - - - - @@ -22857,6 +22852,16 @@ + + + + + + + + + + From ef0b7f99557176ff0ce9590bc182dff35770e7ea Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 15 May 2024 17:02:02 +0200 Subject: [PATCH 15/20] Remove debug output (issue #2435). --- .../models/com/mbeddr/mpsutil/common/util.mps | 86 +------------------ 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps index 84f1ec5006..4044f8c321 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps @@ -5,6 +5,7 @@ + @@ -23,7 +24,6 @@ - @@ -86,9 +86,6 @@ - - - @@ -4935,35 +4932,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4992,35 +4960,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5079,29 +5018,6 @@ - - - - - - - - - - - - - - - - - - - - - - - From a974f369d9f6490b829298206274a16e7dc74585 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 16 May 2024 08:15:32 +0200 Subject: [PATCH 16/20] mbeddr.doc: keep aspect ratio when scaling down images in the preview --- .../com.mbeddr.doc/languageModels/editor.mps | 75 +++++++++++++++---- 1 file changed, 59 insertions(+), 16 deletions(-) diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps index be5e763929..1e7aaabffb 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps @@ -486,6 +486,7 @@ + @@ -12923,15 +12924,11 @@ - - - - - - - - - + + + + + @@ -12964,6 +12961,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12972,17 +13006,26 @@ - - - - - - + + + + + + + + + + + + + + + + - From 34f31c0de5d8c4f5907315dc23ba2fe7ad29325e Mon Sep 17 00:00:00 2001 From: dbinkele Date: Thu, 16 May 2024 08:18:31 +0200 Subject: [PATCH 17/20] Remove todos (#2435) --- ...t.com.mbeddr.mpsutil.common.util@tests.mps | 86 ------------------- 1 file changed, 86 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index aceb63fab4..250c1a0c42 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -2367,49 +2367,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2575,49 +2532,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 1de752e2613f7d8c3effb5db0df52110bd6f5f4c Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 16 May 2024 08:37:19 +0200 Subject: [PATCH 18/20] mbeddr.doc: enable antialiasing for rendering the image preview --- .../com.mbeddr.doc/languageModels/editor.mps | 75 ++++++++++++++++--- 1 file changed, 65 insertions(+), 10 deletions(-) diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps index 1e7aaabffb..934eb56e81 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps @@ -20,6 +20,7 @@ + @@ -31,7 +32,6 @@ - @@ -76,15 +76,15 @@ - - - - - - - - - + + + + + + + + + @@ -13109,6 +13109,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6fc2fc62c2672827ff8acd599c14a925ff590f4b Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 16 May 2024 08:39:03 +0200 Subject: [PATCH 19/20] update the changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aeb4a93a7..a2f5e64adb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month. +# May 2024 + +## com.mbeddr.core + +- The image aspect ratio is now kept when scaling the image in the presentation mode down to the maximum size. +- Antialising is now activated for images displayed in the presentation mode. + # April 2024 ## com.mbeddr.core From 771716b4cadf1ecc84de82349445ceb90d438911 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Thu, 16 May 2024 08:44:25 +0200 Subject: [PATCH 20/20] Suppress warning in test class (issue #2435). --- .../test.com.mbeddr.mpsutil.common.util@tests.mps | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps index 250c1a0c42..f0967de3ef 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps @@ -184,10 +184,15 @@ + + + + + @@ -2721,8 +2726,6 @@ - - @@ -2763,6 +2766,10 @@ + + + +