Skip to content

Commit 51ff7ac

Browse files
committed
[#328] [stbx-core] Fix typos and standardise spelling and naming.
1 parent 19f5f06 commit 51ff7ac

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

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

+22-21
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Prelude
44
import Control.Apply (lift3)
55
import Data.Array (head, length, partition, range)
66
import Data.Either (Either(..), either)
7+
import Data.Either.Nested (type (\/))
78
import Data.Maybe (Maybe)
89
import Data.Tuple.Nested ((/\))
910

@@ -16,10 +17,10 @@ data WiringTree
1617
= Net Net
1718
| Diagram Diagram (Array WiringTree)
1819

19-
-- | This function translates a `Wiring` into a `WiringTree`
20-
-- | For the moment, we forget about diagrams and gluings and we consider only simple nets
21-
wiringToWiringTree :: Wiring -> Maybe WiringTree
22-
wiringToWiringTree wiring = Net <$> head wiring.nets
20+
-- | This function translates a `Wiring` into a `WiringTree`.
21+
-- | For the moment, we forget about diagrams and gluings and we consider only simple nets.
22+
fromWiring :: Wiring -> Maybe WiringTree
23+
fromWiring wiring = Net <$> head wiring.nets
2324

2425
type Transition =
2526
{ path :: Path
@@ -33,34 +34,34 @@ data Glued a
3334
| Final a
3435
| Glued a a
3536

36-
isInitial :: forall a. Glued a -> Boolean
37+
isInitial :: a. Glued a -> Boolean
3738
isInitial = case _ of
3839
Initial a -> true
3940
_ -> false
4041

41-
isFinal :: forall a. Glued a -> Boolean
42+
isFinal :: a. Glued a -> Boolean
4243
isFinal = case _ of
4344
Final a -> true
4445
_ -> false
4546

46-
data LinerisationError
47+
data LinearizationError
4748
= DiagramNotYetAllowed
4849
| NLLDecodingFailed ErrNetEncoding
4950

50-
linearise :: WiringTree -> Either LinerisationError (Array (Glued Transition))
51-
linearise (Net net) = lineariseNet net
52-
linearise (Diagram diagram branches) = Left DiagramNotYetAllowed
51+
linearize :: WiringTree -> LinearizationError \/ Array (Glued Transition)
52+
linearize (Net net) = linearizeNet net
53+
linearize (Diagram diagram branches) = Left DiagramNotYetAllowed
5354

54-
lineariseNet :: Net -> Either LinerisationError (Array (Glued Transition))
55-
lineariseNet net = linearisePartitionsAndNames net.partition net.names
55+
linearizeNet :: Net -> LinearizationError \/ Array (Glued Transition)
56+
linearizeNet net = linearizePartitionsAndNames net.partition net.names
5657

57-
linearisePartitionsAndNames :: ArrayMultiset PID -> Array String -> Either LinerisationError (Array (Glued Transition))
58-
linearisePartitionsAndNames partition names =
59-
either (NLLDecodingFailed >>> Left) (Right <<< flip lineriseTransitionsAndNames names) $ fromNLL 0 partition
58+
linearizePartitionsAndNames :: ArrayMultiset PID -> Array String -> LinearizationError \/ Array (Glued Transition)
59+
linearizePartitionsAndNames partition names =
60+
either (NLLDecodingFailed >>> Left) (Right <<< flip linearizeTransitionsAndNames names) $ fromNLL 0 partition
6061

61-
-- the use of `lift3` does not consider the fact that the arrays could in principle have different lenghts
62-
lineriseTransitionsAndNames :: Array (TransitionF' PID) -> Array String -> Array (Glued Transition)
63-
lineriseTransitionsAndNames transitions names =
62+
-- the use of `lift3` does not consider the fact that the arrays could in principle have different lengths
63+
linearizeTransitionsAndNames :: Array (TransitionF' PID) -> Array String -> Array (Glued Transition)
64+
linearizeTransitionsAndNames transitions names =
6465
sortInitialFinal $ lift3 buildGluedTransition (range 0 (length transitions - 1)) transitions names
6566

6667
buildGluedTransition :: TID -> TransitionF' PID -> String -> Glued Transition
@@ -70,9 +71,9 @@ buildGluedTransition tId (inputs /\ outputs) name =
7071
(_ /\ [] ) -> Final { name: name, path: [0, 0, 0], transition: tId }
7172
(inp /\ out) -> Untouched { name: name, path: [0, 0, 0], transition: tId }
7273

73-
-- | we are using this custom function instead of `sortBy` because that does not guarantee
74-
-- | the order of equal things to be preserved
75-
sortInitialFinal :: forall a. Array (Glued a) -> Array (Glued a)
74+
-- | We use this custom function instead of `sortBy` because that does not guarantee
75+
-- | the order of equal elements to be preserved.
76+
sortInitialFinal :: a. Array (Glued a) -> Array (Glued a)
7677
sortInitialFinal gluedItems =
7778
let { no: notInitial , yes: initial } = partition isInitial gluedItems
7879
{ no: notInitialAndFinal, yes: final } = partition isFinal notInitial

0 commit comments

Comments
 (0)