Fix swig

Drop DimensionReductionPreprocessor in swig Guard deprecated in swig Remove deprecated flag for apply_to_vector
shogun-toolbox · Jun 4, 2018 · 8a3e4d4 · 8a3e4d4
1 parent b3ac8ec
commit 8a3e4d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/interfaces/swig/Preprocessor.i b/src/interfaces/swig/Preprocessor.i
@@ -16,7 +16,6 @@
 %rename(PNorm) CPNorm;
 %rename(RescaleFeatures) CRescaleFeatures;
 
-%rename(DimensionReductionPreprocessor) CDimensionReductionPreprocessor;
 %rename(PCA) CPCA;
 %rename(KernelPCA) CKernelPCA;
 %rename(FisherLda) CFisherLDA;
@@ -61,8 +60,6 @@ namespace shogun
 #endif
 }
 
-/* Templates Class DimensionReductionPreprocessor */
-%include <shogun/preprocessor/DimensionReductionPreprocessor.h>
 
 /* Templates Class StringPreprocessor*/
 %include <shogun/preprocessor/StringPreprocessor.h>

diff --git a/src/interfaces/swig/Preprocessor_includes.i b/src/interfaces/swig/Preprocessor_includes.i
@@ -14,7 +14,6 @@
 #include <shogun/preprocessor/PNorm.h>
 #include <shogun/preprocessor/RescaleFeatures.h>
 
-#include <shogun/preprocessor/DimensionReductionPreprocessor.h>
 #include <shogun/preprocessor/PCA.h>
 #include <shogun/preprocessor/KernelPCA.h>
 #include <shogun/preprocessor/FisherLDA.h>

diff --git a/src/shogun/preprocessor/DensePreprocessor.h b/src/shogun/preprocessor/DensePreprocessor.h
@@ -45,13 +45,15 @@ template <class ST> class CDensePreprocessor : public CPreprocessor
 		/// result in feature matrix
 		/// return pointer to feature_matrix, i.e. f->get_feature_matrix();
 		// remove after cleaning up codebase
-		[[deprecated]] virtual SGMatrix<ST>
-		apply_to_feature_matrix(CFeatures* features);
+#ifndef SWIG
+		[[deprecated]]
+#endif
+		    virtual SGMatrix<ST>
+		    apply_to_feature_matrix(CFeatures* features);
 
 		/// apply preproc on single feature vector
 		/// result in feature matrix
-		[[deprecated]] virtual SGVector<ST>
-		apply_to_feature_vector(SGVector<ST> vector) = 0;
+		virtual SGVector<ST> apply_to_feature_vector(SGVector<ST> vector) = 0;
 
 		/// return that we are dense features (just fixed size matrices)
 		virtual EFeatureClass get_feature_class();