[mlpack-svn] r15510 - mlpack/conf/jenkins-conf/benchmark/methods/matlab

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: marcus
Date: Fri Jul 19 15:02:21 2013
New Revision: 15510

Log:
Use the right input file.

Modified:
   mlpack/conf/jenkins-conf/benchmark/methods/matlab/HMM_VITERBI.m
   mlpack/conf/jenkins-conf/benchmark/methods/matlab/hmm_viterbi.py

Modified: mlpack/conf/jenkins-conf/benchmark/methods/matlab/HMM_VITERBI.m
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/matlab/HMM_VITERBI.m	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/matlab/HMM_VITERBI.m	Fri Jul 19 15:02:21 2013
@@ -14,7 +14,7 @@
 
 
 % Load observations file.
-observationFile = regexp(cmd, '.*?-t ([^\s]+)', 'tokens', 'once');
+observationFile = regexp(cmd, '.*?-i ([^\s]+)', 'tokens', 'once');
 observationData = csvread(observationFile{:});
 
 % Load trans and emis values.

Modified: mlpack/conf/jenkins-conf/benchmark/methods/matlab/hmm_viterbi.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/matlab/hmm_viterbi.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/matlab/hmm_viterbi.py	Fri Jul 19 15:02:21 2013
@@ -100,8 +100,7 @@
         fidTrans.write(m)
       fidTrans.close()
 
-    inputCmd = "-i " + self.dataset[0] + " -e emis_tmp.csv -t trans_tmp.csv " 
-        + options
+    inputCmd = "-i " + self.dataset[0] + " -e emis_tmp.csv -t trans_tmp.csv " + options
     # Split the command using shell-like syntax.
     cmd = shlex.split(self.path + "matlab -nodisplay -nosplash -r \"try, " +
       "HMM_VITERBI('"  + inputCmd + "'), catch, exit(1), end, exit(0)\"")