modify configs

fmidue · May 15, 2024 · 64213fc · 64213fc
1 parent 5c1aa34
commit 64213fc
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 51 deletions.
diff --git a/example/hie.yaml b/example/hie.yaml
@@ -7,3 +7,5 @@ cradle:
         component: "modelling-tasks:lib"
       - path: "src"
         component: "modelling-tasks-examples:lib"
+      - path: "src"
+        component: "modelling-tasks-examples:lib:modelling-tasks-examples-test"
diff --git a/example/src/Modelling/CdOd/DifferentNames/Config.hs b/example/src/Modelling/CdOd/DifferentNames/Config.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -Wwarn=deprecations #-}
 -- |
 
 module Modelling.CdOd.DifferentNames.Config where

diff --git a/example/src/Modelling/CdOd/MatchCdOd/Config.hs b/example/src/Modelling/CdOd/MatchCdOd/Config.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -Wwarn=deprecations #-}
 -- |
 
 module Modelling.CdOd.MatchCdOd.Config where

diff --git a/example/src/Modelling/CdOd/NameCdError/Config.hs b/example/src/Modelling/CdOd/NameCdError/Config.hs
@@ -60,7 +60,7 @@ task09 = NameCdErrorConfig {
     ],
   printNames = True,
   printNavigations = True,
-  printSolution = False,
+  printSolution = True,
   reasonsPerInstance = NumberOfReasons {
     customReasons = 0,
     preDefinedInvalid = 6,

diff --git a/example/src/Modelling/PetriNet/PetriFindConflict/Config.hs b/example/src/Modelling/PetriNet/PetriFindConflict/Config.hs
@@ -27,7 +27,7 @@ task24 = FindConflictConfig {
     },
   advConfig = AdvConfig {
     presenceOfSelfLoops = Nothing,
-    presenceOfSinkTransitions = Just True,
+    presenceOfSinkTransitions = Just False,
     presenceOfSourceTransitions = Nothing
     },
   changeConfig = ChangeConfig {

diff --git a/example/src/Modelling/PetriNet/PetriGraphToMath/Config.hs b/example/src/Modelling/PetriNet/PetriGraphToMath/Config.hs
@@ -60,14 +60,14 @@ task18 = MathConfig {
     places = 6,
     transitions = 5,
     atLeastActive = 2,
-    flowOverall = (14, 16),
+    flowOverall = (15, 17),
     maxTokensPerPlace = 1,
     maxFlowPerEdge = 1,
     tokensOverall = (5, 5),
     isConnected = Just True
     },
   advConfig = AdvConfig {
-    presenceOfSelfLoops = Just False,
+    presenceOfSelfLoops = Just True,
     presenceOfSinkTransitions = Just False,
     presenceOfSourceTransitions = Just False
     },

diff --git a/example/src/Modelling/PetriNet/PetriMathToGraph/Config.hs b/example/src/Modelling/PetriNet/PetriMathToGraph/Config.hs
@@ -29,7 +29,7 @@ task19 = MathConfig {
     },
   advConfig = AdvConfig {
     presenceOfSelfLoops = Just False,
-    presenceOfSinkTransitions = Just False,
+    presenceOfSinkTransitions = Just True,
     presenceOfSourceTransitions = Just False
     },
   changeConfig = ChangeConfig {
@@ -60,14 +60,14 @@ task20 = MathConfig {
     places = 5,
     transitions = 7,
     atLeastActive = 3,
-    flowOverall = (13, 15),
+    flowOverall = (14, 16),
     maxTokensPerPlace = 2,
     maxFlowPerEdge = 1,
     tokensOverall = (10, 10),
     isConnected = Just True
     },
   advConfig = AdvConfig {
-    presenceOfSelfLoops = Just False,
+    presenceOfSelfLoops = Just True,
     presenceOfSinkTransitions = Just False,
     presenceOfSourceTransitions = Just True
     },

diff --git a/example/src/Modelling/PetriNet/PetriPickConflict/Config.hs b/example/src/Modelling/PetriNet/PetriPickConflict/Config.hs
@@ -52,3 +52,44 @@ task22 = PickConflictConfig {
     timeout = Nothing
     }
   }
+
+task16 :: PickConflictConfig
+task16 = PickConflictConfig {
+  basicConfig = BasicConfig {
+    places = 6,
+    transitions = 6,
+    atLeastActive = 2,
+    flowOverall = (16, 16) ,
+    maxTokensPerPlace = 2,
+    maxFlowPerEdge = 1,
+    tokensOverall = (5, 5),
+    isConnected = Just True
+    },
+  changeConfig = ChangeConfig {
+    tokenChangeOverall = 0,
+    maxTokenChangePerPlace = 0,
+    flowChangeOverall = 2,
+    maxFlowChangePerEdge = 1
+    },
+  conflictConfig = ConflictConfig {
+    addConflictCommonPreconditions = Just True,
+    withConflictDistractors = Just True,
+    conflictDistractorAddExtraPreconditions = Just True,
+    conflictDistractorOnlyConflictLike = True,
+    conflictDistractorOnlyConcurrentLike = False
+    },
+  graphConfig = GraphConfig {
+    graphLayouts = [Dot, Sfdp],
+    hidePlaceNames = True,
+    hideTransitionNames = True,
+    hideWeight1 = True
+    },
+  printSolution = True,
+  prohibitSourceTransitions = False,
+  uniqueConflictPlace = Just True,
+  useDifferentGraphLayouts = True,
+  alloyConfig = AlloyConfig {
+    maxInstances = Just 1000,
+    timeout = Nothing
+    }
+  }
diff --git a/example/test/ExamplesSpec.hs b/example/test/ExamplesSpec.hs
@@ -2,6 +2,48 @@
 
 module ExamplesSpec where
 
+import Modelling.ActivityDiagram.EnterAS (
+  checkEnterASConfig,
+  )
+import Modelling.ActivityDiagram.EnterAs.Config (
+  task35,
+  task36,
+  )
+import Modelling.ActivityDiagram.FindSupportST (
+  checkFindSupportSTConfig,
+  )
+import Modelling.ActivityDiagram.FindSupportSt.Config (
+  task41,
+  task42,
+  )
+import Modelling.ActivityDiagram.MatchAd (
+  checkMatchAdConfig,
+  )
+import Modelling.ActivityDiagram.MatchAd.Config (
+  task31,
+  task32,
+  )
+import Modelling.ActivityDiagram.MatchPetri (
+  checkMatchPetriConfig,
+  )
+import Modelling.ActivityDiagram.MatchPetri.Config (
+  task39,
+  task40,
+  )
+import Modelling.ActivityDiagram.SelectAS (
+  checkSelectASConfig,
+  )
+import Modelling.ActivityDiagram.SelectAs.Config (
+  task33,
+  task34,
+  )
+import Modelling.ActivityDiagram.SelectPetri (
+  checkSelectPetriConfig,
+  )
+import Modelling.ActivityDiagram.SelectPetri.Config (
+  task37,
+  task38,
+  )
 import Modelling.CdOd.DifferentNames (
   checkDifferentNamesConfig,
   )
@@ -69,48 +111,7 @@ import Modelling.PetriNet.PetriPickConcurrency.Config (
   )
 import Modelling.PetriNet.PetriPickConflict.Config (
   task22,
-  )
-import Modelling.ActivityDiagram.EnterAS (
-  checkEnterASConfig,
-  )
-import Modelling.ActivityDiagram.EnterAs.Config (
-  task35,
-  task36,
-  )
-import Modelling.ActivityDiagram.FindSupportST (
-  checkFindSupportSTConfig,
-  )
-import Modelling.ActivityDiagram.FindSupportSt.Config (
-  task41,
-  task42,
-  )
-import Modelling.ActivityDiagram.MatchAd (
-  checkMatchAdConfig,
-  )
-import Modelling.ActivityDiagram.MatchAd.Config (
-  task31,
-  task32,
-  )
-import Modelling.ActivityDiagram.MatchPetri (
-  checkMatchPetriConfig,
-  )
-import Modelling.ActivityDiagram.MatchPetri.Config (
-  task39,
-  task40,
-  )
-import Modelling.ActivityDiagram.SelectAS (
-  checkSelectASConfig,
-  )
-import Modelling.ActivityDiagram.SelectAs.Config (
-  task33,
-  task34,
-  )
-import Modelling.ActivityDiagram.SelectPetri (
-  checkSelectPetriConfig,
-  )
-import Modelling.ActivityDiagram.SelectPetri.Config (
-  task37,
-  task38,
+  task16,
   )
 
 import Test.Hspec
@@ -138,6 +139,8 @@ spec =
       checkMatchCdOdConfig task14 `shouldBe` Nothing
     it "task15" $
       checkMatchCdOdConfig task15 `shouldBe` Nothing
+    it "task16" $
+      checkPickConflictConfig task16 `shouldBe` Nothing
     it "task17" $
       checkMathConfig task17 `shouldBe` Nothing
     it "task18" $