Merge pull request #72 from corywalker/fix_install

Attempt at fixing install.
corywalker · Jul 26, 2017 · 729156a · 729156a
2 parents a2cab65 + f45e9af
commit 729156a
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,13 +7,5 @@ go:
 
 go_import_path: github.com/corywalker/expreduce
 
-install:
-  - go get -d ./...
-  - go get golang.org/x/tools/cmd/goyacc
-  - go get github.com/cznic/golex
-  - go get -u github.com/jteeuwen/go-bindata/...
-  - go generate ./...
-  - go get ./...
-
 script:
   - go test -v ./...
diff --git a/example/complicated.txt b/example/complicated.txt
diff --git a/example/log_transformation.txt b/example/log_transformation.txt
diff --git a/example/test.sh b/example/test.sh
diff --git a/example/.gitignore → examples/.gitignore b/example/.gitignore → examples/.gitignore
diff --git a/example/scripts/example.m → examples/example.m b/example/scripts/example.m → examples/example.m
diff --git a/example/scripts/linreg.m → examples/linreg.m b/example/scripts/linreg.m → examples/linreg.m
diff --git a/example/simplification.txt → examples/simplification.txt b/example/simplification.txt → examples/simplification.txt
@@ -1,3 +1,5 @@
+CAUTION: may be outdated
+
 a + 2*b + 5*b /. (c1_Integer*matcha_Symbol) + (c2_Integer*matcha_Symbol) -> (c1+c2)*matcha
 a + b * b /. matcha_Symbol * matcha_Symbol -> matcha^2
 a + b - b /. matcha_ - matcha_ -> 0

diff --git a/example/calc.go → expreduce.go b/example/calc.go → expreduce.go
@@ -72,7 +72,8 @@ func main() {
 			}
 			wasSpecialForm := false
 			for _, specialForm := range specialForms {
-				asSpecialForm, isSpecialForm := expreduce.HeadAssertion(res, specialForm)
+				asSpecialForm, isSpecialForm := expreduce.HeadAssertion(
+					res, specialForm)
 				if !isSpecialForm {
 					continue
 				}
@@ -83,12 +84,14 @@ func main() {
 					"Out[%d]//%s= %s\n\n",
 					promptNum,
 					specialForm[7:],
-					asSpecialForm.Parts[1].StringForm(specialForm[7:], context, contextPath),
+					asSpecialForm.Parts[1].StringForm(
+						specialForm[7:], context, contextPath),
 				)
 				wasSpecialForm = true
 			}
 			if !wasSpecialForm {
-				fmt.Printf("Out[%d]= %s\n\n", promptNum, res.StringForm("InputForm", context, contextPath))
+				fmt.Printf("Out[%d]= %s\n\n", promptNum, res.StringForm(
+					"InputForm", context, contextPath))
 			}
 		}
 

diff --git a/example/factorout/factorout.go → utils/factorout/factorout.go b/example/factorout/factorout.go → utils/factorout/factorout.go