summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2015-04-15 09:15:54 +0200
committerAlberto Ruiz <aruiz@um.es>2015-04-15 09:15:54 +0200
commit12deeb5550d31042816b43e95f7d5678a706c32e (patch)
tree7c21b8de36095a8e15973e2eff724d4771a06521
parent3aa140213de434ab6ee6736142fd54c967f34ee9 (diff)
minor changes
-rw-r--r--packages/Makefile29
-rw-r--r--packages/tests/src/Numeric/LinearAlgebra/Tests.hs6
2 files changed, 15 insertions, 20 deletions
diff --git a/packages/Makefile b/packages/Makefile
index e9d8586..547cf51 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,22 +1,17 @@
1pkgs=base gsl special glpk tests ../../hTensor ../../easyVision/packages/base 1pkgs=base gsl special glpk tests ../../hTensor ../../easyVision/packages/tools ../../easyVision/packages/base
2
3cabalcmd = \
4 for p in $(1); do \
5 if [ -e $$p ]; then \
6 cd $$p; cabal $(2) ; cd -; \
7 fi; \
8 done \
9 cd sparse; \
10 cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) $(2); cd -;
2 11
3all: 12all:
4 for p in $(pkgs); do \ 13 $(call cabalcmd, $(pkgs), install --force-reinstall --enable-documentation)
5 if [ -e $$p ]; then \
6 cd $$p; cabal install --force-reinstall --enable-documentation ; cd -; \
7 fi; \
8 done
9 cd sparse; \
10 cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) \
11 --force-reinstall --enable-documentation ; cd -;
12 14
13fast: 15fast:
14 for p in $(pkgs); do \ 16 $(call cabalcmd, $(pkgs), install --force-reinstall)
15 if [ -e $$p ]; then \
16 cd $$p; cabal install --force-reinstall ; cd -; \
17 fi; \
18 done
19 cd sparse; \
20 cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) \
21 --force-reinstall; cd -;
22 17
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index a25f4cb..cf0f581 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -216,7 +216,7 @@ normsMTest = TestList [
216 ] where v = (2><2) [1,-2*iC,3:+4,7] :: Matrix (Complex Double) 216 ] where v = (2><2) [1,-2*iC,3:+4,7] :: Matrix (Complex Double)
217 x = (2><2) [1,2,-3,5] :: Matrix Double 217 x = (2><2) [1,2,-3,5] :: Matrix Double
218 a =~= b = fromList [a] :~10~: fromList [b] 218 a =~= b = fromList [a] :~10~: fromList [b]
219 a =~~= b = fromList [a] :~5~: fromList [b] 219-- a =~~= b = fromList [a] :~5~: fromList [b]
220 220
221--------------------------------------------------------------------- 221---------------------------------------------------------------------
222 222
@@ -592,8 +592,8 @@ runTests n = do
592 592
593 593
594-- single precision approximate equality 594-- single precision approximate equality
595infixl 4 |~~| 595-- infixl 4 |~~|
596a |~~| b = a :~6~: b 596-- a |~~| b = a :~6~: b
597 597
598makeUnitary v | realPart n > 1 = v / scalar n 598makeUnitary v | realPart n > 1 = v / scalar n
599 | otherwise = v 599 | otherwise = v