Merge pull request #19 from McMasterU/monad_expression

Monad expression

Author: dandoh

ChangeLog.md

@@ -1,3 +1,11 @@
-# Changelog for HashedExpression
+# Changelog for HashedExpression & Symphony
+
+## 0.0.2
+- Several fixes and improvement
+- Symphony: 
+    - Automatically download all files needed for solving problem (solver & adapters & Makefile), no need to copy problem.c somewhere else.
+
+## 0.0.1 
+- First release
+
 
-## Unreleased changes

HashedExpression.cabal

@@ -4,16 +4,16 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 8cd28a087f508490f3891da8fc8a23620f27f29dc9d0598d42e970b328291f71
+-- hash: eaf4ab3bfac7ad56c9aef8bc27945e2ecd82eb46c34a86d17423d7b0aea60d07
 
 name:           HashedExpression
-version:        0.1.0.0
+version:        0.0.2
 description:    Please see the README on GitHub at <https://github.com/githubuser/HashedExpression#readme>
-homepage:       https://github.com/githubuser/HashedExpression#readme
-bug-reports:    https://github.com/githubuser/HashedExpression/issues
-author:         McMaster Start Coding
-maintainer:     example@example.com
-copyright:      2019 McMaster Start Coding
+homepage:       https://github.com/McMasterU/HashedExpression#readme
+bug-reports:    https://github.com/McMasterU/HashedExpression/issues
+author:         OCA & McMaster Start Coding
+maintainer:     anandc@mcmaster.ca
+copyright:      2019 OCA
 license:        BSD3
 license-file:   LICENSE
 build-type:     Simple
@@ -30,7 +30,7 @@ extra-source-files:
 
 source-repository head
   type: git
-  location: https://github.com/githubuser/HashedExpression
+  location: https://github.com/McMasterU/HashedExpression
 
 library
   exposed-modules:
@@ -46,13 +46,15 @@ library
       HashedExpression.Embed
       HashedExpression.Internal
       HashedExpression.Internal.Collision
+      HashedExpression.Internal.Context
       HashedExpression.Internal.Expression
       HashedExpression.Internal.Hash
       HashedExpression.Internal.Node
       HashedExpression.Internal.Normalize
       HashedExpression.Internal.OperationSpec
       HashedExpression.Internal.Pattern
       HashedExpression.Internal.Plot
+      HashedExpression.Internal.Rewrite
       HashedExpression.Internal.Structure
       HashedExpression.Internal.Utils
       HashedExpression.Interp

examples/Brain/.gitignore

@@ -1,4 +1,5 @@
 # Created by .ignore support plugin (hsz.mobi)
 !*.h5
 data.py
-genmask.py
+genmask.py
+brain

examples/Brain/Makefile

@@ -1,27 +1,5 @@
-CC = gcc
-
-CFLAGS  = -Wall -std=c11 -I./lib
-
-FAST_FLAGS  = -Wall -std=c11 -Ofast -I./lib
-
-LINK_LIBRARY = -lm -lfftw3 -lhdf5
-
-LBFGSB  = lib/lbfgsb.c lib/linesearch.c lib/subalgorithms.c lib/print.c
-
-LINPACK = lib/linpack.c
-
-BLAS 	= lib/miniCBLAS.c
-
-TIMER   = lib/timer.c
-
-SRC = $(LBFGSB) $(LINPACK) $(BLAS) $(TIMER)
-
-all: lbfgs-b.c problem.c $(SRC)
-	$(CC) -o lbfgs-b $(CFLAGS) lbfgs-b.c $(SRC) $(LINK_LIBRARY)
-
-fast: lbfgs-b.c problem.c $(SRC)
-	$(CC) -o lbfgs-b $(FAST_FLAGS) lbfgs-b.c $(SRC) $(LINK_LIBRARY)
-
-clean:
-	git clean -dfX
-
+all:
+	mkdir -p brain
+	symphony brain.sp -o brain
+	cp *.h5 brain
+	cd brain; make fast; ./lbfgs-b; python3 plot.py x

examples/Brain/Readme.md

@@ -16,8 +16,8 @@ constraints:
   x >= xLowerBound, x <= xUpperBound
 
 let:
-  smootherX = rotate (0, 1) x + rotate (0, -1) x - 2 *. x
-  smootherY = rotate (1, 0) x + rotate (-1, 0) x - 2 *. x
+  smootherX = rotate (0, 1) x - x
+  smootherY = rotate (1, 0) x - x
   regularization = norm2square smootherX + norm2square smootherY