From 9cd38b8bc853e231107dd5d331e5198e3b5d01c2 Mon Sep 17 00:00:00 2001 From: Audrey Jardin <57661590+audrey-jardin@users.noreply.github.com> Date: Fri, 12 Jun 2026 10:47:46 +0200 Subject: [PATCH 1/4] fix(etl): typo --- .../src/main/resources/testModels/libraries/ETL.crml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml index 6f1e3522..27d2c0c0 100644 --- a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml +++ b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml @@ -45,7 +45,7 @@ library ETL is { // Decide // Operator 'decide' is - Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (P end)); + Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (P end); Category c1 is Category increasing1 = { (>, >), (>=, >=), (<, >=), (<=, >), (==, >), (<>, >) }; From 20d0eab61aeacde4d9f0c0bc7d282f9654b356f1 Mon Sep 17 00:00:00 2001 From: Audrey Jardin <57661590+audrey-jardin@users.noreply.github.com> Date: Fri, 12 Jun 2026 10:48:33 +0200 Subject: [PATCH 2/4] fix(etl): add Boolean constructor for 'decide over' operator --- .../src/main/resources/testModels/libraries/ETL.crml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml index 27d2c0c0..00a501aa 100644 --- a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml +++ b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml @@ -45,7 +45,7 @@ library ETL is { // Decide // Operator 'decide' is - Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (P end); + Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (new Boolean (P end)); Category c1 is Category increasing1 = { (>, >), (>=, >=), (<, >=), (<=, >), (==, >), (<>, >) }; From 5c27235bcfce113d8fff6c0fe6a276e627011138 Mon Sep 17 00:00:00 2001 From: Audrey Jardin <57661590+audrey-jardin@users.noreply.github.com> Date: Fri, 12 Jun 2026 10:49:33 +0200 Subject: [PATCH 3/4] fix(etl): add .element for 'check over' operator --- .../src/main/resources/testModels/libraries/ETL.crml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml index 00a501aa..2426d303 100644 --- a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml +++ b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml @@ -37,7 +37,7 @@ library ETL is { // Operators for the evaluation of requirements // Check Operator [ Boolean ] 'check' Boolean phi 'over' Periods P - = and ('evaluate' phi 'over' P); + = and ('evaluate' phi 'over' P.element); // Evaluate Operator [ Boolean ] 'evaluate' Boolean phi 'over' Period P From 9039e552b32df52008700fa972651bd8a8446fa1 Mon Sep 17 00:00:00 2001 From: Audrey Jardin <57661590+audrey-jardin@users.noreply.github.com> Date: Fri, 12 Jun 2026 10:52:28 +0200 Subject: [PATCH 4/4] fix(etl): add .element to 'inside' operator --- .../src/main/resources/testModels/libraries/ETL.crml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml index 2426d303..0689dc79 100644 --- a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml +++ b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml @@ -14,7 +14,7 @@ library ETL is { // Operators on clocks // Filter clock ticks inside a time period Operator [ Clock ] Clock C 'inside' Period P - = C filter (tick C >= P start) and (tick C <= P end); + = C filter (tick C.element >= P start) and (tick C.element <= P end); // Count the occurrences of events inside a time period Operator [ Integer ] 'count' Clock C 'inside' Period P = card (C 'inside' P);