diff options
author | Alberto Ruiz <aruiz@um.es> | 2015-01-14 08:48:50 +0100 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2015-01-14 08:48:50 +0100 |
commit | a194062a082230ca00cc4991407cc4c926d4b810 (patch) | |
tree | 963017c136b44a1cc1fe98f0a317607ef29e6b51 | |
parent | fd4ea99b3fdbd3451b3ece61fd554e6f01801e29 (diff) | |
parent | 480d5327d9ab8134eea1173baa1c40e689bcd056 (diff) |
Merge pull request #107 from bgamari/master
GHC 7.10 fixes
-rw-r--r-- | packages/base/src/Numeric/Chain.hs | 2 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Static.hs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/base/src/Numeric/Chain.hs b/packages/base/src/Numeric/Chain.hs index 4c497f0..443bd28 100644 --- a/packages/base/src/Numeric/Chain.hs +++ b/packages/base/src/Numeric/Chain.hs | |||
@@ -12,6 +12,8 @@ | |||
12 | -- | 12 | -- |
13 | ----------------------------------------------------------------------------- | 13 | ----------------------------------------------------------------------------- |
14 | 14 | ||
15 | {-# LANGUAGE FlexibleContexts #-} | ||
16 | |||
15 | module Numeric.Chain ( | 17 | module Numeric.Chain ( |
16 | optimiseMult, | 18 | optimiseMult, |
17 | ) where | 19 | ) where |
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs index cc5eb4f..037396d 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Static.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs | |||
@@ -184,8 +184,8 @@ a ¦ b = tr (tr a —— tr b) | |||
184 | type Sq n = L n n | 184 | type Sq n = L n n |
185 | --type CSq n = CL n n | 185 | --type CSq n = CL n n |
186 | 186 | ||
187 | type GL = (KnownNat n, KnownNat m) => L m n | 187 | type GL = forall n m. (KnownNat n, KnownNat m) => L m n |
188 | type GSq = KnownNat n => Sq n | 188 | type GSq = forall n. KnownNat n => Sq n |
189 | 189 | ||
190 | isKonst :: forall m n . (KnownNat m, KnownNat n) => L m n -> Maybe (ℝ,(Int,Int)) | 190 | isKonst :: forall m n . (KnownNat m, KnownNat n) => L m n -> Maybe (ℝ,(Int,Int)) |
191 | isKonst s@(unwrap -> x) | 191 | isKonst s@(unwrap -> x) |