Merge pull request #2909 from shogun-toolbox/revert-2906-develop

Revert "rename init() method in GP"
shogun-toolbox · Aug 29, 2015 · 538adbc · 538adbc
2 parents 71c3647 + 34ee84c
commit 538adbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/shogun/machine/gp/GaussianARDSparseKernel.cpp b/src/shogun/machine/gp/GaussianARDSparseKernel.cpp
@@ -39,9 +39,9 @@ using namespace shogun;
 
 CGaussianARDSparseKernel::CGaussianARDSparseKernel() : CGaussianARDKernel()
 {
-	init();
+	initialize_sparse_kernel();
 }
-void CGaussianARDSparseKernel::init()
+void CGaussianARDSparseKernel::initialize_sparse_kernel()
 {
 }
 
@@ -55,14 +55,14 @@ using namespace Eigen;
 CGaussianARDSparseKernel::CGaussianARDSparseKernel(int32_t size)
 		: CGaussianARDKernel(size)
 {
-	init();
+	initialize_sparse_kernel();
 }
 
 CGaussianARDSparseKernel::CGaussianARDSparseKernel(CDotFeatures* l,
 		CDotFeatures* r, int32_t size)
 		: CGaussianARDKernel(l, r, size)
 {
-	init();
+	initialize_sparse_kernel();
 }
 
 CGaussianARDSparseKernel* CGaussianARDSparseKernel::obtain_from_generic(CKernel* kernel)

diff --git a/src/shogun/machine/gp/GaussianARDSparseKernel.h b/src/shogun/machine/gp/GaussianARDSparseKernel.h
@@ -69,7 +69,7 @@ class CGaussianARDSparseKernel: public CGaussianARDKernel
 	virtual ~CGaussianARDSparseKernel();
 
 private:
-	void init();
+	void initialize_sparse_kernel();
 
 #if defined(HAVE_EIGEN3) && defined(HAVE_LINALG_LIB)
 public: