fix excluding double inheritance on multiple inheritance (#183)

- close #183
fmidue · Jun 21, 2024 · 9f37695 · 9f37695
1 parent 23e8b02
commit 9f37695
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/alloy/cd/generate.als b/alloy/cd/generate.als
@@ -178,7 +178,7 @@ pred classDiagram [
   #{ c : compositions | not validLimitsComposition [c]} = wrongCompositions
   #{ r : nonInheritances | selfRelationship [r]} = selfRelationships
   #{ i : inheritances | selfRelationship [i]} = selfInheritances
-  no i : inheritances | not noDoubleRelationships [i]
+  noDoubleRelationships [inheritances]
   no i : inheritances, a : nonInheritances |
     sameDirection [i, a] or reverseRelationship [i, a]
   hasDoubleRelationships = True

diff --git a/test/Modelling/CdOd/GenerateSpec.hs b/test/Modelling/CdOd/GenerateSpec.hs
@@ -96,12 +96,10 @@ spec =
         hasReverseInheritances = False,
         hasReverseRelationships = Just False
         }
-    -- Disabled due to varying definitions of multiple inheritances:
-    {- generateProperty
+    generateProperty
       "multipleInheritances"
       (const $ not . null . multipleInheritances)
       defaultProperties { hasMultipleInheritances = Just True }
-    -}
     generateProperty
       "no multipleInheritances"
       (const $ null . multipleInheritances)