Merge pull request #1128 from votjakovr/develop

Removed unused fields from inference method classes

src/shogun/regression/gp/ExactInferenceMethod.h

@@ -17,8 +17,6 @@
 namespace shogun
 {
 
-class CInferenceMethod;
-
 /** @brief The Gaussian Exact Form Inference Method
  *
  *  This inference method computes the Gaussian Method
@@ -44,9 +42,7 @@ class CInferenceMethod;
  */
 class CExactInferenceMethod: public CInferenceMethod
 {
-
 public:
-
 	/** Default Constructor */
 	CExactInferenceMethod();
 
@@ -96,7 +92,6 @@ class CExactInferenceMethod: public CInferenceMethod
 	 */
 	virtual SGVector<float64_t> get_alpha();
 
-
 	/** get Cholesky Decomposition Matrix
 	 *
 	 * @return Cholesky Decomposition of Matrix:
@@ -167,16 +162,11 @@ class CExactInferenceMethod: public CInferenceMethod
 	virtual void update_all();
 
 private:
-
 	/** Check if members of object are valid
 	 * for inference
 	 */
 	void check_members();
-
-	/** Kernel matrix with noise */
-	SGMatrix<float64_t> m_kern_with_noise;
 };
-
 }
 #endif // HAVE_EIGEN3
 

src/shogun/regression/gp/FITCInferenceMethod.h

@@ -39,9 +39,7 @@ namespace shogun
  */
 class CFITCInferenceMethod: public CInferenceMethod
 {
-
 public:
-
 	/** Default Constructor*/
 	CFITCInferenceMethod();
 
@@ -93,7 +91,6 @@ class CFITCInferenceMethod: public CInferenceMethod
 	 */
 	virtual SGVector<float64_t> get_alpha();
 
-
 	/** get Cholesky Decomposition Matrix
 	 *
 	 * @return Cholesky Decomposition of Matrix:
@@ -168,15 +165,11 @@ class CFITCInferenceMethod: public CInferenceMethod
 	void init();
 
 private:
-
 	/** Check if members of object are valid
 	 * for inference
 	 */
 	void check_members();
 
-	/*Kernel matrix with noise*/
-	SGMatrix<float64_t> m_kern_with_noise;
-
 	/*noise of the latent variables*/
 	float64_t m_ind_noise;
 
@@ -220,7 +213,6 @@ class CFITCInferenceMethod: public CInferenceMethod
 	 */
 	SGVector<float64_t> m_be;
 };
-
 }
 #endif // HAVE_EIGEN3
 

src/shogun/regression/gp/InferenceMethod.h

@@ -31,9 +31,7 @@ namespace shogun
  */
 class CInferenceMethod : public CDifferentiableFunction
 {
-
 public:
-
 	/** Default Constructor
 	 *
 	 */
@@ -166,7 +164,7 @@ class CInferenceMethod : public CDifferentiableFunction
 	 *
 	 * @return likelihood
 	 */
-	CLikelihoodModel* get_model() {SG_REF(m_model); return m_model; }
+	CLikelihoodModel* get_model() { SG_REF(m_model); return m_model; }
 
 	/**set likelihood model
 	 *
@@ -202,9 +200,7 @@ class CInferenceMethod : public CDifferentiableFunction
 		return m_latent_features;
 	}
 
-
 protected:
-
 	/** Update alpha matrix */
 	virtual void update_alpha() {}
 
@@ -221,7 +217,6 @@ class CInferenceMethod : public CDifferentiableFunction
 	void init();
 
 protected:
-
 	/**Covariance Function*/
 	CKernel* m_kernel;
 
@@ -276,9 +271,7 @@ class CInferenceMethod : public CDifferentiableFunction
 
 	/** Kernel matrix from latent features */
 	SGMatrix<float64_t> m_latent_matrix;
-
 };
-
 }
 #endif /* HAVE_EIGEN3 */
-#endif /* CInferenceMethod_H_ */
+#endif /* CINFERENCEMETHOD_H_ */

src/shogun/regression/gp/LaplacianInferenceMethod.h

@@ -45,9 +45,7 @@ namespace shogun
  */
 class CLaplacianInferenceMethod: public CInferenceMethod
 {
-
 public:
-
 	/** Default Constructor*/
 	CLaplacianInferenceMethod();
 
@@ -97,7 +95,6 @@ class CLaplacianInferenceMethod: public CInferenceMethod
 	 */
 	virtual SGVector<float64_t> get_alpha();
 
-
 	/** get Cholesky Decomposition Matrix
 	 *
 	 * @return Cholesky Decomposition of Matrix:
@@ -220,7 +217,6 @@ class CLaplacianInferenceMethod: public CInferenceMethod
 	void init();
 
 private:
-
 	/** Check if members of object are valid
 	 * for inference
 	 */
@@ -271,7 +267,6 @@ class CLaplacianInferenceMethod: public CInferenceMethod
 	/*log likelihood*/
 	float64_t lp;
 };
-
 }
 #endif // HAVE_EIGEN3