Merge pull request #93 from vsoch/master

removing analysis functions (are now served on expfactory-analysis)
expfactory · Mar 24, 2016 · bb856dc · bb856dc
2 parents a177d46 + 33166af
commit bb856dc
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 1,146 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/expfactory/analysis/__init__.py b/expfactory/analysis/__init__.py
diff --git a/expfactory/analysis/maths.py b/expfactory/analysis/maths.py
diff --git a/expfactory/analysis/stats.py b/expfactory/analysis/stats.py
diff --git a/expfactory/analysis/utils.py b/expfactory/analysis/utils.py
diff --git a/expfactory/templates/phaser.html b/expfactory/templates/phaser.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="UTF-8" />
+        <title>Experiment Factory Game</title>
+        {{css}}
+        {{js}}
+    </head>
+
+    <script type="text/javascript">
+
+    window.onload = function() {
+
+      {{run}}
+
+    }
+
+    </script>
+
+    <body>
+</html>
diff --git a/expfactory/testing/data/results/jsPsychData.json b/expfactory/testing/data/results/jsPsychData.json