Merge branch 'save_load_Machines' of git://github.com/gsomix/shogun

shogun-toolbox · May 4, 2012 · e0cb338 · e0cb338
2 parents 25427d4 + 5427a46
commit e0cb338
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 86 deletions.
diff --git a/src/shogun/machine/LinearMachine.cpp b/src/shogun/machine/LinearMachine.cpp
@@ -43,20 +43,6 @@ CLinearMachine::~CLinearMachine()
 	SG_UNREF(features);
 }
 
-bool CLinearMachine::load(FILE* srcfile)
-{
-	SG_SET_LOCALE_C;
-	SG_RESET_LOCALE;
-	return false;
-}
-
-bool CLinearMachine::save(FILE* dstfile)
-{
-	SG_SET_LOCALE_C;
-	SG_RESET_LOCALE;
-	return false;
-}
-
 CLabels* CLinearMachine::apply()
 {
 	if (!features)

diff --git a/src/shogun/machine/LinearMachine.h b/src/shogun/machine/LinearMachine.h
@@ -118,20 +118,6 @@ class CLinearMachine : public CMachine
 			return bias;
 		}
 
-		/** load from file
-		 *
-		 * @param srcfile file to load from
-		 * @return if loading was successful
-		 */
-		virtual bool load(FILE* srcfile);
-
-		/** save to file
-		 *
-		 * @param dstfile file to save to
-		 * @return if saving was successful
-		 */
-		virtual bool save(FILE* dstfile);
-
 		/** set features
 		 *
 		 * @param feat features to set

diff --git a/src/shogun/machine/Machine.cpp b/src/shogun/machine/Machine.cpp
@@ -70,18 +70,6 @@ float64_t CMachine::apply(int32_t num)
 	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(m_labels);

diff --git a/src/shogun/machine/Machine.h b/src/shogun/machine/Machine.h
@@ -148,24 +148,6 @@ class CMachine : public CSGObject
 		 */
 		virtual float64_t apply(int32_t num);
 
-		/** load Machine from file
-		 *
-		 * abstract base method
-		 *
-		 * @param srcfile file to load from
-		 * @return failure
-		 */
-		virtual bool load(FILE* srcfile);
-
-		/** save Machine to file
-		 *
-		 * abstract base method
-		 *
-		 * @param dstfile file to save to
-		 * @return failure
-		 */
-		virtual bool save(FILE* dstfile);
-
 		/** set labels
 		 *
 		 * @param lab labels

diff --git a/src/shogun/machine/OnlineLinearMachine.cpp b/src/shogun/machine/OnlineLinearMachine.cpp
@@ -31,20 +31,6 @@ COnlineLinearMachine::~COnlineLinearMachine()
 	SG_UNREF(features);
 }
 
-bool COnlineLinearMachine::load(FILE* srcfile)
-{
-	SG_SET_LOCALE_C;
-	SG_RESET_LOCALE;
-	return false;
-}
-
-bool COnlineLinearMachine::save(FILE* dstfile)
-{
-	SG_SET_LOCALE_C;
-	SG_RESET_LOCALE;
-	return false;
-}
-
 CLabels* COnlineLinearMachine::apply()
 {
 	ASSERT(features);

diff --git a/src/shogun/machine/OnlineLinearMachine.h b/src/shogun/machine/OnlineLinearMachine.h
@@ -135,20 +135,6 @@ class COnlineLinearMachine : public CMachine
 			return bias;
 		}
 
-		/** load from file
-		 *
-		 * @param srcfile file to load from
-		 * @return if loading was successful
-		 */
-		virtual bool load(FILE* srcfile);
-
-		/** save to file
-		 *
-		 * @param dstfile file to save to
-		 * @return if saving was successful
-		 */
-		virtual bool save(FILE* dstfile);
-
 		/** set features
 		 *
 		 * @param feat features to set