move the %inline parts of the code doing dynamic casts back into the

respective classes
shogun-toolbox · Oct 27, 2011 · 890ea79 · 890ea79
1 parent 4e28d27
commit 890ea79
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 40 deletions.
diff --git a/src/interfaces/modular/Kernel.i b/src/interfaces/modular/Kernel.i
@@ -131,39 +131,6 @@ namespace shogun
 #endif
 }
 
-
-
-/* Provide some cast functionality available to target languages */
-%inline %{
-
-/* C++-style cast */
-shogun::CMultitaskKernelNormalizer *KernelNormalizerToMultitaskKernelNormalizer(shogun::CKernelNormalizer* n) {
-   return dynamic_cast<shogun::CMultitaskKernelNormalizer*>(n);
-}
-
-shogun::CMultitaskKernelTreeNormalizer *KernelNormalizerToMultitaskKernelTreeNormalizer(shogun::CKernelNormalizer* n) {
-   return dynamic_cast<shogun::CMultitaskKernelTreeNormalizer*>(n);
-}
-
-shogun::CMultitaskKernelMaskNormalizer *KernelNormalizerToMultitaskKernelMaskNormalizer(shogun::CKernelNormalizer* n) {
-   return dynamic_cast<shogun::CMultitaskKernelMaskNormalizer*>(n);
-}
-
-shogun::CMultitaskKernelMaskPairNormalizer *KernelNormalizerToMultitaskKernelMaskPairNormalizer(shogun::CKernelNormalizer* n) {
-   return dynamic_cast<shogun::CMultitaskKernelMaskPairNormalizer*>(n);
-}
-
-shogun::CMultitaskKernelPlifNormalizer *KernelNormalizerToMultitaskKernelPlifNormalizer(shogun::CKernelNormalizer* n) {
-   return dynamic_cast<shogun::CMultitaskKernelPlifNormalizer*>(n);
-}
-
-shogun::CCombinedKernel *KernelToCombinedKernel(shogun::CKernel* n) {
-   return dynamic_cast<shogun::CCombinedKernel*>(n);
-}
-
-
-%}
-
 %include <shogun/kernel/KernelNormalizer.h>
 %include <shogun/kernel/PyramidChi2.h>
 %include <shogun/kernel/ANOVAKernel.h>

diff --git a/src/shogun/kernel/CombinedKernel.h b/src/shogun/kernel/CombinedKernel.h
@@ -377,6 +377,11 @@ class CCombinedKernel : public CKernel
 		/** precompute all sub-kernels */
 		bool precompute_subkernels();
 
+		CCombinedKernel* KernelToCombinedKernel(shogun::CKernel* n)
+		{
+			return dynamic_cast<CCombinedKernel*>(n);
+		}
+
 	protected:
 		/** compute kernel function
 		 *

diff --git a/src/shogun/kernel/MultitaskKernelMaskNormalizer.h b/src/shogun/kernel/MultitaskKernelMaskNormalizer.h
@@ -262,10 +262,12 @@ class CMultitaskKernelMaskNormalizer: public CKernelNormalizer
 		return "MultitaskKernelMaskNormalizer";
 	}
 
-
+	CMultitaskKernelMaskNormalizer* KernelNormalizerToMultitaskKernelMaskNormalizer(CKernelNormalizer* n)
+	{
+		   return dynamic_cast<CMultitaskKernelMaskNormalizer*>(n);
+	}
 
 protected:
-
 	/** list of active tasks **/
 	std::set<int32_t> active_tasks;
 

diff --git a/src/shogun/kernel/MultitaskKernelMaskPairNormalizer.h b/src/shogun/kernel/MultitaskKernelMaskPairNormalizer.h
@@ -238,7 +238,10 @@ class CMultitaskKernelMaskPairNormalizer: public CKernelNormalizer
 		return "MultitaskKernelMaskPairNormalizer";
 	}
 
-
+	CMultitaskKernelMaskPairNormalizer* KernelNormalizerToMultitaskKernelMaskPairNormalizer(CKernelNormalizer* n)
+	{
+		   return dynamic_cast<shogun::CMultitaskKernelMaskPairNormalizer*>(n);
+	}
 
 protected:
 

diff --git a/src/shogun/kernel/MultitaskKernelNormalizer.h b/src/shogun/kernel/MultitaskKernelNormalizer.h
@@ -230,6 +230,12 @@ class CMultitaskKernelNormalizer: public CKernelNormalizer
 		return "MultitaskKernelNormalizer";
 	}
 
+	inline CMultitaskKernelNormalizer* KernelNormalizerToMultitaskKernelNormalizer(CKernelNormalizer* n)
+	{
+		return dynamic_cast<CMultitaskKernelNormalizer*>(n);
+	}
+
+
 protected:
 
 	/** MxM matrix encoding similarity between tasks **/

diff --git a/src/shogun/kernel/MultitaskKernelPlifNormalizer.h b/src/shogun/kernel/MultitaskKernelPlifNormalizer.h
@@ -316,6 +316,11 @@ class CMultitaskKernelPlifNormalizer: public CMultitaskKernelMklNormalizer
 		return "MultitaskKernelPlifNormalizer";
 	}
 
+	CMultitaskKernelPlifNormalizer* KernelNormalizerToMultitaskKernelPlifNormalizer(CKernelNormalizer* n)
+	{
+		   return dynamic_cast<shogun::CMultitaskKernelPlifNormalizer*>(n);
+	}
+
 protected:
 	/** register the parameters 
 	 */

diff --git a/src/shogun/kernel/MultitaskKernelTreeNormalizer.h b/src/shogun/kernel/MultitaskKernelTreeNormalizer.h
@@ -572,18 +572,18 @@ class CMultitaskKernelTreeNormalizer: public CMultitaskKernelMklNormalizer
 
 	}
 
-
 	/** @return object name */
 	inline virtual const char* get_name() const
 	{
 		return "MultitaskKernelTreeNormalizer";
 	}
 
-
+	CMultitaskKernelTreeNormalizer* KernelNormalizerToMultitaskKernelTreeNormalizer(CKernelNormalizer* n)
+	{
+		return dynamic_cast<CMultitaskKernelTreeNormalizer*>(n);
+	}
 
 protected:
-
-
 	/** taxonomy **/
 	CTaxonomy taxonomy;