Changeset 849
- Timestamp:
- Dec 1, 2008, 10:01:33 PM (14 years ago)
- Location:
- plugins/base1/se.lu.thep.wenni/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
plugins/base1/se.lu.thep.wenni/trunk/configure.ac
r848 r849 82 82 [ state="base2" ]) 83 83 84 AC_DEFINE_UNQUOTED([WeNNI_STATE], ["$state"], 85 [defined to configured state - base1, base2, or stand-alone]) 84 86 AM_CONDITIONAL([BASE1], [test x$state = xbase1]) 85 87 AM_CONDITIONAL([BASE2], [test x$state = xbase2]) -
plugins/base1/se.lu.thep.wenni/trunk/test/Makefile.am
r836 r849 28 28 if BASE1 29 29 CREATE_INDATA = run_base1_plugin 30 else31 CREATE_INDATA = link_base_files32 30 endif 33 31 … … 48 46 49 47 run_base1_plugin: 50 @( install -draw_results && cd raw_results && ../wenni.pl --datatype raw \48 @($(MKDIR_P) raw_results && cd raw_results && ../wenni.pl --datatype raw \ 51 49 --nodelete < ../$(top_srcdir)/data/basefile_in.data > basefile_out.data); 52 @( install -ddefault_results && cd default_results && ../wenni.pl \50 @($(MKDIR_P) default_results && cd default_results && ../wenni.pl \ 53 51 --nodelete < ../$(top_srcdir)/data/basefile_in.data > basefile_out.data); 54 55 link_base_files:56 rm -f raw_results && ln -fs $(top_srcdir)/data raw_results && \57 rm -f default_results && ln -fs $(top_srcdir)/data default_results;58 52 59 53 clean-local:; rm -rf $(LINKS) default_results raw_results \ -
plugins/base1/se.lu.thep.wenni/trunk/test/wenni_test.cc
r846 r849 21 21 along with WeNNI. If not, see <http://www.gnu.org/licenses/>. 22 22 */ 23 24 #include <config.h> 23 25 24 26 #include "c++_tools/gslapi/matrix.h" … … 47 49 bool teststatus=false; 48 50 49 teststatus|=check_raw_results(); 50 teststatus|=check_default_results(); 51 if (WeNNI_STATE == "base1") { 52 teststatus|=check_raw_results(); 53 teststatus|=check_default_results(); 54 } 51 55 52 56 std::string srcdir=get_srcdir(); 53 57 std::stringstream system_call; 54 system_call << "./nni -data default_results/wenni_logratio.data"58 system_call << "./nni -data " << srcdir << "/../data/wenni_logratio.data" 55 59 << " -neighbours 10 -weight " << srcdir 56 60 << "/../data/wenni_snr.data -weight_is_snr" … … 63 67 64 68 system_call.str(""); 65 system_call << "./nni -data default_results/wenni_logratio.data -neighbours 10" 66 << " -nni_algorithm kNNI -weight default_results/wenni_weight.data" 69 system_call << "./nni -data " << srcdir 70 << "/../data/wenni_logratio.data -neighbours 10" 71 << " -nni_algorithm kNNI -weight " << srcdir 72 << "/../data/wenni_weight.data" 67 73 << " -weight_cutoff 0.5 > knni_imputed.data"; 68 74 if (system(system_call.str().c_str())) {
Note: See TracChangeset
for help on using the changeset viewer.