SGVectorize dynprog function

shogun-toolbox · Aug 31, 2011 · 6823fdb · 6823fdb
1 parent 8e2b540
commit 6823fdb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/src/Makefile.template b/src/Makefile.template
@@ -7,7 +7,7 @@
 SRCDIR = .
 
 ifeq (../.config,$(wildcard ../.config))
-CONFIGPATH = ./
+CONFIGPATH = ../
 all: build
 include ../.config
 ifeq (../.config-local,$(wildcard ../.config-local))

diff --git a/src/shogun/structure/DynProg.cpp b/src/shogun/structure/DynProg.cpp
@@ -850,19 +850,14 @@ void CDynProg::get_scores(float64_t **scores, int32_t *m)
    memcpy(*scores,m_scores.get_array(), sizeof(float64_t)*(*m));
 }
 
-void CDynProg::get_states(int32_t **states, int32_t *m, int32_t *n) 
+SGMatrix<int32_t> CDynProg::get_states()
 {
-   ASSERT(states && m && n);
+	SGMatrix<int32_t> states(m_states.get_dim1(), m_states.get_dim2());
 
-	*m=m_states.get_dim1() ;
-	*n=m_states.get_dim2() ;
+	int32_t sz = sizeof(int32_t)*( m_states.get_dim1() * m_states.get_dim2() );
+	memcpy(states.matrix ,m_states.get_array(),sz);
 
-
-   *states = SG_MALLOC(int32_t, (*m) * (*n));
-   ASSERT(*states);
-
-   int32_t sz = sizeof(int32_t)*( (*m) * (*n) );
-   memcpy(*states,m_states.get_array(),sz);
+	return states;
 }
 
 void CDynProg::get_positions(int32_t **positions, int32_t *m, int32_t *n)

diff --git a/src/shogun/structure/DynProg.h b/src/shogun/structure/DynProg.h
@@ -254,11 +254,9 @@ class CDynProg : public CSGObject
 
 	/** best path get states
 	 *
-	 * @param states states
-	 * @param m dimension m
-	 * @param n dimension n
+	 * @return states states
 	 */
-	void get_states(int32_t **states, int32_t *m, int32_t *n);
+	SGMatrix<int32_t> get_states();
 
 	/** best path get positions
 	 *

diff --git a/src/shogun/ui/SGInterface.cpp b/src/shogun/ui/SGInterface.cpp
@@ -6770,9 +6770,7 @@ bool CSGInterface::cmd_best_path_trans()
 	h->get_scores(&p_prob, &n_prob);
 
 	int32_t* my_path;
-	int32_t n_path;
-	int32_t m_path;
-	h->get_states(&my_path, &n_path, &m_path);
+	SGMatrix<int32_t> states=h->get_states();
 
 	int32_t* my_pos;
 	int32_t n_pos;
@@ -6787,11 +6785,11 @@ bool CSGInterface::cmd_best_path_trans()
 	{
 		for (int32_t i=0; i<M; i++)
 		{
-			d_my_path[i*(nbest+nother)+k] = my_path[i+k*M] ;
+			d_my_path[i*(nbest+nother)+k] = states.matrix[i+k*M] ;
 			d_my_pos[i*(nbest+nother)+k] = my_pos[i+k*M] ;
 		}
 	}
-	free(my_path);
+	free(states.matrix);
 	free(my_pos);
 
 	set_vector(p_prob,nbest+nother);