#683 Add activity constraints by AndreaPuffo · Pull Request #684 · TNO/SynthML

AndreaPuffo · 2026-02-11T09:43:13Z

Closes #683.

I will add a regression test once the changes are approved.

UmlToCifTranslator: translate activity requirements

AndreaPuffo · 2026-02-12T10:15:20Z

Documentation to be updated as well.

dhendriks · 2026-02-20T14:19:43Z

        }

+        // Translate activity requirements.
+        for (Constraint umlConstraint: activity.getOwnedRules()) {


Is it sufficient to translate the requirements like this? Should we also include all requirements of other activities that we call, etc? (all other 'relevant' activities)

I did this to be consistent with the occurrence constraints: these are considered only during the activity synthesis, not when an activity is called. Better to have a conversation offline about this.

Did we ever discuss this? Was there a conclusion?

dhendriks · 2026-02-20T14:20:00Z

        return constraint.getContext() instanceof PrimitiveType;
    }

+    public static boolean isActivityRequirement(Constraint constraint) {


Move isActivityRequirement to just after isActivityPostconditionConstraint.

dhendriks · 2026-02-20T14:20:06Z

        return constraint.getContext() instanceof PrimitiveType;
    }

+    public static boolean isActivityRequirement(Constraint constraint) {


Rename isActivityRequirement to isActivityRequirementConstraint, to match other methods?

dhendriks · 2026-02-20T14:20:11Z


+    public static boolean isActivityRequirement(Constraint constraint) {
+        return constraint.getContext() instanceof Activity activity
+                // It is the correct type of constraint.


Can't we check that it is a FormalConstraint?

It was my first choice, but I then wrote it this way to be consistent with the rest of the class and structure that we have e.g., in the validator. To be honest, if I write a isRequirementConstraint method in PokaYokeUmlProfileUtil, this method in CifContext is not needed at all. But it will not be consistent with the rest of validation, for instance.
I will remove this method and add a new one in PokaYokeUmlProfileUtil, and let's see how it looks. I think it looks better; but if consistency with the rest is more important we can revert back to this.

dhendriks · 2026-02-20T14:21:52Z

Rename to isClassRequirementConstraint?

dhendriks · 2026-02-20T14:22:06Z

+                .filter(r -> CifContext.isActivityRequirement(r)).map(Constraint.class::cast)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        if (!members.equals(Sets.union(Sets.union(preAndPostconditions, intervalConstraints), activityRequirements))) {


I think Sets.union supports also giving 3 sets instead of 2, right?

Not sure how to make it work, so I created a set union with stream.

dhendriks · 2026-02-20T14:22:25Z

            checkValidActivityPrePostconditionConstraint(constraint);
-        } else if (CifContext.isClassConstraint(constraint)) {
-            checkValidClassConstraint(constraint);
+        } else if (CifContext.isClassConstraint(constraint) || (CifContext.isActivityRequirement(constraint))) {


Does it still make sense to have CifContext.isClassConstraint? Should we rename it to CifContext.isClassRequirementConstraint?

See previous comments.

dhendriks · 2026-02-20T14:22:49Z

    }

-    private void checkValidClassConstraint(Constraint constraint) {
+    private void checkValidClassOrActivityConstraint(Constraint constraint) {


This is only requirements, from classes and activities, right? So, maybe rename to checkValidRequirementConstraint?

dhendriks · 2026-02-20T14:23:01Z

Why check this with a global scope? Why not in the scope of the activity, if it is in an activity?

dhendriks · 2026-02-20T14:24:19Z

Does editing these new constraints with the SynthML tab work?

AndreaPuffo · 2026-02-25T09:15:16Z

Does editing these new constraints with the SynthML tab work?

A quick example of how this works. This is the model: 2 class requirements and 2 activities, each with its own activity requirements.

Editing one activity constraint looks like this:

And finally the CIF translation of the activities (Activity1 top, Activity 2 bottom):

dhendriks · 2026-03-04T16:46:54Z

@@ -529,7 +528,7 @@ public static List<Stereotype> getSupportedConstraintStereotypes(Constraint cons
        } else if (isPostconditionConstraint(constraint)) {
            return List.of(getStereotype(constraint, ST_POSTCONDITION));
        } else if (isClassRequirement(constraint)) {


I always forget that Activity inherits from Class. Super non-intuitive. I'd maybe rename the method to isClassOrActivityRequirementConstraint, and there add a comment in the body like // Note that 'Activity' inherits from 'Class'. or so?

Co-authored-by: Dennis Hendriks <dh_tue@hotmail.com>

UmlToCifTranslator, FlattenUmlActivity: rename methods

- make methods public - add occurrence constraint and primitive type constraint methods PokaYokeProfileValidator: use the new methods

UmlToCameoTransformer, Uml2GalTranslator, PokaYokeProfileValidator: use the PokaYokeUmlProfileUtil method

AbstractActivityDependencyOrderer: use the PokaYokeUmlProfileUtil method

constraint PokaYokeProfileValidator: use the PokaYokeUmlProfileUtil methods

AndreaPuffo · 2026-03-10T09:56:25Z

Ready for review, best commit-by-commit.

dhendriks · 2026-07-30T11:42:00Z

         */
        private boolean isBlockingOccurrenceConstraint(Constraint constraint) {
-            if (CifContext.isOccurrenceConstraint(constraint)) {
+            if (PokaYokeUmlProfileUtil.isContainedAsActivityOccurrenceConstraint(constraint)) {


I'd have expected here isOccurrenceConstraint, not the containment variant. (see also other comment)

dhendriks · 2026-07-30T11:42:15Z


-    private static boolean isPreconditionConstraint(Constraint constraint) {
+    public static boolean isContainedAsActivityPrecondition(Constraint constraint) {
        return (constraint.eContainer() instanceof Activity activity)


Remove unnecessary parentheses like in isContainedAsClassOrActivityOwnedRule.

dhendriks · 2026-07-30T11:42:22Z


-    public static boolean isSynthesisPrecondition(Constraint constraint) {
+    public static boolean isContainedAsActivityPostcondition(Constraint constraint) {
+        return (constraint.eContainer() instanceof Activity activity)


Remove unnecessary parentheses like in isContainedAsClassOrActivityOwnedRule.

dhendriks · 2026-07-30T11:42:32Z

+
+    public static boolean isContainedAsClassOrActivityOwnedRule(Constraint constraint) {
+        // Activity is a sub-type of Classifier.
+        return constraint.eContainer() instanceof Classifier clazz && clazz.getOwnedRules().contains(constraint);


Why do we check for Classifier and not Class? Not saying it is wrong. Just wondering which is better?

dhendriks · 2026-07-30T11:43:46Z

+    }
+
+    public static boolean isContainedAsClassOrActivityOwnedRule(Constraint constraint) {
+        // Activity is a sub-type of Classifier.


// Activity is a sub-type of Classifier. -> // 'Activity' is a sub-type of 'Class'. (if we go check for being a class) or // 'Activity' is a sub-type of 'Class', which is a sub-type of 'Classifier'. (if we keep the code as is).

dhendriks · 2026-07-30T11:43:56Z

-        return (constraint.eContainer() instanceof Activity activity)
-                && activity.getPostconditions().contains(constraint);
-    }
+    public static boolean isRequirementConstraint(Constraint constraint) {


I miss here isOccurrenceConstraint that checks the stereotype, like this and similar methods. We seem to only have the containment one for occurrence constraints.

dhendriks · 2026-07-30T11:44:51Z

+                .flatMap(Set::stream).collect(Collectors.toSet());
+
+        if (!members.equals(allowedMembers)) {
+            error("Activity should contain only precondition, postcondition, constraints and interval constraint members.",


Suggested change

error("Activity should contain only precondition, postcondition, constraints and interval constraint members.",

error("Activity should contain only precondition, postcondition, requirement and interval constraints as members.",

dhendriks · 2026-07-30T11:45:21Z

+            } else if (PokaYokeUmlProfileUtil.isContainedAsActivityOccurrenceConstraint(constraint)) {
+                checkValidOccurrenceConstraint((IntervalConstraint)constraint);
+            } else if (PokaYokeUmlProfileUtil.isRequirementConstraint(constraint)) {
+                // Check the class and activity requirements.


Suggested change

// Check the class and activity requirements.

// Check the class or activity requirement.

It is either one of them, not both. It is also only one requirement, I think.

dhendriks · 2026-07-30T11:47:08Z

Documentation to be updated as well.

Should still be done then.

dhendriks · 2026-07-30T11:47:27Z

I will add a regression test once the changes are approved.

Should not forget this.

AndreaPuffo · 2026-08-10T09:31:03Z

Thanks for the review. I would prefer to finish vertical scaling and then finish this PR. just to avoid confusion.

AndreaPuffo added 4 commits February 10, 2026 18:21

#683 CifContext: add isActivityRequirement method

12cb8f6

#683 PokaYokeProfileValidator: allow activity requirement constraints

58705a8

UmlToCifTranslator: translate activity requirements

#683 PokaYokeProfileValidator: rename method

6fe4ef6

#683 PokaYokeUmlProfileUtil, PokaYokeProfileValidator: rename stereotype

212a07b

AndreaPuffo requested a review from dhendriks February 11, 2026 09:43

AndreaPuffo linked an issue Feb 11, 2026 that may be closed by this pull request

Add activity constraints #683

Open

dhendriks requested changes Feb 20, 2026

View reviewed changes

AndreaPuffo added 10 commits February 25, 2026 08:19

#683 UmlToCifTranslator: update JavaDoc.

3bb41f9

#683 CifContext: move method isActivityRequirement.

0fa177a

#683 CifContext, UmlToCifTranslator, PYProfileValidator: rename method

a468205

#683 CifContext: remove isActivityRequirementConstraint

19fa69f

#683 PokaYokeUmlProfileUtil: add isRequirementConstraint method

6b5dc4d

#683 PokaYokeProfileValidator, UmlToCifTranslator: use new method

8a1f8c1

#683 PokaYokeUmlProfileUtil: rename method.

ee430c6

#683 PokaYokeProfileValidator: create set union before check.

3127da1

#683 PokaYokeProfileValidator: rename method.

5aa521f

#683 PokaYokeProfileValidator: use scoped context.

ab173a0

dhendriks requested changes Mar 4, 2026

View reviewed changes

AndreaPuffo and others added 9 commits March 9, 2026 14:13

#683 Apply suggestions from code review

549e163

Co-authored-by: Dennis Hendriks <dh_tue@hotmail.com>

#683 PokaYokeProfileValidator: change variable name after review

8cd8aac

#683 PokaYokeUmlProfileUtil: move methods.

f689a77

#683 PokaYokeUmlProfileUtil: rename methods.

686be24

#683 PokaYokeUmlProfileUtil: rename methods

281f185

UmlToCifTranslator, FlattenUmlActivity: rename methods

#683 PokaYokeUmlProfileUtil:

1c52cc8

- make methods public - add occurrence constraint and primitive type constraint methods PokaYokeProfileValidator: use the new methods

#683 CifContext: remove isPrimitiveTypeConstraint

49a6a8e

UmlToCameoTransformer, Uml2GalTranslator, PokaYokeProfileValidator: use the PokaYokeUmlProfileUtil method

#683 CifContext: remove isOccurrenceConstraint

3312f5d

AbstractActivityDependencyOrderer: use the PokaYokeUmlProfileUtil method

#683 CifContext: remove method to check activity pre/post condition

e623614

constraint PokaYokeProfileValidator: use the PokaYokeUmlProfileUtil methods

AndreaPuffo added 3 commits March 10, 2026 08:53

#638 PokaYokeProfileValidator: update if-clause with new methods

0487e95

#638 PokaYokeUmlProfileUtil: add comment

2f63429

#638 UmlToCifTranslator: reformat file

f0ba3f0

dhendriks requested changes Jul 30, 2026

View reviewed changes

	error("Activity should contain only precondition, postcondition, constraints and interval constraint members.",
	error("Activity should contain only precondition, postcondition, requirement and interval constraints as members.",

	// Check the class and activity requirements.
	// Check the class or activity requirement.

Uh oh!

Conversation

AndreaPuffo commented Feb 11, 2026

Uh oh!

AndreaPuffo commented Feb 12, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dhendriks commented Feb 20, 2026

Uh oh!

AndreaPuffo commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AndreaPuffo commented Mar 10, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dhendriks commented Jul 30, 2026

Uh oh!

dhendriks commented Jul 30, 2026

Uh oh!

AndreaPuffo commented Aug 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

AndreaPuffo commented Feb 25, 2026 •

edited

Loading