Merge pull request #60 from aavogt/master

small changes for compatibility with newer (to-be released) ghcs

4 files changed, 29 insertions, 9 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 255009c..7504b39 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -154,7 +154,7 @@ toLists m = splitEvery (cols m) . toList . flatten $ m
 fromRows :: Element t => [Vector t] -> Matrix t
 fromRows vs = case compatdim (map dim vs) of
     Nothing -> error "fromRows applied to [] or to vectors with different sizes"
-    Just c  -> reshape c . join . map (adapt c) $ vs
+    Just c  -> reshape c . Data.Packed.Internal.Vector.join . map (adapt c) $ vs
   where
     adapt c v | dim v == c = v
               | otherwise = constantD (v@>0) c
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 85e7f4f..c99f4f0 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -16,7 +16,7 @@
 module Data.Packed.Internal.Vector (
     Vector, dim,
     fromList, toList, (|>),
-    join, (@>), safe, at, at', subVector, takesV,
+    Data.Packed.Internal.Vector.join, (@>), safe, at, at', subVector, takesV,
     mapVector, mapVectorWithIndex, zipVectorWith, unzipVectorWith,
     mapVectorM, mapVectorM_, mapVectorWithIndexM, mapVectorWithIndexM_,
     foldVector, foldVectorG, foldLoop, foldVectorWithIndex,
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs
index d50dd36..dcb326c 100644
--- a/lib/Numeric/ContainerBoot.hs
+++ b/lib/Numeric/ContainerBoot.hs
@@ -510,20 +510,40 @@ type instance ElementOf (Matrix a) = a
 class Build f where
     build' :: BoundsOf f -> f -> ContainerOf f
 
-type family BoundsOf x
 
+#if MIN_VERSION_base(4,7,0)
+-- ghc >= 7.7 considers:
+--
+-- > a -> a
+-- > b -> b -> b
+--
+-- to overlap
+type family BoundsOf x where
+    BoundsOf (a -> a) = Int
+    BoundsOf (a->a->a) = (Int,Int)
+type family ContainerOf x where
+    ContainerOf (a->a) = Vector a
+    ContainerOf (a->a->a) = Matrix a
+#else
+type family BoundsOf x
+type family ContainerOf x
 type instance BoundsOf (a->a) = Int
 type instance BoundsOf (a->a->a) = (Int,Int)
-
-type family ContainerOf x
-
 type instance ContainerOf (a->a) = Vector a
 type instance ContainerOf (a->a->a) = Matrix a
+#endif
+
 
 instance (Element a, Num a) => Build (a->a) where
     build' = buildV
 
-instance (Element a, Num a) => Build (a->a->a) where
+instance (Element a,
+#if MIN_VERSION_base(4,7,0)
+        BoundsOf (a -> a -> a) ~ (Int,Int),
+        ContainerOf (a -> a -> a) ~ Matrix a,
+#endif
+        Num a)
+        => Build (a->a->a) where
     build' = buildM
 
 buildM (rc,cc) f = fromLists [ [f r c | c <- cs] | r <- rs ]
diff --git a/lib/Numeric/LinearAlgebra/Util.hs b/lib/Numeric/LinearAlgebra/Util.hs
index 39566ab..532556e 100644
--- a/lib/Numeric/LinearAlgebra/Util.hs
+++ b/lib/Numeric/LinearAlgebra/Util.hs
@@ -97,7 +97,7 @@ ones r c = konst 1 (r,c)
 -- | concatenation of real vectors
 infixl 3 &
 (&) :: Vector Double -> Vector Double -> Vector Double
-a & b = join [a,b]
+a & b = Numeric.Container.join [a,b]
 
 -- | horizontal concatenation of real matrices
 infixl 3 !
@@ -206,7 +206,7 @@ vec = flatten . trans
 
 vech :: Element t => Matrix t -> Vector t
 -- ^ half-vectorization (of the lower triangular part)
-vech m = join . zipWith f [0..] . toColumns $ m
+vech m = Numeric.Container.join . zipWith f [0..] . toColumns $ m
   where
     f k v = subVector k (dim v - k) v