Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
convert prepare_POIM2 to SGMatrix
  • Loading branch information
Soeren Sonnenburg committed Apr 18, 2012
1 parent 6653329 commit 9067389
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
10 changes: 6 additions & 4 deletions src/shogun/kernel/WeightedDegreePositionStringKernel.cpp
Expand Up @@ -1812,15 +1812,17 @@ float64_t* CWeightedDegreePositionStringKernel::compute_POIM(
}


void CWeightedDegreePositionStringKernel::prepare_POIM2(
float64_t* distrib, int32_t num_sym, int32_t num_feat)
void CWeightedDegreePositionStringKernel::prepare_POIM2(SGMatrix<float64_t> distrib)
{
SG_FREE(m_poim_distrib);
int32_t num_sym=distrib.num_cols;
int32_t num_feat=distrib.num_rows;
m_poim_distrib=SG_MALLOC(float64_t, num_sym*num_feat);

memcpy(m_poim_distrib, distrib, num_sym*num_feat*sizeof(float64_t));
memcpy(m_poim_distrib, distrib.matrix, num_sym*num_feat*sizeof(float64_t));
m_poim_num_sym=num_sym;
m_poim_num_feat=num_feat;

distrib.free_matrix();
}

void CWeightedDegreePositionStringKernel::compute_POIM2(
Expand Down
5 changes: 1 addition & 4 deletions src/shogun/kernel/WeightedDegreePositionStringKernel.h
Expand Up @@ -578,12 +578,9 @@ class CWeightedDegreePositionStringKernel: public CStringKernel<char>

/** prepare POIM2
*
* @param num_feat number of features
* @param num_sym number of symbols
* @param distrib distribution
*/
void prepare_POIM2(
float64_t* distrib, int32_t num_sym, int32_t num_feat);
void prepare_POIM2(SGMatrix<float64_t> distrib);

/** compute POIM2
*
Expand Down

0 comments on commit 9067389

Please sign in to comment.