Changeset 849

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.

Location:

plugins/base1/se.lu.thep.wenni/trunk

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/wenni_test.cc (modified) (3 diffs)

plugins/base1/se.lu.thep.wenni/trunk/configure.ac

@@ -82 +82 @@
               [ state="base2" ])
 
+AC_DEFINE_UNQUOTED([WeNNI_STATE], ["$state"], 
+                   [defined to configured state - base1, base2, or stand-alone])
 AM_CONDITIONAL([BASE1], [test x$state = xbase1])
 AM_CONDITIONAL([BASE2], [test x$state = xbase2])

plugins/base1/se.lu.thep.wenni/trunk/test/Makefile.am

@@ -28 +28 @@
 if BASE1
 CREATE_INDATA = run_base1_plugin
-else
-CREATE_INDATA = link_base_files
 endif
 
@@ -48 +46 @@
 
 run_base1_plugin: 
-  @(install -d raw_results && cd raw_results && ../wenni.pl --datatype raw \
+  @($(MKDIR_P) raw_results && cd raw_results && ../wenni.pl --datatype raw \
 --nodelete < ../$(top_srcdir)/data/basefile_in.data > basefile_out.data); 
-  @(install -d default_results && cd default_results && ../wenni.pl \
+  @($(MKDIR_P) default_results && cd default_results && ../wenni.pl \
 --nodelete < ../$(top_srcdir)/data/basefile_in.data > basefile_out.data); 
-
-link_base_files: 
-  rm -f raw_results && ln -fs $(top_srcdir)/data raw_results && \
-  rm -f default_results && ln -fs $(top_srcdir)/data default_results; 
 
 clean-local:; rm -rf $(LINKS) default_results raw_results \

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())) {