Moved code from .h to .cpp at CMachine

shogun-toolbox · Oct 8, 2011 · e927318 · e927318
1 parent 2382e0c
commit e927318
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 40 deletions.
diff --git a/src/shogun/machine/Machine.cpp b/src/shogun/machine/Machine.cpp
@@ -10,6 +10,7 @@
 
 #include <shogun/machine/Machine.h>
 #include <shogun/base/Parameter.h>
+#include <shogun/mathematics/Math.h>
 
 using namespace shogun;
 
@@ -30,3 +31,84 @@ CMachine::~CMachine()
 {
     SG_UNREF(labels);
 }
+
+bool CMachine::train(CFeatures* data)
+{
+	bool result = train_machine(data);
+
+	if (m_store_model_features)
+		store_model_features();
+
+	return result;
+}
+
+float64_t CMachine::apply(int32_t num)
+{
+	SG_NOTIMPLEMENTED;
+	return CMath::INFTY;
+}
+
+bool CMachine::load(FILE* srcfile)
+{
+	ASSERT(srcfile);
+	return false;
+}
+
+bool CMachine::save(FILE* dstfile)
+{
+	ASSERT(dstfile);
+	return false;
+}
+
+void CMachine::set_labels(CLabels* lab)
+{
+	SG_UNREF(labels);
+	SG_REF(lab);
+	labels = lab;
+}
+
+CLabels* CMachine::get_labels()
+{
+	SG_REF(labels);
+	return labels;
+}
+
+float64_t CMachine::get_label(int32_t i)
+{
+	if (!labels)
+		SG_ERROR("No Labels assigned\n");
+
+	return labels->get_label(i);
+}
+
+void CMachine::set_max_train_time(float64_t t)
+{
+	max_train_time = t;
+}
+
+float64_t CMachine::get_max_train_time()
+{
+	return max_train_time;
+}
+
+EClassifierType CMachine::get_classifier_type()
+{
+	return CT_NONE;
+}
+
+void CMachine::set_solver_type(ESolverType st)
+{
+	solver_type = st;
+}
+
+ESolverType CMachine::get_solver_type()
+{
+	return solver_type;
+}
+
+void CMachine::set_store_model_features(bool store_model)
+{
+	m_store_model_features = store_model;
+}
+
+
diff --git a/src/shogun/machine/Machine.h b/src/shogun/machine/Machine.h
@@ -13,7 +13,6 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/base/SGObject.h>
-#include <shogun/mathematics/Math.h>
 #include <shogun/features/Labels.h>
 #include <shogun/features/Features.h>
 
@@ -99,6 +98,8 @@ class CMachine : public CSGObject
 	public:
 		/** constructor */
 		CMachine();
+
+		/** destructor */
 		virtual ~CMachine();
 
 		/** train machine
@@ -110,15 +111,7 @@ class CMachine : public CSGObject
 		 *
 		 * @return whether training was successful
 		 */
-		virtual bool train(CFeatures* data=NULL)
-		{
-			bool result=train_machine(data);
-
-			if (m_store_model_features)
-				store_model_features();
-
-			return result;
-		}
+		virtual bool train(CFeatures* data=NULL);
 
 		/** apply machine to the currently set features
 		 *
@@ -140,11 +133,7 @@ class CMachine : public CSGObject
 		 * @param num which example to apply machine to
 		 * @return infinite float value
 		 */
-		virtual float64_t apply(int32_t num)
-		{
-			SG_NOTIMPLEMENTED;
-			return CMath::INFTY;
-		}
+		virtual float64_t apply(int32_t num);
 
 		/** load Machine from file
 		 *
@@ -153,7 +142,7 @@ class CMachine : public CSGObject
 		 * @param srcfile file to load from
 		 * @return failure
 		 */
-		virtual bool load(FILE* srcfile) { ASSERT(srcfile); return false; }
+		virtual bool load(FILE* srcfile);
 
 		/** save Machine to file
 		 *
@@ -162,77 +151,63 @@ class CMachine : public CSGObject
 		 * @param dstfile file to save to
 		 * @return failure
 		 */
-		virtual bool save(FILE* dstfile) { ASSERT(dstfile); return false; }
+		virtual bool save(FILE* dstfile); 
 
 		/** set labels
 		 *
 		 * @param lab labels
 		 */
-		virtual inline void set_labels(CLabels* lab)
-		{
-			SG_UNREF(labels);
-			SG_REF(lab);
-			labels=lab;
-		}
+		virtual void set_labels(CLabels* lab);
 
 		/** get labels
 		 *
 		 * @return labels
 		 */
-		virtual inline CLabels* get_labels() { SG_REF(labels); return labels; }
+		virtual CLabels* get_labels();
 
 		/** get one specific label
 		 *
 		 * @param i index of label to get
 		 * @return value of label at index i
 		 */
-		virtual inline float64_t get_label(int32_t i)
-		{
-			if (!labels)
-				SG_ERROR("No Labels assigned\n");
-
-			return labels->get_label(i);
-		}
+		virtual float64_t get_label(int32_t i);
 
 		/** set maximum training time
 		 *
 		 * @param t maximimum training time
 		 */
-		inline void set_max_train_time(float64_t t) { max_train_time=t; }
+		void set_max_train_time(float64_t t);
 
 		/** get maximum training time
 		 *
 		 * @return maximum training time
 		 */
-		inline float64_t get_max_train_time() { return max_train_time; }
+		float64_t get_max_train_time();
 
 		/** get classifier type
 		 *
 		 * @return classifier type NONE
 		 */
-		virtual inline EClassifierType get_classifier_type() { return CT_NONE; }
+		virtual EClassifierType get_classifier_type();
 
 		/** set solver type
 		 *
 		 * @param st solver type
 		 */
-		inline void set_solver_type(ESolverType st) { solver_type=st; }
+		void set_solver_type(ESolverType st);
 
 		/** get solver type
 		 *
 		 * @return solver
 		 */
-		inline ESolverType get_solver_type() { return solver_type; }
+		ESolverType get_solver_type();
 
 		/** Setter for store-model-features-after-training flag
 		 *
 		 * @param store_model whether model should be stored after
 		 * training
 		 */
-		virtual void set_store_model_features(bool store_model)
-		{
-			m_store_model_features=store_model;
-		}
+		virtual void set_store_model_features(bool store_model);
 
 	protected:
 		/** train machine