From 084e87f7279463b0171505cb8ec25f977ffcfe85 Mon Sep 17 00:00:00 2001
From: Alberto Ruiz <aruiz@um.es>
Date: Tue, 10 Jun 2014 18:43:16 +0200
Subject: minor fixes

---
 packages/Makefile                                   | 3 +++
 packages/base/CHANGELOG                             | 2 ++
 packages/base/src/Numeric/HMatrix.hs                | 6 +++---
 packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs | 2 +-
 packages/tests/src/Numeric/LinearAlgebra/Tests.hs   | 4 ++--
 5 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/Makefile b/packages/Makefile
index 648c726..9f7a422 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -6,4 +6,7 @@ all:
 	    cd $$p; cabal install --force-reinstall --enable-documentation ; cd -; \
 	  fi; \
 	done
+	cd sparse; \
+	cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) \
+                  --force-reinstall --enable-documentation ; cd -;
 
diff --git a/packages/base/CHANGELOG b/packages/base/CHANGELOG
index a91719d..6b63de8 100644
--- a/packages/base/CHANGELOG
+++ b/packages/base/CHANGELOG
@@ -28,6 +28,8 @@
     * "dot" now conjugates the first input vector.
 
     * Added "udot" (unconjugated dot product).
+    
+    * Added "sortVector"
 
     * Added Monoid instance for Matrix using matrix product.
 
diff --git a/packages/base/src/Numeric/HMatrix.hs b/packages/base/src/Numeric/HMatrix.hs
index 34f4346..1b6c1ea 100644
--- a/packages/base/src/Numeric/HMatrix.hs
+++ b/packages/base/src/Numeric/HMatrix.hs
@@ -27,7 +27,7 @@ Experimental interface with statically checked dimensions.
 
 module Numeric.HMatrix(
     -- * Vector
-    R,
+    ℝ, R,
     vec2, vec3, vec4, (&), (#), split, headTail,
     vector,
     linspace, range, dim,
@@ -35,7 +35,7 @@ module Numeric.HMatrix(
     L, Sq, build,
     row, col, (¦),(——), splitRows, splitCols,
     unrow, uncol,
-
+    tr,
     eye,
     diag,
     blockAt,
@@ -76,7 +76,7 @@ ud1 (R (Dim v)) = v
 
 
 infixl 4 &
-(&) :: forall n . KnownNat n
+(&) :: forall n . (KnownNat n, 1 <= n)
     => R n -> ℝ -> R (n+1)
 u & x = u # (konst x :: R 1)
 
diff --git a/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs b/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs
index d098535..8608394 100644
--- a/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs
+++ b/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs
@@ -11,7 +11,7 @@ import Foreign.C.Types(CInt(..))
 import Numeric.LinearAlgebra.Devel
 import System.IO.Unsafe(unsafePerformIO)
 import Foreign(Ptr)
-import Numeric.HMatrix
+import Numeric.LinearAlgebra.HMatrix
 import Text.Printf
 import Numeric.LinearAlgebra.Util((~!~))
 
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index cd88a24..ee57cbc 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -27,8 +27,8 @@ module Numeric.LinearAlgebra.Tests(
 ) where
 
 import Numeric.LinearAlgebra
-import Numeric.HMatrix hiding ((<>),linearSolve)
-import Numeric.LinearAlgebra.Real(L)
+import Numeric.LinearAlgebra.HMatrix hiding ((<>),linearSolve)
+import Numeric.HMatrix(L)
 import Numeric.LinearAlgebra.Util(col,row)
 import Data.Packed
 import Numeric.LinearAlgebra.LAPACK
-- 
cgit v1.2.3