Merge pull request #3690 from tdjogi010/clean_up_swig_interface

Remove apply_locked* methods from SWIG interfaces #3687

src/shogun/machine/DirectorKernelMachine.h

@@ -141,6 +141,7 @@ IGNORE_IN_CLASSLIST class CDirectorKernelMachine : public CKernelMachine
 			CKernelMachine::set_store_model_features(store_model);
 		}
 
+#ifndef SWIG // SWIG should skip this part
 		/** Trains a locked machine on a set of indices. Error if machine is
 		 * not locked
 		 *
@@ -154,6 +155,7 @@ IGNORE_IN_CLASSLIST class CDirectorKernelMachine : public CKernelMachine
 			return CKernelMachine::train_locked(indices);
 		}
 
+
 		/** Applies a locked machine on a set of indices. Error if machine is
 		 * not locked
 		 *
@@ -188,7 +190,8 @@ IGNORE_IN_CLASSLIST class CDirectorKernelMachine : public CKernelMachine
 		{
 			return CKernelMachine::apply_locked_get_output(indices);
 		}
-
+#endif // SWIG // SWIG should skip this part
+
 		/** Locks the machine on given labels and data. After this call, only
 		 * train_locked and apply_locked may be called
 		 *

src/shogun/machine/DirectorLinearMachine.h

@@ -141,6 +141,7 @@ IGNORE_IN_CLASSLIST class CDirectorLinearMachine : public CLinearMachine
 			CLinearMachine::set_store_model_features(store_model);
 		}
 
+#ifndef SWIG // SWIG should skip this part
 		/** Trains a locked machine on a set of indices. Error if machine is
 		 * not locked
 		 *
@@ -176,6 +177,7 @@ IGNORE_IN_CLASSLIST class CDirectorLinearMachine : public CLinearMachine
 		}
 
 		using CLinearMachine::apply_locked_multiclass;
+#endif // SWIG // SWIG should skip this part
 
 		/** Locks the machine on given labels and data. After this call, only
 		 * train_locked and apply_locked may be called

src/shogun/machine/KernelMachine.h

@@ -235,6 +235,7 @@ class CKernelMachine : public CMachine
 		 */
 		static void* apply_helper(void* p);
 
+#ifndef SWIG // SWIG should skip this part
 		/** Trains a locked machine on a set of indices. Error if machine is
 		 * not locked
 		 *
@@ -249,6 +250,7 @@ class CKernelMachine : public CMachine
 		 * @param indices index vector (of locked features) that is predicted
 		 * @return resulting labels
 		 */
+
 		virtual CBinaryLabels* apply_locked_binary(SGVector<index_t> indices);
 
 		/** Applies a locked machine on a set of indices. Error if machine is
@@ -268,6 +270,7 @@ class CKernelMachine : public CMachine
 		 */
 		virtual SGVector<float64_t> apply_locked_get_output(
 				SGVector<index_t> indices);
+#endif // SWIG // SWIG should skip this part
 
 		/** Locks the machine on given labels and data. After this call, only
 		 * train_locked and apply_locked may be called.

src/shogun/machine/Machine.h

@@ -228,6 +228,7 @@ class CMachine : public CSGObject
 		 */
 		virtual void set_store_model_features(bool store_model);
 
+#ifndef SWIG // SWIG should skip this part
 		/** Trains a locked machine on a set of indices. Error if machine is
 		 * not locked
 		 *
@@ -242,6 +243,7 @@ class CMachine : public CSGObject
 					"for %s\n", get_name());
 			return false;
 		}
+#endif // SWIG // SWIG should skip this part
 
 		/** applies to one vector */
 		virtual float64_t apply_one(int32_t i)
@@ -250,6 +252,7 @@ class CMachine : public CSGObject
 			return 0.0;
 		}
 
+#ifndef SWIG // SWIG should skip this part
 		/** Applies a locked machine on a set of indices. Error if machine is
 		 * not locked
 		 *
@@ -272,6 +275,7 @@ class CMachine : public CSGObject
 		/** applies a locked machine on a set of indices for latent problems */
 		virtual CLatentLabels* apply_locked_latent(
 				SGVector<index_t> indices);
+#endif // SWIG // SWIG should skip this part
 
 		/** Locks the machine on given labels and data. After this call, only
 		 * train_locked and apply_locked may be called

src/shogun/transfer/multitask/MultitaskLinearMachine.h

@@ -102,11 +102,13 @@ class CMultitaskLinearMachine : public CLinearMachine
 		/** post lock */
 		virtual void post_lock(CLabels* labels, CFeatures* features_);
 
+#ifndef SWIG // SWIG should skip this part
 		/** train on given indices */
 		virtual bool train_locked(SGVector<index_t> indices);
 
 		/** applies on given indices */
 		virtual CBinaryLabels* apply_locked_binary(SGVector<index_t> indices);
+#endif // SWIG // SWIG should skip this part
 
 		/** applies to one vector */
 		virtual float64_t apply_one(int32_t i);