Improved field tests. Fixes #21.

Author: StuntsPT

tests/fastStructure_field_test.sh

@@ -19,12 +19,13 @@ set -e
 
 LightGreen='\033[1;32m'
 NoColor='\033[0m'
+
 echo "Runnig fastStructure 'field test'. This will simulate a full wrapped run on small test data."
 
 git_dir=`pwd`
 str_bin=`which fastStructure`
 
-tar xvfJ ${git_dir}/PTS/data/BigTestData.str.tar.xz -C ${git_dir}/PTS/data/
-~/virtualenv/python3.5/bin/structure_threader -i ${git_dir}/PTS/data/BigTestData.str -o ~/results_fs -fs ${str_bin} -K 4 -t 4
+tar xvfJ ${git_dir}/tests/smalldata/BigTestData.str.tar.xz -C ${git_dir}/tests/smalldata/
+~/virtualenv/python3.5/bin/structure_threader -i ${git_dir}/tests/smalldata/BigTestData.str -o ~/results_fs -fs ${str_bin} -K 4 -t 4
 
 echo -e "${LightGreen}fastStructure 'Field test' ran successfully. Yay!${NoColor}"

tests/smalldata/BigTestData.str.tar.xz

@@ -0,0 +1 @@
+../../PTS/data/BigTestData.str.tar.xz

tests/smalldata/Reduced_dataset.structure

@@ -0,0 +1 @@
+../../PTS/data/Reduced_dataset.structure

tests/smalldata/extraparams

@@ -0,0 +1 @@
+../../PTS/data/extraparams

tests/smalldata/mainparams

@@ -0,0 +1 @@
+../../PTS/data/mainparams

tests/structure_field_test.sh

@@ -19,11 +19,12 @@ set -e
 
 LightGreen='\033[1;32m'
 NoColor='\033[0m'
+
 echo "Runnig STRUCTURE 'field test'. This will simulate a full wrapped run on small test data."
 
 git_dir=`pwd`
 str_bin=`which structure`
 
-~/virtualenv/python3.5/bin/structure_threader -i ${git_dir}/PTS/data/Reduced_dataset.structure -o ~/results -st ${str_bin} -K 3 -t 4 -R 5
+~/virtualenv/python3.5/bin/structure_threader -i ${git_dir}/tests/smalldata/Reduced_dataset.structure -o ~/results -st ${str_bin} -K 3 -t 4 -R 5
 
 echo -e "${LightGreen}STRUCTURE 'Field test' ran successfully. Yay!${NoColor}"