Merge branch 'devel'

.gitignore

 test_tmp*
 ackley_mc
 ackley_mc.exe
+

Makefile

 # Use the normal go build system for everything, but we want to automate some simple
 # commands.
+
 # The annoying syntax for debugging is,
 # dlv debug --build-flags -tags=no_gfx -- examples/example1
 .POSIX:
 
+GO=go
+GOFMT=gofmt
+
+# The lint target only makes sense for Andrew's setup.
 LINTER=~/go/bin/linux_amd64/golangci-lint
 
 all:
-	go build ./...
+	$(GO) build -o bin .
+	$(GO) build -o bin/ackley_nogfx  -tags no_gfx --  .
 
 test:
-	go test ./...
-	go test -tags no_gfx ./...
+	$(GO) test ./...
+	$(GO) test -tags no_gfx ./...
 
 gofmt:
-	gofmt -s -w .
+	$(GOFMT) -s -w .
 
 lint:
 	$(LINTER) run
 
 clean:
-	go clean
+	$(GO) clean
+	rm -rf bin/*
 	rm -rf */*_delme.*
 	rm -rf */test_tmp*
 	rm -rf /tmp/go-build[0-9]*

README_version

-I want to remove the adaptive step size code from the version used for teaching. I will keep the code in this version.
-It works, but the implementation is ugly and full of arbitrary numbers, like checking every n-hundred steps if we should do something.
+The code for adaptive step sizes in now in a separate branch. It has been removed since it was
+a. ugly
\ No newline at end of file
+b. complicated the code and the idea is to have a simple model solution.
\ No newline at end of file

main_gfx.go

@@ -5,8 +5,11 @@
 // Ackley_mc is for playing with Monte Carlo or simulated annealing on the
 // ackley function in N dimensions.
 //
-//    ackley_mc input_file
+//    ackley_mc [input_file]
 // where input_file has a list of keywords and values.
+// This is mostly the same as the version without graphics, but it does
+// not require a command line argument. It will open a graphics window
+// so you can type in values and play with it.
 
 package main