Changeset 849 for plugins/base1/se.lu.thep.wenni/trunk/test/wenni_test.cc

Timestamp:

Dec 1, 2008, 10:01:33 PM (14 years ago)

Author:

Peter Johansson

Message:

defining state variable in config.h and when not in base1 mode slice out tests in wenni_test that are base1 specific.

File:

• plugins/base1/se.lu.thep.wenni/trunk/test/wenni_test.cc (modified) (3 diffs)

plugins/base1/se.lu.thep.wenni/trunk/test/wenni_test.cc

@@ -21 +21 @@
   along with WeNNI. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <config.h>
 
 #include "c++_tools/gslapi/matrix.h"
@@ -47 +49 @@
   bool teststatus=false;
 
-  teststatus|=check_raw_results();
-  teststatus|=check_default_results();
+  if (WeNNI_STATE == "base1") {
+    teststatus|=check_raw_results();
+    teststatus|=check_default_results();
+  }
 
   std::string srcdir=get_srcdir();
   std::stringstream system_call;
-  system_call << "./nni -data default_results/wenni_logratio.data"
+  system_call << "./nni -data " << srcdir << "/../data/wenni_logratio.data"
               << " -neighbours 10 -weight " << srcdir 
               << "/../data/wenni_snr.data -weight_is_snr"
@@ -63 +67 @@
 
   system_call.str("");
-  system_call << "./nni -data default_results/wenni_logratio.data -neighbours 10"
-              << " -nni_algorithm kNNI -weight default_results/wenni_weight.data"
+  system_call << "./nni -data " << srcdir 
+              << "/../data/wenni_logratio.data -neighbours 10"
+              << " -nni_algorithm kNNI -weight " << srcdir 
+              << "/../data/wenni_weight.data"
               << " -weight_cutoff 0.5 > knni_imputed.data";
   if (system(system_call.str().c_str())) {