Skip to content

Commit

Permalink
Merge pull request #3198 from sanuj/fix_warnings
Browse files Browse the repository at this point in the history
fix modshogun and python warnings
  • Loading branch information
karlnapf committed May 28, 2016
2 parents d8dcc00 + 7afc319 commit f1e2e7f
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 9 deletions.
2 changes: 0 additions & 2 deletions src/shogun/clustering/KMeansLloydImpl.h
Expand Up @@ -29,8 +29,6 @@ class CKMeansLloydImpl
* @param distance distance
* @param max_iter max iterations allowed
* @param mus cluster centers matrix (k columns)
* @param ClList cluster number each data vector belongs (size no_of_vectors)
* @param weights_set no. of points belonging to each cluster (size k)
* @param fixed_centers keep centers fixed or not
*/
static void Lloyd_KMeans(int32_t k, CDistance* distance, int32_t max_iter, SGMatrix<float64_t> mus,
Expand Down
2 changes: 0 additions & 2 deletions src/shogun/lib/external/cdflib.cpp
Expand Up @@ -10861,11 +10861,9 @@ void timestamp ( )
# define TIME_SIZE 40

static char time_buffer[TIME_SIZE];
const struct tm *tm;
time_t now;

now = time ( NULL );
tm = localtime ( &now );


cout << time_buffer << "\n";
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/machine/LinearMachine.h
Expand Up @@ -192,7 +192,7 @@ class CLinearMachine : public CMachine
float64_t bias;
/** features */
CDotFeatures* features;
/** If true, bias is computed in ::train method */
/** If true, bias is computed in train method */
bool m_compute_bias;
};
}
Expand Down
Expand Up @@ -128,7 +128,7 @@ struct elementwise_square<Backend::EIGEN3,Matrix>
/**
* Method that computes the square of co-efficients of a dense matrix
*
* @param m the matrix whose squared co-efficients matrix has to be computed
* @param mat the matrix whose squared co-efficients matrix has to be computed
* @param result Pre-allocated matrix for the result of the computation
*/
static void compute(SGMatrix<T> mat, SGMatrix<T> result)
Expand Down
Expand Up @@ -153,7 +153,7 @@ struct mean<Backend::EIGEN3, Matrix>
/**
* Method that computes the mean of SGVectors using Eigen3
*
* @param a vector whose mean has to be computed
* @param vec a vector whose mean has to be computed
* @return the vector mean \f$\bar a_i\f$
*/
static ReturnType compute(SGVector<T> vec)
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/neuralnets/RBM.h
Expand Up @@ -301,7 +301,7 @@ friend class CDeepBeliefNetwork;
* during computation. If not given, a new matrix is allocated and used as
* a buffer.
*
* @param return Approximation to the average pseudo-likelihood over the
* @return Approximation to the average pseudo-likelihood over the
* given batch
*/
virtual float64_t pseudo_likelihood(SGMatrix<float64_t> visible,
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/statistics/NOCCO.h
Expand Up @@ -96,7 +96,7 @@ template<class T> class SGMatrix;
* \mathbf R_X^i\cdot \mathbf R_Y^i
* \f]
*
* For performing the independence test, ::PERMUTATION test is used by first
* For performing the independence test, PERMUTATION test is used by first
* randomly shuffling the samples from one of the distributions while keeping
* the samples from the other distribution in the original order. This way we
* sample the null distribution and compute p-value and threshold for a given
Expand Down

0 comments on commit f1e2e7f

Please sign in to comment.