Moved train to train_machine in AveragedPerceptron and OnlineLibLinear

shogun-toolbox · May 23, 2012 · 495a859 · 495a859
1 parent 7bbda1c
commit 495a859
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/src/shogun/classifier/AveragedPerceptron.cpp b/src/shogun/classifier/AveragedPerceptron.cpp
@@ -30,7 +30,7 @@ CAveragedPerceptron::~CAveragedPerceptron()
 {
 }
 
-bool CAveragedPerceptron::train(CFeatures* data)
+bool CAveragedPerceptron::train_machine(CFeatures* data)
 {
 	ASSERT(m_labels);
 	ASSERT(m_labels->get_label_type() == LT_BINARY);

diff --git a/src/shogun/classifier/AveragedPerceptron.h b/src/shogun/classifier/AveragedPerceptron.h
@@ -49,16 +49,6 @@ class CAveragedPerceptron : public CLinearMachine
 		 */
 		virtual inline EMachineType get_classifier_type() { return CT_AVERAGEDPERCEPTRON; }
 
-		/** train classifier
-		 *
-		 * @param data training data (parameter can be avoided if distance or
-		 * kernel-based classifiers are used and distance/kernels are
-		 * initialized with train data)
-		 *
-		 * @return whether training was successful
-		 */
-		virtual bool train(CFeatures* data=NULL);
-
 		/// set learn rate of gradient descent training algorithm
 		inline void set_learn_rate(float64_t r)
 		{
@@ -74,6 +64,18 @@ class CAveragedPerceptron : public CLinearMachine
 		/** @return object name */
 		inline virtual const char* get_name() const { return "AveragedPerceptron"; }
 
+protected:
+
+		/** train classifier
+		 *
+		 * @param data training data (parameter can be avoided if distance or
+		 * kernel-based classifiers are used and distance/kernels are
+		 * initialized with train data)
+		 *
+		 * @return whether training was successful
+		 */
+		virtual bool train_machine(CFeatures* data=NULL);
+
 	protected:
 		/** learning rate */
 		float64_t learn_rate;

diff --git a/src/shogun/classifier/svm/OnlineLibLinear.cpp b/src/shogun/classifier/svm/OnlineLibLinear.cpp
@@ -56,7 +56,7 @@ COnlineLibLinear::~COnlineLibLinear()
 {
 }
 
-bool COnlineLibLinear::train(CFeatures* data)
+bool COnlineLibLinear::train_machine(CFeatures* data)
 {
 		if (data)
 		{

diff --git a/src/shogun/classifier/svm/OnlineLibLinear.h b/src/shogun/classifier/svm/OnlineLibLinear.h
@@ -49,16 +49,6 @@ class COnlineLibLinear : public COnlineLinearMachine
 		/** Destructor */
 		virtual ~COnlineLibLinear();
 
-		/**
-		 * Train classifier
-		 *
-		 * @param data Training data, can be avoided if already
-		 * initialized with it
-		 *
-		 * @return Whether training was successful
-		 */
-		virtual bool train(CFeatures* data=NULL);
-
 		/**
 		 * Set C1 and C2 constants
 		 *
@@ -98,6 +88,18 @@ class COnlineLibLinear : public COnlineLinearMachine
 		/** @return Object name */
 		inline virtual const char* get_name() const { return "OnlineLibLinear"; }
 
+protected:
+
+		/**
+		 * Train classifier
+		 *
+		 * @param data Training data, can be avoided if already
+		 * initialized with it
+		 *
+		 * @return Whether training was successful
+		 */
+		virtual bool train_machine(CFeatures* data=NULL);
+
 private:
 		/** Set up parameters */
 		void init();