[#328] [stbx-core] Introduce modle Statebox.Core.Marking and simplify dependencies.

Author: epost

Diff for: halogen-petrinet-editor/src/View/Petrinet/Model.purs

@@ -26,6 +26,8 @@ import Data.Vec3 (Vec2D, Box, Vec3, minMax)
 import Data.Vec3 (bounds, minMaxZero) as Vec2D
 import Data.Vec3.Box as Box
 
+import Statebox.Core.Types (PID, TID, Tokens) as Core
+
 data Action pid tid ty2
   = LoadNet (NetInfoWithTypesAndRolesF pid tid Typedef ty2 ())
   | FireTransition tid
@@ -88,9 +90,9 @@ type NetInfoWithTypesAndRolesF pid tid ty ty2 r = Record (NetInfoWithTypesAndRol
 
 -- types specialised to Int index ----------------------------------------------
 
-type PID          = Int
-type TID          = Int
-type Tokens       = Int
+type PID          = Core.PID    -- TODO remove this redirect; clients should import this directly
+type TID          = Core.TID    -- TODO remove this redirect; clients should import this directly
+type Tokens       = Core.Tokens -- TODO remove this redirect; clients should import this directly
 
 type Transition   = TransitionF   PID Tokens
 type Marking      = MarkingF      PID Tokens

Diff for: stbx-core/src/Statebox/Core/Marking.purs

@@ -0,0 +1,47 @@
+module Statebox.Core.Marking
+  ( Tokens
+  , PlaceMarkingF
+  , TransitionF
+  , buildTransitionMarking
+  , buildPlaceMarkings
+  ) where
+
+import Prelude
+import Data.Array ((:))
+import Data.FoldableWithIndex (foldrWithIndex)
+import Data.Map (Map)
+
+import Data.ArrayMultiset as ArrayMultiset
+import Data.ArrayMultiset (ArrayMultiset)
+
+--------------------------------------------------------------------------------
+
+-- | TODO Duplicated from `Data.Petrinet.Representation.Dict` in #328.
+type Tokens = Int
+
+-- | TODO Duplicated from `Data.Petrinet.Representation.Dict` in #328.
+type TransitionF p tok =
+  { pre  :: Array (PlaceMarkingF p tok)
+  , post :: Array (PlaceMarkingF p tok)
+  }
+
+-- | TODO Duplicated from `Data.Petrinet.Representation.Dict` in #328.
+type PlaceMarkingF p tok =
+  { place  :: p
+  , tokens :: tok
+  }
+
+--------------------------------------------------------------------------------
+
+buildTransitionMarking :: ∀ a. Ord a => ArrayMultiset a -> ArrayMultiset a -> TransitionF a Tokens
+buildTransitionMarking pre post =
+  { pre:  buildPlaceMarkings pre
+  , post: buildPlaceMarkings post
+  }
+
+buildPlaceMarkings :: ∀ a. Ord a => ArrayMultiset a -> Array (PlaceMarkingF a Tokens)
+buildPlaceMarkings netMarking =
+  foldrWithIndex (\place tokens -> (:) { place, tokens }) [] netMarkingDict
+  where
+    netMarkingDict :: Map a Tokens
+    netMarkingDict = ArrayMultiset.countMap netMarking

Diff for: stbx-core/src/Statebox/Core/Transition.purs

@@ -1,48 +1,8 @@
 module Statebox.Core.Transition where
 
-import Prelude
-import Data.Array ((:))
-import Data.FoldableWithIndex (foldrWithIndex)
-import Data.Map (Map)
-
-import Data.ArrayMultiset as ArrayMultiset
-import Data.ArrayMultiset (ArrayMultiset)
 import Statebox.Core.Execution (Path)
 import Statebox.Core.Types (PID, TID)
-
---------------------------------------------------------------------------------
-
--- | TODO Duplicated from `Data.Petrinet.Representation.Dict` in #328.
-type TransitionF p tok =
-  { pre  :: Array (PlaceMarkingF p tok)
-  , post :: Array (PlaceMarkingF p tok)
-  }
-
--- | TODO Duplicated from `Data.Petrinet.Representation.Dict` in #328.
-type PlaceMarkingF p tok =
-  { place  :: p
-  , tokens :: tok
-  }
-
--- | TODO Duplicated from `Data.Petrinet.Representation.Dict` in #328.
-type Tokens = Int
-
---------------------------------------------------------------------------------
-
-buildTransitionMarking :: ∀ a. Ord a => ArrayMultiset a -> ArrayMultiset a -> TransitionF a Tokens
-buildTransitionMarking pre post =
-  { pre:  buildPlaceMarkings pre
-  , post: buildPlaceMarkings post
-  }
-
-buildPlaceMarkings :: ∀ a. Ord a => ArrayMultiset a -> Array (PlaceMarkingF a Tokens)
-buildPlaceMarkings netMarking =
-  foldrWithIndex (\place tokens -> (:) { place, tokens }) [] netMarkingDict
-  where
-    netMarkingDict :: Map a Tokens
-    netMarkingDict = ArrayMultiset.countMap netMarking
-
---------------------------------------------------------------------------------
+import Statebox.Core.Marking (Tokens, TransitionF)
 
 type Transition =
   { path       :: Path

Diff for: stbx-core/src/Statebox/Core/Types.purs

@@ -1,5 +1,6 @@
 module Statebox.Core.Types
   ( module Statebox.Core.Net
+  , module Statebox.Core.Marking
   , module Statebox.Core.Diagram
   , module Statebox.Core.Wiring
   , module Statebox.Core.Wiring.Tree
@@ -9,6 +10,7 @@ module Statebox.Core.Types
   ) where
 
 import Statebox.Core.Net
+import Statebox.Core.Marking
 import Statebox.Core.Diagram
 import Statebox.Core.Wiring
 import Statebox.Core.Wiring.Tree

Diff for: stbx-core/src/Statebox/Core/WiringTree.purs

@@ -10,7 +10,8 @@ import Data.Tuple.Nested ((/\))
 
 import Data.ArrayMultiset (ArrayMultiset)
 import Data.Petrinet.Representation.NLL (ErrNetEncoding, TransitionF', fromNLL)
-import Statebox.Core.Transition (Glued(..), Transition, buildTransitionMarking, isInitial, isFinal)
+import Statebox.Core.Marking (buildTransitionMarking)
+import Statebox.Core.Transition (Glued(..), Transition, isInitial, isFinal)
 import Statebox.Core.Types (Diagram, Net, PID, TID, Wiring)
 
 data WiringTree