@@ -1,3 +1,6 @@
1+{-# LANGUAGE StrictData #-}
2+{-# LANGUAGE TypeFamilyDependencies #-}
3+{-# LANGUAGE ConstraintKinds #-}
14{-# LANGUAGE AllowAmbiguousTypes #-}
25{-# LANGUAGE DataKinds #-}
36{-# LANGUAGE FlexibleContexts #-}
@@ -9,7 +12,6 @@
912{-# LANGUAGE ScopedTypeVariables #-}
1013{-# LANGUAGE StandaloneDeriving #-}
1114{-# LANGUAGE TypeApplications #-}
12−{-# LANGUAGE TypeFamilies #-}
1315{-# LANGUAGE TypeOperators #-}
1416{-# LANGUAGE UndecidableInstances #-}
1517
@@ -28,7 +30,7 @@
2830-- motivation behind the library, the underlying theory, and implementation details.
2931--
3032-- This module offers many of the combinators mentioned in the work of
31−-- Macedo (2012) and Oliveira (2012).
33+-- Macedo (2012) and Oliveira (2012).
3234--
3335-- This is an Internal module and it is no supposed to be imported.
3436--
@@ -41,17 +43,26 @@ module LAoP.Matrix.Internal
4143 --
4244 -- There exists two type families that make it easier to write
4345 -- matrix dimensions: 'FromNat' and 'Count'. This approach
44− -- leads to a very straightforward implementation
45− -- of LAoP combinators.
46+ -- leads to a very straightforward implementation
47+ -- of LAoP combinators.
4648
4749 -- * Type safe matrix representation
4850 Matrix (..),
4951
52+ -- * Constraint type aliases
53+ Countable,
54+ CountableDims,
55+ CountableN,
56+ CountableDimsN,
57+ FL,
58+ FLN,
59+ Liftable,
60+ Trivial,
61+
5062 -- * Primitives
51− empty,
5263 one,
53− junc,
54− split,
64+ join,
65+ fork,
5566
5667 -- * Auxiliary type families
5768 FromNat,
@@ -64,6 +75,7 @@ module LAoP.Matrix.Internal
6475 toLists,
6576 toList,
6677 matrixBuilder,
78+ matrixBuilder',
6779 row,
6880 col,
6981 zeros,
@@ -74,28 +86,38 @@ module LAoP.Matrix.Internal
7486 -- * Misc
7587 -- ** Get dimensions
7688 columns,
89+ columns',
7790 rows,
91+ rows',
7892
7993 -- ** Matrix Transposition
8094 tr,
8195
96+ -- ** Scalar multiplication/division of matrices
97+ (.|),
98+ (./),
99+
82100 -- ** Selective operator
83− select,
101+ select,
102+ branch,
84103
85104 -- ** McCarthy's Conditional
86105 cond,
87106
88107 -- ** Matrix "abiding"
89− abideJS,
90− abideSJ,
108+ abideJF,
109+ abideFJ,
110+
111+ -- ** Zip matrices
112+ zipWithM,
91113
92114 -- * Biproduct approach
93− -- ** Split
115+ -- ** Fork
94116 (===),
95117 -- *** Projections
96118 p1,
97119 p2,
98− -- ** Junc
120+ -- ** Join
99121 (|||),
100122 -- *** Injections
101123 i1,
@@ -108,12 +130,13 @@ module LAoP.Matrix.Internal
108130
109131 -- | Note that given the restrictions imposed it is not possible to
110132 -- implement the standard type classes present in standard Haskell.
133+
111134 -- *** Matrix pairing projections
112− kp1,
113− kp2,
135+ fstM,
136+ sndM,
114137
115138 -- *** Matrix pairing
116− khatri,
139+ kr,
117140
118141 -- * Matrix composition and lifting
119142
@@ -121,10 +144,10 @@ module LAoP.Matrix.Internal
121144
122145 -- | Note that given the restrictions imposed it is not possible to
123146 -- implement the standard type classes present in standard Haskell.
124− identity,
147+ iden,
125148 comp,
126− fromF,
127149 fromF',
150+ fromF,
128151
129152 -- * Matrix printing
130153 pretty,
@@ -134,33 +157,39 @@ module LAoP.Matrix.Internal
134157 toBool,
135158 fromBool,
136159 compRel,
160+ divR,
161+ divL,
162+ divS,
137163 fromFRel,
138164 fromFRel',
165+ toRel,
166+ negateM,
139167 orM,
140168 andM,
141169 subM
142170 )
143171 where
144172
145−import LAoP.Utils
173+import LAoP.Utils.Internal
146174import Data.Bool
147175import Data.Kind
148176import Data.List
177+import Data.Maybe
149178import Data.Proxy
179+import Data.Typeable
150180import Data.Void
151181import GHC.TypeLits
152182import Data.Type.Equality
153183import GHC.Generics
154184import Control.DeepSeq
155−import Control.Category
156−import Prelude hiding ((.))
185+import Prelude hiding (id, (.))
186+import qualified Prelude (id, (.))
157187
158188-- | LAoP (Linear Algebra of Programming) Inductive Matrix definition.
159189data Matrix e cols rows where
160− Empty :: Matrix e Void Void
161190 One :: e -> Matrix e () ()
162− Junc :: Matrix e a rows -> Matrix e b rows -> Matrix e (Either a b) rows
163− Split :: Matrix e cols a -> Matrix e cols b -> Matrix e cols (Either a b)
191+ Join :: Matrix e a rows -> Matrix e b rows -> Matrix e (Either a b) rows
192+ Fork :: Matrix e cols a -> Matrix e cols b -> Matrix e cols (Either a b)
164193
165194deriving instance (Show e) => Show (Matrix e cols rows)
166195
@@ -170,221 +199,214 @@ deriving instance (Show e) => Show (Matrix e cols rows)
170199-- 'Generic' instance.
171200type family Count (d :: Type) :: Nat where
172201 Count (Natural n m) = (m - n) + 1
173− Count (Either a b) = (+) (Count a) (Count b)
174− Count (a, b) = (*) (Count a) (Count b)
175− Count (a -> b) = (^) (Count b) (Count a)
202+ Count (List a) = (^) 2 (Count a)
203+ Count (Either a b) = (+) (Count a) (Count b)
204+ Count (a, b) = (*) (Count a) (Count b)
205+ Count (a -> b) = (^) (Count b) (Count a)
176206 -- Generics
177− Count (M1 _ _ f p) = Count (f p)
178− Count (K1 _ _ _) = 1
179− Count (V1 _) = 0
180− Count (U1 _) = 1
207+ Count (M1 _ _ f p) = Count (f p)
208+ Count (K1 _ _ _) = 1
209+ Count (V1 _) = 0
210+ Count (U1 _) = 1
181211 Count ((:*:) a b p) = Count (a p) * Count (b p)
182212 Count ((:+:) a b p) = Count (a p) + Count (b p)
183− Count d = Count (Rep d R)
213+ Count d = Count (Rep d R)
184214
185215-- | Type family that computes of a given type dimension from a given natural
186216--
187217-- Thanks to Li-Yao Xia this type family is super fast.
188218type family FromNat (n :: Nat) :: Type where
189− FromNat 0 = Void
190219 FromNat 1 = ()
191220 FromNat n = FromNat' (Mod n 2 == 0) (FromNat (Div n 2))
192221
193222type family FromNat' (b :: Bool) (m :: Type) :: Type where
194− FromNat' 'True m = Either m m
223+ FromNat' 'True m = Either m m
195224 FromNat' 'False m = Either () (Either m m)
196225
197226-- | Type family that normalizes the representation of a given data
198227-- structure
199228type family Normalize (d :: Type) :: Type where
200− Normalize d = FromNat (Count d)
201−
202−-- | It isn't possible to implement the 'id' function so it's
203−-- implementation is 'undefined'. However 'comp' can be and this partial
204−-- class implementation exists just to make the code more readable.
205−--
206−-- Please use 'identity' instead.
229+ Normalize (Either a b) = Either (Normalize a) (Normalize b)
230+ Normalize d = FromNat (Count d)
231+
232+-- | Constraint type synonyms to keep the type signatures less convoluted
233+type Countable a = KnownNat (Count a)
234+type CountableN a = KnownNat (Count (Normalize a))
235+type CountableDims a b = (Countable a, Countable b)
236+type CountableDimsN a b = (CountableN a, CountableN b)
237+type FL a b = FromLists a b
238+type FLN a b = FromLists (Normalize a) (Normalize b)
239+type Liftable e a b = (Bounded a, Bounded b, Enum a, Enum b, Eq b, Num e, Ord e)
240+type Trivial a = FromNat (Count a) ~ a
241+
242+-- | It is possible to implement a constrained version of the category type
243+-- class.
207244instance (Num e) => Category (Matrix e) where
208− id = undefined
209− (.) = comp
245+ type Object (Matrix e) a = (FL a a, Countable a)
246+ id = iden
247+ (.) = comp
210248
211249instance NFData e => NFData (Matrix e cols rows) where
212− rnf Empty = ()
213− rnf (One e) = rnf e
214− rnf (Junc a b) = rnf a `seq` rnf b
215− rnf (Split a b) = rnf a `seq` rnf b
250+ rnf (One e) = rnf e
251+ rnf (Join a b) = rnf a `seq` rnf b
252+ rnf (Fork a b) = rnf a `seq` rnf b
216253
217254instance Eq e => Eq (Matrix e cols rows) where
218− Empty == Empty = True
219− (One a) == (One b) = a == b
220− (Junc a b) == (Junc c d) = a == c && b == d
221− (Split a b) == (Split c d) = a == c && b == d
222− x@(Split _ _) == y@(Junc _ _) = x == abideJS y
223− x@(Junc _ _) == y@(Split _ _) = abideJS x == y
255+ (One a) == (One b) = a == b
256+ (Join a b) == (Join c d) = a == c && b == d
257+ (Fork a b) == (Fork c d) = a == c && b == d
258+ x@(Fork _ _) == y@(Join _ _) = x == abideJF y
259+ x@(Join _ _) == y@(Fork _ _) = abideJF x == y
224260
225261instance Num e => Num (Matrix e cols rows) where
262+ a + b = zipWithM (+) a b
263+
264+ a - b = zipWithM (-) a b
265+
266+ a * b = zipWithM (*) a b
226267
227− Empty + Empty = Empty
228− (One a) + (One b) = One (a + b)
229− (Junc a b) + (Junc c d) = Junc (a + c) (b + d)
230− (Split a b) + (Split c d) = Split (a + c) (b + d)
231− x@(Split _ _) + y@(Junc _ _) = x + abideJS y
232− x@(Junc _ _) + y@(Split _ _) = abideJS x + y
233−
234− Empty - Empty = Empty
235− (One a) - (One b) = One (a - b)
236− (Junc a b) - (Junc c d) = Junc (a - c) (b - d)
237− (Split a b) - (Split c d) = Split (a - c) (b - d)
238− x@(Split _ _) - y@(Junc _ _) = x - abideJS y
239− x@(Junc _ _) - y@(Split _ _) = abideJS x - y
240−
241− Empty * Empty = Empty
242− (One a) * (One b) = One (a * b)
243− (Junc a b) * (Junc c d) = Junc (a * c) (b * d)
244− (Split a b) * (Split c d) = Split (a * c) (b * d)
245− x@(Split _ _) * y@(Junc _ _) = x * abideJS y
246− x@(Junc _ _) * y@(Split _ _) = abideJS x * y
247−
248− abs Empty = Empty
249− abs (One a) = One (abs a)
250− abs (Junc a b) = Junc (abs a) (abs b)
251− abs (Split a b) = Split (abs a) (abs b)
252−
253− signum Empty = Empty
254− signum (One a) = One (signum a)
255− signum (Junc a b) = Junc (signum a) (signum b)
256− signum (Split a b) = Split (signum a) (signum b)
268+ abs (One a) = One (abs a)
269+ abs (Join a b) = Join (abs a) (abs b)
270+ abs (Fork a b) = Fork (abs a) (abs b)
271+
272+ signum (One a) = One (signum a)
273+ signum (Join a b) = Join (signum a) (signum b)
274+ signum (Fork a b) = Fork (signum a) (signum b)
257275
258276instance Ord e => Ord (Matrix e cols rows) where
259− Empty <= Empty = True
260− (One a) <= (One b) = a <= b
261− (Junc a b) <= (Junc c d) = (a <= c) && (b <= d)
262− (Split a b) <= (Split c d) = (a <= c) && (b <= d)
263− x@(Split _ _) <= y@(Junc _ _) = x <= abideJS y
264− x@(Junc _ _) <= y@(Split _ _) = abideJS x <= y
277+ (One a) <= (One b) = a <= b
278+ (Join a b) <= (Join c d) = (a <= c) && (b <= d)
279+ (Fork a b) <= (Fork c d) = (a <= c) && (b <= d)
280+ x@(Fork _ _) <= y@(Join _ _) = x <= abideJF y
281+ x@(Join _ _) <= y@(Fork _ _) = abideJF x <= y
265282
266283-- Primitives
267284
268−-- | Empty matrix constructor
269−empty :: Matrix e Void Void
270−empty = Empty
271−
272285-- | Unit matrix constructor
273286one :: e -> Matrix e () ()
274287one = One
275288
276−-- | Matrix 'Junc' constructor
277−junc :: Matrix e a rows -> Matrix e b rows -> Matrix e (Either a b) rows
278−junc = Junc
289+-- | Matrix 'Join' constructor
290+join :: Matrix e a rows -> Matrix e b rows -> Matrix e (Either a b) rows
291+join = Join
279292
280293infixl 3 |||
281294
282−-- | Matrix 'Junc' constructor
295+-- | Matrix 'Join' constructor
283296(|||) :: Matrix e a rows -> Matrix e b rows -> Matrix e (Either a b) rows
284−(|||) = Junc
297+(|||) = Join
285298
286−-- | Matrix 'Split' constructor
287−split :: Matrix e cols a -> Matrix e cols b -> Matrix e cols (Either a b)
288−split = Split
299+-- | Matrix 'Fork' constructor
300+fork :: Matrix e cols a -> Matrix e cols b -> Matrix e cols (Either a b)
301+fork = Fork
289302
290303infixl 2 ===
291304
292−-- | Matrix 'Split' constructor
305+-- | Matrix 'Fork' constructor
293306(===) :: Matrix e cols a -> Matrix e cols b -> Matrix e cols (Either a b)
294−(===) = Split
307+(===) = Fork
295308
296309-- Construction
297310
298311-- | Type class for defining the 'fromList' conversion function.
299312--
300313-- Given that it is not possible to branch on types at the term level type
301−-- classes are needed bery much like an inductive definition but on types.
302−class FromLists e cols rows where
314+-- classes are needed very much like an inductive definition but on types.
315+class FromLists cols rows where
303316 -- | Build a matrix out of a list of list of elements. Throws a runtime
304317 -- error if the dimensions do not match.
305318 fromLists :: [[e]] -> Matrix e cols rows
306319
307−instance FromLists e Void Void where
308− fromLists [] = Empty
309− fromLists _ = error "Wrong dimensions"
310−
311−instance {-# OVERLAPPING #-} FromLists e () () where
320+instance FromLists () () where
312321 fromLists [[e]] = One e
313322 fromLists _ = error "Wrong dimensions"
314323
315−instance {-# OVERLAPPING #-} (FromLists e cols ()) => FromLists e (Either () cols) () where
316− fromLists [h : t] = Junc (One h) (fromLists [t])
324+instance (FromLists cols ()) => FromLists (Either () cols) () where
325+ fromLists [h : t] = Join (One h) (fromLists [t])
317326 fromLists _ = error "Wrong dimensions"
318327
319−instance {-# OVERLAPPABLE #-} (FromLists e a (), FromLists e b (), KnownNat (Count a)) => FromLists e (Either a b) () where
320− fromLists [l] =
328+instance {-# OVERLAPPABLE #-}
329+ (FromLists a (), FromLists b (), Countable a) => FromLists (Either a b) () where
330+ fromLists [l] =
321331 let rowsA = fromInteger (natVal (Proxy :: Proxy (Count a)))
322− in Junc (fromLists [take rowsA l]) (fromLists [drop rowsA l])
332+ in Join (fromLists [take rowsA l]) (fromLists [drop rowsA l])
323333 fromLists _ = error "Wrong dimensions"
324334
325−instance {-# OVERLAPPING #-} (FromLists e () rows) => FromLists e () (Either () rows) where
326− fromLists ([h] : t) = Split (One h) (fromLists t)
335+instance (FromLists () rows) => FromLists () (Either () rows) where
336+ fromLists ([h] : t) = Fork (One h) (fromLists t)
327337 fromLists _ = error "Wrong dimensions"
328338
329−instance {-# OVERLAPPABLE #-} (FromLists e () a, FromLists e () b, KnownNat (Count a)) => FromLists e () (Either a b) where
330− fromLists l@([_] : _) =
339+instance {-# OVERLAPPABLE #-}
340+ (FromLists () a, FromLists () b, Countable a) => FromLists () (Either a b) where
341+ fromLists l@([_] : _) =
331342 let rowsA = fromInteger (natVal (Proxy :: Proxy (Count a)))
332− in Split (fromLists (take rowsA l)) (fromLists (drop rowsA l))
343+ in Fork (fromLists (take rowsA l)) (fromLists (drop rowsA l))
333344 fromLists _ = error "Wrong dimensions"
334345
335−instance {-# OVERLAPPABLE #-} (FromLists e (Either a b) c, FromLists e (Either a b) d, KnownNat (Count c)) => FromLists e (Either a b) (Either c d) where
346+instance (FromLists (Either a b) c, FromLists (Either a b) d, Countable c)
347+ => FromLists (Either a b) (Either c d) where
336348 fromLists l@(h : t) =
337349 let lh = length h
338350 rowsC = fromInteger (natVal (Proxy :: Proxy (Count c)))
339− condition = all (== lh) (map length t)
351+ condition = all ((== lh) . length) t
340352 in if lh > 0 && condition
341− then Split (fromLists (take rowsC l)) (fromLists (drop rowsC l))
353+ then Fork (fromLists (take rowsC l)) (fromLists (drop rowsC l))
342354 else error "Not all rows have the same length"
343355
344356-- | Matrix builder function. Constructs a matrix provided with
345−-- a construction function.
346−matrixBuilder ::
357+-- a construction function that operates with indices.
358+matrixBuilder' ::
347359 forall e cols rows.
348− ( FromLists e cols rows,
349− KnownNat (Count cols),
350− KnownNat (Count rows)
351− ) =>
352− ((Int, Int) -> e) ->
353− Matrix e cols rows
354−matrixBuilder f =
360+ ( FL cols rows,
361+ CountableDims cols rows
362+ ) => ((Int, Int) -> e) -> Matrix e cols rows
363+matrixBuilder' f =
355364 let c = fromInteger $ natVal (Proxy :: Proxy (Count cols))
356365 r = fromInteger $ natVal (Proxy :: Proxy (Count rows))
357366 positions = [(a, b) | a <- [0 .. (r - 1)], b <- [0 .. (c - 1)]]
358367 in fromLists . map (map f) . groupBy (\(x, _) (w, _) -> x == w) $ positions
359368
369+-- | Matrix builder function. Constructs a matrix provided with
370+-- a construction function that operates with arbitrary types.
371+matrixBuilder ::
372+ forall e a b.
373+ ( FLN a b,
374+ Enum a,
375+ Enum b,
376+ Bounded a,
377+ Bounded b,
378+ Eq a,
379+ Countable b
380+ ) => ((a, b) -> e) -> Matrix e (Normalize a) (Normalize b)
381+matrixBuilder f =
382+ let r = fromInteger $ natVal (Proxy :: Proxy (Count b))
383+ positions = [(a, b) | a <- [minBound .. maxBound], b <- [minBound .. maxBound]]
384+ in fromLists . map (map f) . transpose . buildList r $ positions
385+ where
386+ buildList _ [] = []
387+ buildList r l = take r l : buildList r (drop r l)
388+
360389-- | Constructs a column vector matrix
361−col :: (FromLists e () rows) => [e] -> Matrix e () rows
390+col :: (FL () rows) => [e] -> Matrix e () rows
362391col = fromLists . map (: [])
363392
364393-- | Constructs a row vector matrix
365−row :: (FromLists e cols ()) => [e] -> Matrix e cols ()
394+row :: (FL cols ()) => [e] -> Matrix e cols ()
366395row = fromLists . (: [])
367396
368397-- | Lifts functions to matrices with arbitrary dimensions.
369398--
370399-- NOTE: Be careful to not ask for a matrix bigger than the cardinality of
371400-- types @a@ or @b@ allows.
372−fromF ::
401+fromF' ::
373402 forall a b cols rows e.
374− ( Bounded a,
375− Bounded b,
376− Enum a,
377− Enum b,
378− Eq b,
379− Num e,
380− Ord e,
381− KnownNat (Count cols),
382− KnownNat (Count rows),
383− FromLists e rows cols
403+ ( Liftable e a b,
404+ CountableDims cols rows,
405+ FL rows cols
384406 ) =>
385407 (a -> b) ->
386408 Matrix e cols rows
387−fromF f =
409+fromF' f =
388410 let minA = minBound @a
389411 maxA = maxBound @a
390412 minB = minBound @b
@@ -394,8 +416,8 @@ fromF f =
394416 elementsA = take ccols [minA .. maxA]
395417 elementsB = take rrows [minB .. maxB]
396418 combinations = (,) <$> elementsA <*> elementsB
397− combAp = map snd . sort . map (\(a, b) -> if f a == b
398− then ((fromEnum a, fromEnum b), 1)
419+ combAp = map snd . sort . map (\(a, b) -> if f a == b
420+ then ((fromEnum a, fromEnum b), 1)
399421 else ((fromEnum a, fromEnum b), 0)) $ combinations
400422 mList = buildList combAp rrows
401423 in tr $ fromLists mList
@@ -405,48 +427,23 @@ fromF f =
405427
406428-- | Lifts functions to matrices with dimensions matching @a@ and @b@
407429-- cardinality's.
408−fromF' ::
430+fromF ::
409431 forall a b e.
410− ( Bounded a,
411− Bounded b,
412− Enum a,
413− Enum b,
414− Eq b,
415− Num e,
416− Ord e,
417− KnownNat (Count (Normalize a)),
418− KnownNat (Count (Normalize b)),
419− FromLists e (Normalize b) (Normalize a)
432+ ( Liftable e a b,
433+ CountableDimsN a b,
434+ FLN b a
420435 ) =>
421436 (a -> b) ->
422437 Matrix e (Normalize a) (Normalize b)
423−fromF' f =
424− let minA = minBound @a
425− maxA = maxBound @a
426− minB = minBound @b
427− maxB = maxBound @b
428− ccols = fromInteger $ natVal (Proxy :: Proxy (Count (Normalize a)))
429− rrows = fromInteger $ natVal (Proxy :: Proxy (Count (Normalize b)))
430− elementsA = take ccols [minA .. maxA]
431− elementsB = take rrows [minB .. maxB]
432− combinations = (,) <$> elementsA <*> elementsB
433− combAp = map snd . sort . map (\(a, b) -> if f a == b
434− then ((fromEnum a, fromEnum b), 1)
435− else ((fromEnum a, fromEnum b), 0)) $ combinations
436− mList = buildList combAp rrows
437− in tr $ fromLists mList
438− where
439− buildList [] _ = []
440− buildList l r = take r l : buildList (drop r l) r
438+fromF = fromF'
441439
442440-- Conversion
443441
444442-- | Converts a matrix to a list of lists of elements.
445443toLists :: Matrix e cols rows -> [[e]]
446−toLists Empty = []
447444toLists (One e) = [[e]]
448−toLists (Split l r) = toLists l ++ toLists r
449−toLists (Junc l r) = zipWith (++) (toLists l) (toLists r)
445+toLists (Fork l r) = toLists l ++ toLists r
446+toLists (Join l r) = zipWith (++) (toLists l) (toLists r)
450447
451448-- | Converts a matrix to a list of elements.
452449toList :: Matrix e cols rows -> [e]
@@ -455,37 +452,38 @@ toList = concat . toLists
455452-- Zeros Matrix
456453
457454-- | The zero matrix. A matrix wholly filled with zeros.
458−zeros :: (Num e, FromLists e cols rows, KnownNat (Count cols), KnownNat (Count rows)) => Matrix e cols rows
459−zeros = matrixBuilder (const 0)
455+zeros :: (Num e, FL cols rows, CountableDims cols rows) => Matrix e cols rows
456+zeros = matrixBuilder' (const 0)
460457
461458-- Ones Matrix
462459
463460-- | The ones matrix. A matrix wholly filled with ones.
464461--
465462-- Also known as T (Top) matrix.
466−ones :: (Num e, FromLists e cols rows, KnownNat (Count cols), KnownNat (Count rows)) => Matrix e cols rows
467−ones = matrixBuilder (const 1)
463+ones :: (Num e, FL cols rows, CountableDims cols rows) => Matrix e cols rows
464+ones = matrixBuilder' (const 1)
468465
469466-- Const Matrix
470467
471468-- | The constant matrix constructor. A matrix wholly filled with a given
472469-- value.
473−constant :: (Num e, FromLists e cols rows, KnownNat (Count cols), KnownNat (Count rows)) => e -> Matrix e cols rows
474−constant e = matrixBuilder (const e)
470+constant :: (Num e, FL cols rows, CountableDims cols rows) => e -> Matrix e cols rows
471+constant e = matrixBuilder' (const e)
475472
476473-- Bang Matrix
477474
478475-- | The T (Top) row vector matrix.
479−bang :: forall e cols. (Num e, Enum e, FromLists e cols (), KnownNat (Count cols)) => Matrix e cols ()
476+bang :: forall e cols. (Num e, Enum e, FL cols (), Countable cols) => Matrix e cols ()
480477bang =
481478 let c = fromInteger $ natVal (Proxy :: Proxy (Count cols))
482479 in fromLists [take c [1, 1 ..]]
483480
484−-- Identity Matrix
481+-- iden Matrix
485482
486−-- | Identity matrix.
487−identity :: (Num e, FromLists e cols cols, KnownNat (Count cols)) => Matrix e cols cols
488−identity = matrixBuilder (bool 0 1 . uncurry (==))
483+-- | iden matrix.
484+iden :: forall e cols . (Num e, FL cols cols, Countable cols) => Matrix e cols cols
485+iden = matrixBuilder' (bool 0 1 . uncurry (==))
486+{-# NOINLINE iden #-}
489487
490488-- Matrix composition (MMM)
491489
@@ -494,60 +492,90 @@ identity = matrixBuilder (bool 0 1 . uncurry (==))
494492-- This definition takes advantage of divide-and-conquer and fusion laws
495493-- from LAoP.
496494comp :: (Num e) => Matrix e cr rows -> Matrix e cols cr -> Matrix e cols rows
497−comp Empty Empty = Empty
498−comp (One a) (One b) = One (a * b)
499−comp (Junc a b) (Split c d) = comp a c + comp b d -- Divide-and-conquer law
500−comp (Split a b) c = Split (comp a c) (comp b c) -- Split fusion law
501−comp c (Junc a b) = Junc (comp c a) (comp c b) -- Junc fusion law
495+comp (One a) (One b) = One (a * b)
496+comp (Join a b) (Fork c d) = comp a c + comp b d -- Divide-and-conquer law
497+comp (Fork a b) c = Fork (comp a c) (comp b c) -- Fork fusion law
498+comp c (Join a b) = Join (comp c a) (comp c b) -- Join fusion law
499+{-# NOINLINE comp #-}
500+{-# RULES
501+ "comp/iden1" forall m. comp m iden = m ;
502+ "comp/iden2" forall m. comp iden m = m
503+#-}
504+
505+-- Scalar multiplication of matrices
506+
507+infixl 7 .|
508+-- | Scalar multiplication of matrices.
509+(.|) :: Num e => e -> Matrix e cols rows -> Matrix e cols rows
510+(.|) e (One a) = One (e * a)
511+(.|) e (Join a b) = Join (e .| a) (e .| b)
512+(.|) e (Fork a b) = Fork (e .| a) (e .| b)
513+
514+-- Scalar division of matrices
515+
516+infixl 7 ./
517+-- | Scalar multiplication of matrices.
518+(./) :: Fractional e => Matrix e cols rows -> e -> Matrix e cols rows
519+(./) (One a) e = One (a / e)
520+(./) (Join a b) e = Join (a ./ e) (b ./ e)
521+(./) (Fork a b) e = Fork (a ./ e) (b ./ e)
502522
503523-- Projections
504524
505525-- | Biproduct first component projection
506−p1 :: forall e m n. (Num e, KnownNat (Count n), KnownNat (Count m), FromLists e n m, FromLists e m m) => Matrix e (Either m n) m
507−p1 =
508− let iden = identity :: Matrix e m m
509− zero = zeros :: Matrix e n m
510− in junc iden zero
526+p1 :: (Num e, CountableDims n m, FL n m, FL m m) => Matrix e (Either m n) m
527+p1 = join id zeros
511528
512529-- | Biproduct second component projection
513−p2 :: forall e m n. (Num e, KnownNat (Count n), KnownNat (Count m), FromLists e m n, FromLists e n n) => Matrix e (Either m n) n
514−p2 =
515− let iden = identity :: Matrix e n n
516− zero = zeros :: Matrix e m n
517− in junc zero iden
530+p2 :: (Num e, CountableDims n m, FL m n, FL n n) => Matrix e (Either m n) n
531+p2 = join zeros id
518532
519533-- Injections
520534
521535-- | Biproduct first component injection
522−i1 :: (Num e, KnownNat (Count n), KnownNat (Count m), FromLists e n m, FromLists e m m) => Matrix e m (Either m n)
536+i1 :: (Num e, CountableDims n m, FL n m, FL m m) => Matrix e m (Either m n)
523537i1 = tr p1
524538
525539-- | Biproduct second component injection
526−i2 :: (Num e, KnownNat (Count n), KnownNat (Count m), FromLists e m n, FromLists e n n) => Matrix e n (Either m n)
540+i2 :: (Num e, CountableDims n m, FL m n, FL n n) => Matrix e n (Either m n)
527541i2 = tr p2
528542
529543-- Dimensions
530544
531545-- | Obtain the number of rows.
532546--
533−-- NOTE: The 'KnownNat' constaint is needed in order to obtain the
534−-- dimensions in constant time.
535−--
536−-- TODO: A 'rows' function that does not need the 'KnownNat' constraint in
537−-- exchange for performance.
538−rows :: forall e cols rows. (KnownNat (Count rows)) => Matrix e cols rows -> Int
547+-- NOTE: The 'KnownNat' constraint is needed in order to obtain the
548+-- dimensions in constant time. For a version that doesn't require the
549+-- constraint see 'rows''.
550+rows :: forall e cols rows. (Countable rows) => Matrix e cols rows -> Int
539551rows _ = fromInteger $ natVal (Proxy :: Proxy (Count rows))
540552
553+-- | Obtain the number of rows in an inefficient manner, but without any
554+-- constraints.
555+--
556+-- For a more efficient version see 'rows'.
557+rows' :: Matrix e cols rows -> Int
558+rows' (One _) = 1
559+rows' (Join lhs _) = rows' lhs
560+rows' (Fork top bottom) = rows' top + rows' bottom
561+
541562-- | Obtain the number of columns.
542−--
543−-- NOTE: The 'KnownNat' constaint is needed in order to obtain the
544−-- dimensions in constant time.
545563--
546−-- TODO: A 'columns' function that does not need the 'KnownNat' constraint in
547−-- exchange for performance.
548−columns :: forall e cols rows. (KnownNat (Count cols)) => Matrix e cols rows -> Int
564+-- NOTE: The 'KnownNat' constraint is needed in order to obtain the
565+-- dimensions in constant time. For a version that doesn't require the
566+-- constraint see 'columns''.
567+columns :: forall e cols rows. (Countable cols) => Matrix e cols rows -> Int
549568columns _ = fromInteger $ natVal (Proxy :: Proxy (Count cols))
550569
570+-- | Obtain the number of columns in an inefficient manner, but without any
571+-- constraints.
572+--
573+-- For a more efficient version see 'columns'.
574+columns' :: Matrix e cols rows -> Int
575+columns' (One _) = 1
576+columns' (Join lhs rhs) = columns' lhs + columns' rhs
577+columns' (Fork top _) = columns' top
578+
551579-- Coproduct Bifunctor
552580
553581infixl 5 -|-
@@ -556,157 +584,172 @@ infixl 5 -|-
556584(-|-) ::
557585 forall e n k m j.
558586 ( Num e,
559− KnownNat (Count j),
560− KnownNat (Count k),
561− FromLists e k k,
562− FromLists e j k,
563− FromLists e k j,
564− FromLists e j j
587+ CountableDims j k,
588+ FL k k,
589+ FL j k,
590+ FL k j,
591+ FL j j
565592 ) =>
566593 Matrix e n k ->
567594 Matrix e m j ->
568595 Matrix e (Either n m) (Either k j)
569−(-|-) a b = Junc (i1 . a) (i2 . b)
596+(-|-) a b = Join (i1 . a) (i2 . b)
570597
571598-- Khatri Rao Product and projections
572599
573600-- | Khatri Rao product first component projection matrix.
574−kp1 ::
601+fstM ::
575602 forall e m k .
576603 ( Num e,
577− KnownNat (Count k),
578− FromLists e (FromNat (Count m * Count k)) m,
579− KnownNat (Count m),
580− KnownNat (Count (Normalize (m, k)))
604+ CountableDims k m,
605+ FL (Normalize (m, k)) m,
606+ CountableN (m, k)
581607 ) => Matrix e (Normalize (m, k)) m
582−kp1 = matrixBuilder f
608+fstM = matrixBuilder' f
583609 where
584610 offset = fromInteger (natVal (Proxy :: Proxy (Count k)))
585611 f (x, y)
586612 | y >= (x * offset) && y <= (x * offset + offset - 1) = 1
587− | otherwise = 0
613+ | otherwise = 0
588614
589615-- | Khatri Rao product second component projection matrix.
590−kp2 ::
616+sndM ::
591617 forall e m k .
592618 ( Num e,
593− KnownNat (Count k),
594− FromLists e (FromNat (Count m * Count k)) k,
595− KnownNat (Count m),
596− KnownNat (Count (Normalize (m, k)))
619+ CountableDims k m,
620+ FL (Normalize (m, k)) k,
621+ CountableN (m, k)
597622 ) => Matrix e (Normalize (m, k)) k
598−kp2 = matrixBuilder f
623+sndM = matrixBuilder' f
599624 where
600625 offset = fromInteger (natVal (Proxy :: Proxy (Count k)))
601626 f (x, y)
602627 | x == y || mod (y - x) offset == 0 = 1
603− | otherwise = 0
628+ | otherwise = 0
604629
605630-- | Khatri Rao Matrix product also known as matrix pairing.
606631--
607632-- NOTE: That this is not a true categorical product, see for instance:
608−--
633+--
609634-- @
610−-- | kp1 . khatri a b == a
611−-- khatri a b ==> |
612−-- | kp2 . khatri a b == b
635+-- | fstM . kr a b == a
636+-- kr a b ==> |
637+-- | sndM . kr a b == b
613638-- @
614639--
615640-- __Emphasis__ on the implication symbol.
616−khatri ::
617− forall e cols a b.
641+kr ::
642+ forall e cols a b.
618643 ( Num e,
619− KnownNat (Count a),
620− KnownNat (Count b),
621− KnownNat (Count (Normalize (a, b))),
622− FromLists e (Normalize (a, b)) a,
623− FromLists e (Normalize (a, b)) b
644+ CountableDims a b,
645+ CountableN (a, b),
646+ FL (Normalize (a, b)) a,
647+ FL (Normalize (a, b)) b
624648 ) => Matrix e cols a -> Matrix e cols b -> Matrix e cols (Normalize (a, b))
625−khatri a b =
626− let kp1' = kp1 @e @a @b
627− kp2' = kp2 @e @a @b
628− in (tr kp1') . a * (tr kp2') . b
649+kr a b =
650+ let fstM' = fstM @e @a @b
651+ sndM' = sndM @e @a @b
652+ in (tr fstM' . a) * (tr sndM' . b)
629653
630654-- Product Bifunctor (Kronecker)
631655
632656infixl 4 ><
633657
634658-- | Matrix product functor also known as kronecker product
635−(><) ::
636− forall e m p n q.
659+(><) ::
660+ forall e m p n q.
637661 ( Num e,
638− KnownNat (Count m),
639− KnownNat (Count n),
640− KnownNat (Count p),
641− KnownNat (Count q),
642− KnownNat (Count (Normalize (m, n))),
643− FromLists e (Normalize (m, n)) m,
644− FromLists e (Normalize (m, n)) n,
645− KnownNat (Count (Normalize (p, q))),
646− FromLists e (Normalize (p, q)) p,
647− FromLists e (Normalize (p, q)) q
648− )
662+ CountableDims m n,
663+ CountableDims p q,
664+ CountableDimsN (m, n) (p, q),
665+ FL (Normalize (m, n)) m,
666+ FL (Normalize (m, n)) n,
667+ FL (Normalize (p, q)) p,
668+ FL (Normalize (p, q)) q
669+ )
649670 => Matrix e m p -> Matrix e n q -> Matrix e (Normalize (m, n)) (Normalize (p, q))
650671(><) a b =
651− let kp1' = kp1 @e @m @n
652− kp2' = kp2 @e @m @n
653− in khatri (a . kp1') (b . kp2')
672+ let fstM' = fstM @e @m @n
673+ sndM' = sndM @e @m @n
674+ in kr (a . fstM') (b . sndM')
654675
655−-- Matrix abide Junc Split
676+-- Matrix abide Join Fork
656677
657−-- | Matrix "abiding" followin the 'Junc'-'Split' abide law.
658−--
678+-- | Matrix "abiding" following the 'Join'-'Fork' exchange law.
679+--
659680-- Law:
660681--
661682-- @
662−-- 'Junc' ('Split' a c) ('Split' b d) == 'Split' ('Junc' a b) ('Junc' c d)
683+-- 'Join' ('Fork' a c) ('Fork' b d) == 'Fork' ('Join' a b) ('Join' c d)
663684-- @
664−abideJS :: Matrix e cols rows -> Matrix e cols rows
665−abideJS (Junc (Split a c) (Split b d)) = Split (Junc (abideJS a) (abideJS b)) (Junc (abideJS c) (abideJS d)) -- Junc-Split abide law
666−abideJS Empty = Empty
667−abideJS (One e) = One e
668−abideJS (Junc a b) = Junc (abideJS a) (abideJS b)
669−abideJS (Split a b) = Split (abideJS a) (abideJS b)
685+abideJF :: Matrix e cols rows -> Matrix e cols rows
686+abideJF (Join (Fork a c) (Fork b d)) = Fork (Join (abideJF a) (abideJF b)) (Join (abideJF c) (abideJF d)) -- Join-Fork abide law
687+abideJF (One e) = One e
688+abideJF (Join a b) = Join (abideJF a) (abideJF b)
689+abideJF (Fork a b) = Fork (abideJF a) (abideJF b)
670690
671−-- Matrix abide Split Junc
691+-- Matrix abide Fork Join
672692
673−-- | Matrix "abiding" followin the 'Split'-'Junc' abide law.
674−--
693+-- | Matrix "abiding" followin the 'Fork'-'Join' abide law.
694+--
675695-- @
676−-- 'Split' ('Junc' a b) ('Junc' c d) == 'Junc' ('Split' a c) ('Split' b d)
696+-- 'Fork' ('Join' a b) ('Join' c d) == 'Join' ('Fork' a c) ('Fork' b d)
677697-- @
678−abideSJ :: Matrix e cols rows -> Matrix e cols rows
679−abideSJ (Split (Junc a b) (Junc c d)) = Junc (Split (abideSJ a) (abideSJ c)) (Split (abideSJ b) (abideSJ d)) -- Split-Junc abide law
680−abideSJ Empty = Empty
681−abideSJ (One e) = One e
682−abideSJ (Junc a b) = Junc (abideSJ a) (abideSJ b)
683−abideSJ (Split a b) = Split (abideSJ a) (abideSJ b)
698+abideFJ :: Matrix e cols rows -> Matrix e cols rows
699+abideFJ (Fork (Join a b) (Join c d)) = Join (Fork (abideFJ a) (abideFJ c)) (Fork (abideFJ b) (abideFJ d)) -- Fork-Join abide law
700+abideFJ (One e) = One e
701+abideFJ (Join a b) = Join (abideFJ a) (abideFJ b)
702+abideFJ (Fork a b) = Fork (abideFJ a) (abideFJ b)
684703
685704-- Matrix transposition
686705
687706-- | Matrix transposition.
688707tr :: Matrix e cols rows -> Matrix e rows cols
689−tr Empty = Empty
690−tr (One e) = One e
691−tr (Junc a b) = Split (tr a) (tr b)
692−tr (Split a b) = Junc (tr a) (tr b)
708+tr (One e) = One e
709+tr (Join a b) = Fork (tr a) (tr b)
710+tr (Fork a b) = Join (tr a) (tr b)
693711
694712-- Selective 'select' operator
695713
696714-- | Selective functors 'select' operator equivalent inspired by the
697715-- ArrowMonad solution presented in the paper.
698−select :: (Num e, FromLists e b b, KnownNat (Count b)) => Matrix e cols (Either a b) -> Matrix e a b -> Matrix e cols b
699−select m y = junc y identity . m
716+select :: (Num e, FL b b, Countable b) => Matrix e cols (Either a b) -> Matrix e a b -> Matrix e cols b
717+select (Fork a b) y = y . a + b -- Divide-and-conquer law
718+select (Join (Fork a c) (Fork b d)) y = join (y . a + c) (y . b + d) -- Pattern matching + DnC law
719+select m y = join y id . m
720+
721+branch ::
722+ ( Num e,
723+ CountableDims a b,
724+ CountableDims c (Either b c),
725+ FL c b,
726+ FL a b,
727+ FL a a,
728+ FL b b,
729+ FL c c,
730+ FL b a,
731+ FL b c,
732+ FL (Either b c) b,
733+ FL (Either b c) c
734+ )
735+ => Matrix e cols (Either a b) -> Matrix e a c -> Matrix e b c -> Matrix e cols c
736+branch x l r = f x `select` g l `select` r
737+ where
738+ f :: (Num e, Countable a, CountableDims b c, FL a b, FL c b, FL b b, FL b a, FL a a)
739+ => Matrix e cols (Either a b) -> Matrix e cols (Either a (Either b c))
740+ f m = fork (tr i1) (i1 . tr i2) . m
741+ g :: (Num e, CountableDims b c, FL b c, FL c c) => Matrix e a c -> Matrix e a (Either b c)
742+ g m = i2 . m
700743
701744-- McCarthy's Conditional
702745
703746-- | McCarthy's Conditional expresses probabilistic choice.
704747cond ::
705− ( cols ~ FromNat (Count cols),
706− KnownNat (Count cols),
707− FromLists e () cols,
708− FromLists e cols (),
709− FromLists e cols cols,
748+ ( Trivial cols,
749+ Countable cols,
750+ FL () cols,
751+ FL cols (),
752+ FL cols cols,
710753 Bounded a,
711754 Enum a,
712755 Num e,
@@ -714,14 +757,14 @@ cond ::
714757 )
715758 =>
716759 (a -> Bool) -> Matrix e cols rows -> Matrix e cols rows -> Matrix e cols rows
717−cond p f g = junc f g . grd p
718−
719−grd ::
720− ( q ~ FromNat (Count q),
721− KnownNat (Count q),
722− FromLists e () q,
723− FromLists e q (),
724− FromLists e q q,
760+cond p f g = join f g . grd p
761+
762+grd ::
763+ ( Trivial q,
764+ Countable q,
765+ FL () q,
766+ FL q (),
767+ FL q q,
725768 Bounded a,
726769 Enum a,
727770 Num e,
@@ -729,62 +772,88 @@ grd ::
729772 )
730773 =>
731774 (a -> Bool) -> Matrix e q (Either q q)
732−grd f = split (corr f) (corr (not . f))
733−
734−corr ::
735− forall e a q .
736− ( q ~ FromNat (Count q),
737− KnownNat (Count q),
738− FromLists e () q,
739− FromLists e q (),
740− FromLists e q q,
741− Bounded a,
742− Enum a,
743− Num e,
744− Ord e
745− )
775+grd f = fork (corr f) (corr (not . f))
776+
777+corr ::
778+ forall e a q .
779+ ( Trivial q,
780+ Countable q,
781+ FL () q,
782+ FL q (),
783+ FL q q,
784+ Liftable e a Bool
785+ )
746786 => (a -> Bool) -> Matrix e q q
747−corr p = let f = fromF p :: Matrix e q ()
748− in khatri f (identity :: Matrix e q q)
787+corr p = let f = fromF' p :: Matrix e q ()
788+ in kr f (id :: Matrix e q q)
749789
750790-- Pretty print
751791
752792prettyAux :: Show e => [[e]] -> [[e]] -> String
753793prettyAux [] _ = ""
754−prettyAux [[e]] m = "│ " ++ fill (show e) ++ " │\n"
794+prettyAux [[e]] m = "│ " ++ fill (show e) ++ " │\n"
755795 where
756796 v = fmap show m
757797 widest = maximum $ fmap length v
758798 fill str = replicate (widest - length str - 2) ' ' ++ str
759−prettyAux [h] m = "│ " ++ fill (unwords $ map show h) ++ " │\n"
799+prettyAux [h] m = "│ " ++ fill (unwords $ map show h) ++ " │\n"
760800 where
761− v = fmap show m
762− widest = maximum $ fmap length v
801+ v = fmap show m
802+ widest = maximum $ fmap length v
763803 fill str = replicate (widest - length str - 2) ' ' ++ str
764−prettyAux (h : t) l = "│ " ++ fill (unwords $ map show h) ++ " │\n" ++
804+prettyAux (h : t) l = "│ " ++ fill (unwords $ map show h) ++ " │\n" ++
765805 prettyAux t l
766806 where
767− v = fmap show l
768− widest = maximum $ fmap length v
807+ v = fmap show l
808+ widest = maximum $ fmap length v
769809 fill str = replicate (widest - length str - 2) ' ' ++ str
770810
771811-- | Matrix pretty printer
772−pretty :: (KnownNat (Count cols), Show e) => Matrix e cols rows -> String
773−pretty m = "┌ " ++ unwords (replicate (columns m) blank) ++ " ┐\n" ++
774− prettyAux (toLists m) (toLists m) ++
775− "└ " ++ unwords (replicate (columns m) blank) ++ " ┘"
776− where
777− v = fmap show (toList m)
778− widest = maximum $ fmap length v
812+pretty :: (CountableDims cols rows, Show e) => Matrix e cols rows -> String
813+pretty m = concat
814+ [ "┌ ", unwords (replicate (columns m) blank), " ┐\n"
815+ , unlines
816+ [ "│ " ++ unwords (fmap (\j -> fill $ show $ getElem i j m) [1..columns m]) ++ " │" | i <- [1..rows m] ]
817+ , "└ ", unwords (replicate (columns m) blank), " ┘"
818+ ]
819+ where
820+ strings = map show (toList m)
821+ widest = maximum $ map length strings
779822 fill str = replicate (widest - length str) ' ' ++ str
780− blank = fill ""
823+ blank = fill ""
824+ safeGet i j m
825+ | i > rows m || j > columns m || i < 1 || j < 1 = Nothing
826+ | otherwise = Just $ unsafeGet i j m (toList m)
827+ unsafeGet i j m l = l !! encode (columns m) (i,j)
828+ encode m (i,j) = (i-1)*m + j - 1
829+ getElem i j m =
830+ fromMaybe
831+ (error $
832+ "getElem: Trying to get the "
833+ ++ show (i, j)
834+ ++ " element from a "
835+ ++ show (rows m) ++ "x" ++ show (columns m)
836+ ++ " matrix."
837+ )
838+ (safeGet i j m)
781839
782840-- | Matrix pretty printer
783−prettyPrint :: (KnownNat (Count cols), Show e) => Matrix e cols rows -> IO ()
841+prettyPrint :: (CountableDims cols rows, Show e) => Matrix e cols rows -> IO ()
784842prettyPrint = putStrLn . pretty
785843
844+-- | Zip two matrices with a given binary function
845+zipWithM :: (e -> f -> g) -> Matrix e cols rows -> Matrix f cols rows -> Matrix g cols rows
846+zipWithM f (One a) (One b) = One (f a b)
847+zipWithM f (Join a b) (Join c d) = Join (zipWithM f a c) (zipWithM f b d)
848+zipWithM f (Fork a b) (Fork c d) = Fork (zipWithM f a c) (zipWithM f b d)
849+zipWithM f x@(Fork _ _) y@(Join _ _) = zipWithM f x (abideJF y)
850+zipWithM f x@(Join _ _) y@(Fork _ _) = zipWithM f (abideJF x) y
851+
786852-- Relational operators functions
787853
854+type Boolean = Natural 0 1
855+type Relation a b = Matrix Boolean a b
856+
788857-- | Helper conversion function
789858toBool :: (Num e, Eq e) => e -> Bool
790859toBool n
@@ -796,104 +865,110 @@ fromBool :: Bool -> Natural 0 1
796865fromBool True = nat 1
797866fromBool False = nat 0
798867
868+-- | Relational negation
869+negateM :: Relation cols rows -> Relation cols rows
870+negateM (One (Nat p)) = One (Nat (negate p))
871+negateM (Join a b) = Join (negateM a) (negateM b)
872+negateM (Fork a b) = Fork (negateM a) (negateM b)
873+
799874-- | Relational addition
800−orM :: Matrix (Natural 0 1) cols rows -> Matrix (Natural 0 1) cols rows -> Matrix (Natural 0 1) cols rows
801−orM Empty Empty = Empty
802−orM (One a) (One b) = One (fromBool (toBool a || toBool b))
803−orM (Junc a b) (Junc c d) = Junc (orM a c) (orM b d)
804−orM (Split a b) (Split c d) = Split (orM a c) (orM b d)
805−orM x@(Split _ _) y@(Junc _ _) = orM x (abideJS y)
806−orM x@(Junc _ _) y@(Split _ _) = orM (abideJS x) y
875+orM :: Relation cols rows -> Relation cols rows -> Relation cols rows
876+orM (One a) (One b) = One (fromBool (toBool a || toBool b))
877+orM (Join a b) (Join c d) = Join (orM a c) (orM b d)
878+orM (Fork a b) (Fork c d) = Fork (orM a c) (orM b d)
879+orM x@(Fork _ _) y@(Join _ _) = orM x (abideJF y)
880+orM x@(Join _ _) y@(Fork _ _) = orM (abideJF x) y
807881
808882-- | Relational multiplication
809−andM :: Matrix (Natural 0 1) cols rows -> Matrix (Natural 0 1) cols rows -> Matrix (Natural 0 1) cols rows
810−andM Empty Empty = Empty
811−andM (One a) (One b) = One (fromBool (toBool a && toBool b))
812−andM (Junc a b) (Junc c d) = Junc (andM a c) (andM b d)
813−andM (Split a b) (Split c d) = Split (andM a c) (andM b d)
814−andM x@(Split _ _) y@(Junc _ _) = andM x (abideJS y)
815−andM x@(Junc _ _) y@(Split _ _) = andM (abideJS x) y
883+andM :: Relation cols rows -> Relation cols rows -> Relation cols rows
884+andM (One a) (One b) = One (fromBool (toBool a && toBool b))
885+andM (Join a b) (Join c d) = Join (andM a c) (andM b d)
886+andM (Fork a b) (Fork c d) = Fork (andM a c) (andM b d)
887+andM x@(Fork _ _) y@(Join _ _) = andM x (abideJF y)
888+andM x@(Join _ _) y@(Fork _ _) = andM (abideJF x) y
816889
817890-- | Relational subtraction
818−subM :: Matrix (Natural 0 1) cols rows -> Matrix (Natural 0 1) cols rows -> Matrix (Natural 0 1) cols rows
819−subM Empty Empty = Empty
820−subM (One a) (One b) = if a - b < nat 0 then One (nat 0) else One (a - b)
821−subM (Junc a b) (Junc c d) = Junc (subM a c) (subM b d)
822−subM (Split a b) (Split c d) = Split (subM a c) (subM b d)
823−subM x@(Split _ _) y@(Junc _ _) = subM x (abideJS y)
824−subM x@(Junc _ _) y@(Split _ _) = subM (abideJS x) y
891+subM :: Relation cols rows -> Relation cols rows -> Relation cols rows
892+subM (One a) (One b) = if a - b < nat 0 then One (nat 0) else One (a - b)
893+subM (Join a b) (Join c d) = Join (subM a c) (subM b d)
894+subM (Fork a b) (Fork c d) = Fork (subM a c) (subM b d)
895+subM x@(Fork _ _) y@(Join _ _) = subM x (abideJF y)
896+subM x@(Join _ _) y@(Fork _ _) = subM (abideJF x) y
825897
826898-- | Matrix relational composition.
827−compRel :: Matrix (Natural 0 1) cr rows -> Matrix (Natural 0 1) cols cr -> Matrix (Natural 0 1) cols rows
828−compRel Empty Empty = Empty
829−compRel (One a) (One b) = One (fromBool (toBool a && toBool b))
830−compRel (Junc a b) (Split c d) = orM (compRel a c) (compRel b d) -- Divide-and-conquer law
831−compRel (Split a b) c = Split (compRel a c) (compRel b c) -- Split fusion law
832−compRel c (Junc a b) = Junc (compRel c a) (compRel c b) -- Junc fusion law
899+compRel :: Relation cr rows -> Relation cols cr -> Relation cols rows
900+compRel (One a) (One b) = One (fromBool (toBool a && toBool b))
901+compRel (Join a b) (Fork c d) = orM (compRel a c) (compRel b d) -- Divide-and-conquer law
902+compRel (Fork a b) c = Fork (compRel a c) (compRel b c) -- Fork fusion law
903+compRel c (Join a b) = Join (compRel c a) (compRel c b) -- Join fusion law
904+
905+-- | Matrix relational right division
906+divR :: Relation b c -> Relation b a -> Relation a c
907+divR (One a) (One b) = One (fromBool (not (toBool b) || toBool a)) -- b implies a
908+divR (Join a b) (Join c d) = andM (divR a c) (divR b d)
909+divR (Fork a b) c = Fork (divR a c) (divR b c)
910+divR c (Fork a b) = Join (divR c a) (divR c b)
911+
912+-- | Matrix relational left division
913+divL :: Relation c b -> Relation a b -> Relation a c
914+divL x y = tr (divR (tr y) (tr x))
915+
916+-- | Matrix relational symmetric division
917+divS :: Relation c a -> Relation b a -> Relation c b
918+divS s r = divL r s `intersection` divR (tr r) (tr s)
919+ where
920+ intersection = andM
833921
834922-- | Lifts functions to relations with arbitrary dimensions.
835923--
836924-- NOTE: Be careful to not ask for a relation bigger than the cardinality of
837925-- types @a@ or @b@ allows.
838−fromFRel ::
926+fromFRel' ::
839927 forall a b cols rows.
840− ( Bounded a,
841− Bounded b,
842− Enum a,
843− Enum b,
844− Eq b,
845− KnownNat (Count cols),
846− KnownNat (Count rows),
847− FromLists (Natural 0 1) rows cols
928+ ( Liftable Boolean a b,
929+ CountableDims cols rows,
930+ FL rows cols
848931 ) =>
849932 (a -> b) ->
850− Matrix (Natural 0 1) cols rows
851−fromFRel f =
852− let minA = minBound @a
853− maxA = maxBound @a
854− minB = minBound @b
855− maxB = maxBound @b
856− ccols = fromInteger $ natVal (Proxy :: Proxy (Count cols))
857− rrows = fromInteger $ natVal (Proxy :: Proxy (Count rows))
858− elementsA = take ccols [minA .. maxA]
859− elementsB = take rrows [minB .. maxB]
860− combinations = (,) <$> elementsA <*> elementsB
861− combAp = map snd . sort . map (\(a, b) -> if f a == b
862− then ((fromEnum a, fromEnum b), nat 1)
863− else ((fromEnum a, fromEnum b), nat 0)) $ combinations
864− mList = buildList combAp rrows
865− in tr $ fromLists mList
866− where
867− buildList [] _ = []
868− buildList l r = take r l : buildList (drop r l) r
933+ Relation cols rows
934+fromFRel' = fromF'
869935
870936-- | Lifts functions to relations with dimensions matching @a@ and @b@
871937-- cardinality's.
872−fromFRel' ::
938+fromFRel ::
873939 forall a b.
874− ( Bounded a,
875− Bounded b,
876− Enum a,
877− Enum b,
878− Eq b,
879− KnownNat (Count (Normalize a)),
880− KnownNat (Count (Normalize b)),
881− FromLists (Natural 0 1) (Normalize b) (Normalize a)
940+ ( Liftable Boolean a b,
941+ CountableDimsN a b,
942+ FLN b a
882943 ) =>
883944 (a -> b) ->
884− Matrix (Natural 0 1) (Normalize a) (Normalize b)
885−fromFRel' f =
945+ Relation (Normalize a) (Normalize b)
946+fromFRel = fromFRel'
947+
948+-- | Lifts a relation function to a Boolean Matrix
949+toRel ::
950+ forall a b.
951+ ( Bounded a,
952+ Bounded b,
953+ Enum a,
954+ Enum b,
955+ Eq b,
956+ CountableDims a b,
957+ FLN b a
958+ )
959+ => (a -> b -> Bool) -> Relation (Normalize a) (Normalize b)
960+toRel f =
886961 let minA = minBound @a
887962 maxA = maxBound @a
888963 minB = minBound @b
889964 maxB = maxBound @b
890− ccols = fromInteger $ natVal (Proxy :: Proxy (Count (Normalize a)))
891− rrows = fromInteger $ natVal (Proxy :: Proxy (Count (Normalize b)))
965+ ccols = fromInteger $ natVal (Proxy :: Proxy (Count a))
966+ rrows = fromInteger $ natVal (Proxy :: Proxy (Count b))
892967 elementsA = take ccols [minA .. maxA]
893968 elementsB = take rrows [minB .. maxB]
894969 combinations = (,) <$> elementsA <*> elementsB
895− combAp = map snd . sort . map (\(a, b) -> if f a == b
896− then ((fromEnum a, fromEnum b), nat 1)
970+ combAp = map snd . sort . map (\(a, b) -> if uncurry f (a, b)
971+ then ((fromEnum a, fromEnum b), nat 1)
897972 else ((fromEnum a, fromEnum b), nat 0)) $ combinations
898973 mList = buildList combAp rrows
899974 in tr $ fromLists mList