updated hmatrix-morpheus example app

aligusnet · Aug 27, 2017 · eb62793 · eb62793
1 parent 1b94374
commit eb62793
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 13 deletions.
diff --git a/hmatrix-morpheus.cabal b/hmatrix-morpheus.cabal
@@ -107,15 +107,6 @@ benchmark hmatrix-morpheus-bench
   if os(OSX)
     extra-lib-dirs:    /usr/lib
 
-executable hmatrix-morpheus-example
-  hs-source-dirs:      hmatrix-morpheus/examples
-  main-is:             Main.hs
-  build-depends:       base
-                     , hmatrix-morpheus
-                     , hmatrix >= 0.17.0.1
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
-
 source-repository head
   type:     git
   location: https://github.com/alexander-ignatyev/morpheus
diff --git a/hmatrix-morpheus/examples/Main.hs b/hmatrix-morpheus/examples/Main.hs
@@ -14,7 +14,7 @@ a = matrix 5 [
 
 main :: IO ()
 main = do
-  putStrLn "Numeric.Morpheus.MatrixReduce functions: "
+  putStrLn "\nNumeric.Morpheus.MatrixReduce functions: "
 
   putStr "sum of elements of rows: "
   print $ rowSum a
@@ -29,7 +29,7 @@ main = do
   print $ snd $ columnMaxIndex a
 
 
-  putStrLn "Numeric.Morpheus.Activation functions: "
+  putStrLn "\n\nNumeric.Morpheus.Activation functions: "
 
   putStrLn "\nSigmoid:"
   disp 3 (sigmoid a)
@@ -39,3 +39,13 @@ main = do
 
   putStrLn "ReLu gradient:"
   disp 3 (reluGradient a)
+
+
+  putStrLn "\n\nNumeric.Morpheus.Statistics functions: "
+
+  putStrLn "\nColumn Means:"
+  let colmeans = columnMean a
+  print colmeans
+
+  putStrLn "Column Standard Deviations: "
+  print (columnStddev_m colmeans a)
diff --git a/hmatrix-morpheus/examples/Setup.hs b/hmatrix-morpheus/examples/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/hmatrix-morpheus/examples/hmatrix-morpheus-example.cabal b/hmatrix-morpheus/examples/hmatrix-morpheus-example.cabal
@@ -0,0 +1,25 @@
+name:                hmatrix-morpheus-example
+version:             0.1.0.0
+synopsis:            hmatrix-morpheus examples
+homepage:            https://github.com/Alexander-Ignatyev/morpheus/tree/master/hmatrix-morpheus/examples
+license:             BSD3
+author:              Alexander Ignatyev
+maintainer:          ignatyev.alexander@gmail.com
+copyright:           Alexander Ignatyev
+category:            math
+build-type:          Simple
+cabal-version:       >=1.10
+
+
+executable hmatrix-morpheus-example
+  hs-source-dirs:      .
+  main-is:             Main.hs
+  build-depends:       base
+                     , hmatrix-morpheus
+                     , hmatrix >= 0.17.0.1
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  default-language:    Haskell2010
+
+source-repository head
+  type:     git
+  location: https://github.com/alexander-ignatyev/morpheus
diff --git a/hmatrix-morpheus/examples/stack.yaml b/hmatrix-morpheus/examples/stack.yaml
@@ -0,0 +1,8 @@
+resolver: lts-8.20
+packages:
+- '.'
+- '../..'
+extra-deps: []
+flags: {}
+extra-package-dbs: []
+extra-lib-dirs: [/usr/lib]
diff --git a/hmatrix-morpheus/src/Numeric/Morpheus.hs b/hmatrix-morpheus/src/Numeric/Morpheus.hs
@@ -43,7 +43,7 @@ a = matrix 5 [
 
 main :: IO ()
 main = do
-  putStrLn "Numeric.Morpheus.MatrixReduce functions: "
+  putStrLn "\nNumeric.Morpheus.MatrixReduce functions: "
 
   putStr "sum of elements of rows: "
   print $ rowSum a
@@ -58,7 +58,7 @@ main = do
   print $ snd $ columnMaxIndex a
 
 
-  putStrLn "Numeric.Morpheus.Activation functions: "
+  putStrLn "\n\nNumeric.Morpheus.Activation functions: "
 
   putStrLn "\nSigmoid:"
   disp 3 (sigmoid a)
@@ -68,16 +68,28 @@ main = do
 
   putStrLn "ReLu gradient:"
   disp 3 (reluGradient a)
+
+
+  putStrLn "\n\nNumeric.Morpheus.Statistics functions: "
+
+  putStrLn "\nColumn Means:"
+  let colmeans = columnMean a
+  print colmeans
+
+  putStrLn "Column Standard Deviations: "
+  print (columnStddev_m colmeans a)
 @
 -}
 
 module Numeric.Morpheus
 (
   module Numeric.Morpheus.Activation
   , module Numeric.Morpheus.MatrixReduce
+  , module Numeric.Morpheus.Statistics
 )
 
 where
 
 import Numeric.Morpheus.Activation
 import Numeric.Morpheus.MatrixReduce
+import Numeric.Morpheus.Statistics