Merge pull request #3 from DataHaskell/hmatrix-add

hmatrix add

Author: tonyday567

Diff for: .travis.yml

@@ -33,31 +33,31 @@ matrix:
   # https://github.com/hvr/multi-ghc-travis
   - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
     compiler: ": #GHC 7.10.3"
-    addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+    addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7,libblas-dev, liblapack-dev, g++-4.8], sources: [hvr-ghc, ubuntu-toolchain-r-test]}}
   - env: BUILD=cabal GHCVER=8.0.1 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
     compiler: ": #GHC 8.0.1"
-    addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+    addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,happy-1.19.5,alex-3.1.7,libblas-dev, liblapack-dev, g++-4.8], sources: [hvr-ghc, ubuntu-toolchain-r-test]}}
 
   # Build with the newest GHC and cabal-install. This is an accepted failure,
   # see below.
   - env: BUILD=cabal GHCVER=head  CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
     compiler: ": #GHC HEAD"
-    addons: {apt: {packages: [cabal-install-head,ghc-head,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+    addons: {apt: {packages: [cabal-install-head,ghc-head,happy-1.19.5,alex-3.1.7,libblas-dev, liblapack-dev, g++-4.8], sources: [hvr-ghc, ubuntu-toolchain-r-test]}}
 
   # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
   # variable, such as using --stack-yaml to point to a different file.
   - env: BUILD=stack ARGS="--resolver lts-6"
     compiler: ": #stack 7.10.3"
-    addons: {apt: {packages: [libgmp-dev]}}
+    addons: {apt: {packages: [libgmp-dev, libblas-dev, liblapack-dev, g++-4.8], sources: [ubuntu-toolchain-r-test]}}
 
   - env: BUILD=stack ARGS="--resolver lts-7"
     compiler: ": #stack 8.0.1"
-    addons: {apt: {packages: [libgmp-dev]}}
+    addons: {apt: {packages: [libgmp-dev, libblas-dev, liblapack-dev, g++-4.8], sources: [ubuntu-toolchain-r-test]}}
 
   # Nightly builds are allowed to fail
   - env: BUILD=stack ARGS="--resolver nightly"
     compiler: ": #stack nightly"
-    addons: {apt: {packages: [libgmp-dev]}}
+    addons: {apt: {packages: [libgmp-dev, libblas-dev, liblapack-dev, g++-4.8], sources: [ubuntu-toolchain-r-test]}}
 
   # Build on macOS in addition to Linux
   - env: BUILD=stack ARGS="--resolver lts-7"
@@ -146,4 +146,4 @@ script:
       done
       ;;
   esac
-  set +ex
+  set +ex

Diff for: data-haskell-examples.cabal

@@ -87,7 +87,8 @@ executable data-haskell-examples
     base >= 4.7 && < 5,
     protolude,
     data-haskell-examples,
-    vector
+    vector,
+    hmatrix
   default-extensions:
     NoImplicitPrelude,
     UnicodeSyntax,

Diff for: examples/examples.hs

@@ -1,5 +1,6 @@
 import Protolude
 import Data.Vector as V
+import Numeric.LinearAlgebra as H
 
 main :: IO ()
 main = do
@@ -10,7 +11,7 @@ main = do
     print $ V.null x -- False
 
     -- indexing
-    print $ x ! 1 -- 1
+    print $ x V.! 1 -- 1
     print $ V.head x -- 0
     print $ last x -- 5
 
@@ -29,3 +30,35 @@ main = do
     -- Update
     print $ x // [(0, 1), (2, 6)] -- [1, 1, 6, 3, 4, 5]
     print $ V.map (+2) x -- [2, 3, 4, 5, 6, 7]
+
+    -- hmatrix examples
+    -- Creating matrices
+    let x = (2><2) [0..3] :: Matrix Double
+
+    -- [ 0.0, 1.0
+    -- , 2.0, 3.0 ]
+    let y = fromLists [[0, 1], [2, 3]] :: Matrix Double
+
+    -- Random matrices
+    r <- randn 2 3
+    -- [ 0.7764496757867578,    1.246311658930589,    -0.684233085372455
+    -- , -2.540045307941425, -0.20975584071908912, -9.039537343065803e-3 ]
+
+    -- Matrix multiplication
+    print $ x H.<> y -- [ 2.0,  3.0 
+                   -- , 6.0, 11.0 ]
+
+    -- Transpose
+    print $ tr x -- [ 0.0, 2.0 
+                 -- , 1.0, 3.0 ]
+
+    -- Matrix slicing
+    print $ r ?? (H.All, Take 2) -- [ 0.7764496757867578,    1.246311658930589
+                               -- , -2.540045307941425, -0.20975584071908912 ]
+
+    -- Mapping over matrices
+    print $ cmap ((+ 2) . (*2)) x -- [ 2.0, 4.0
+                                  -- , 6.0, 8.0 ]
+
+    -- Flatten
+    print $ flatten x -- [0.0, 1.0, 2.0, 3.0]

Diff for: readme.md

@@ -21,40 +21,9 @@ libraries
 
 [vector](http://www.datahaskell.org/docs/library/vector.html) is an efficient implementation of Int-indexed arrays (both mutable and immutable), with a powerful loop optimisation framework.
 
+[hmatrix](http://www.datahaskell.org/docs/library/hmatrix.html) is a linear algebra and matrix library, using the Data.Vector.Storable instance in the vector package under the hood.
 
 examples
 ---
 
-``` {.sourceCode .literate .haskell}
-import Protolude
-import Data.Vector as V
-
-main :: IO ()
-main = do
-    -- vector examples
-    let x = V.fromList [0..5]
-
-    print $ V.length x -- 6
-    print $ V.null x -- False
-
-    -- indexing
-    print $ x ! 1 -- 1
-    print $ V.head x -- 0
-    print $ last x -- 5
-
-    -- Slicing
-    print $ slice 2 3 x -- [2, 3, 4]
-    print $ V.splitAt 2 x -- ([0, 1], [2, 3, 4, 5])
-
-    -- Prepending and Appending
-    print $ cons (-1) x -- [-1, 0, 1, 2, 3, 4, 5]
-    print $ snoc x 6 -- [0, 1, 2, 3, 4, 5, 6]
-
-    -- Concatenation
-    print $ x V.++ x -- [0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5]
-    print $ V.concat [x, x] -- [0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5]
-
-    -- Update
-    print $ x // [(0, 1), (2, 6)] -- [1, 1, 6, 3, 4, 5]
-    print $ V.map (+2) x -- [2, 3, 4, 5, 6, 7]
-```
+See [examples.hs](examples/examples.hs)