refine nonTrivialInheritanceConstraint

fmidue · Dec 14, 2023 · 6b52f11 · 6b52f11
1 parent 06dedf0
commit 6b52f11
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Modelling/CdOd/CdAndChanges/Transform.hs b/src/Modelling/CdOd/CdAndChanges/Transform.hs
@@ -63,13 +63,13 @@ transformNoChanges config properties withNonTrivialInheritance =
 nonTrivialInheritanceConstraint :: String -> String -> Maybe Bool -> String
 nonTrivialInheritanceConstraint inheritances assocs withNonTrivialInheritance =
   (`foldMap` trivialInh) $ \x -> [i|  #{withInheritance}
-  #{x} i : #{inheritances} | i.to in (#{assocs}.from + #{assocs}.to)|]
+  #{x} i : #{inheritances} | i.to in ((#{assocs} + #{inheritances}).from + #{assocs}.to)|]
   where
     trivialInh = withNonTrivialInheritance
       <&> bool "no" "all"
     withInheritance = maybe
       ""
-      (bool "" "some Inheritance")
+      (bool "" [i|some Inheritance <: #{inheritances}|])
       withNonTrivialInheritance
 
 transform :: ClassConfig -> RelationshipProperties -> Maybe Bool -> String