Move strategy tests to a new directory, and add an astyle precommit hook.

Author: kristomu

CMakeLists.txt

@@ -146,7 +146,7 @@ add_library(quadelect_lib src/tools/tools.cc
 	src/bandit/bandit.cc
 	src/bandit/binomial.cc
 	src/bandit/lilucb.cc
-	src/main/strat_test.cc
+	src/tests/strategies.cc
 	src/modes/breg.cc
 	src/images/color/color.cc
 	src/modes/yee.cc

astyle.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # Java brace style, C/C++ code, forced tab indentation, 75 character
 # lines, indent (not align) after parens, align references to middle,
 # put braces around one-liners, indent classes and case switches,

hooks/README.md

@@ -0,0 +1,5 @@
+This directory contains the pre-commit hook that runs Artistic Style before
+committing new code, to enforce a (mostly) uniform code standard.
+
+Use the `./init_hook.sh` command from the repo root to install the hook into
+.git/hooks.

hooks/pre-commit

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Most of this code is from
+# https://github.com/mellowcandle/astyle_precommit_hook/blob/master/pre-commit
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+files=$(git diff-index --diff-filter=ACMR --name-only -r --cached $against -- | grep -i '\.c$\|\.cc$\|\.cpp$\|\.hpp$\|\.h$')
+for file in $files; do
+    x=`echo $file`
+    if test "x$x" != "x"; then
+	    ./astyle.sh $file
+	    git add $file
+    fi
+done

init_hook.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo Setting up pre-commit hook...
+
+cd .git/hooks/
+ln -s ../../hooks/pre-commit ./pre-commit

src/main/test_brute_properties.cc

@@ -31,7 +31,7 @@
 
 #include "../random/random.h"
 
-#include "strat_test.h"
+#include "../tests/strategies.h"
 
 int main(int argc, const char ** argv) {
 	if (argc < 2) {

src/main/test_strategy_brute_bandit.cc

@@ -66,7 +66,7 @@
 
 #include "../bandit/tests/reverse.h"
 
-#include "strat_test.h"
+#include "../tests/strategies.h"
 
 // Testing JGA's "strategic manipulation possible" concept. Perhaps it should
 // be put into ttetest instead. "A method is vulnerable to burial if, when X

src/main/test_strategy_brute_detail.cc

@@ -60,7 +60,7 @@
 
 #include "../singlewinner/young.h"
 
-#include "strat_test.h"
+#include "../tests/strategies.h"
 
 // default values for number of processors and current processor
 // use -I compiler options to get multiproc support. TODO: make this an

src/main/test_strategy_fixed.cc

@@ -60,7 +60,7 @@
 #include "../bandit/bandit.h"
 #include "../bandit/lilucb.h"
 
-#include "strat_test.h"
+#include "../tests/strategies.h"
 
 // default values for number of processors and current processor
 // use -I compiler options to get multiproc support. TODO: make this an

src/main/test_strategy_linbrute_bandit.cc

@@ -64,7 +64,7 @@
 
 #include "../bandit/tests/reverse.h"
 
-#include "strat_test.h"
+#include "../tests/strategies.h"
 
 // Testing JGA's "strategic manipulation possible" concept. Perhaps it should
 // be put into ttetest instead. "A method is vulnerable to burial if, when X