Extracted multitask things

shogun-toolbox · Apr 28, 2012 · f2489bd · f2489bd
1 parent 4574712
commit f2489bd
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 22 deletions.
diff --git a/src/interfaces/modular/Kernel.i b/src/interfaces/modular/Kernel.i
@@ -64,12 +64,6 @@
 %rename(LocalAlignmentStringKernel) CLocalAlignmentStringKernel;
 %rename(LocalityImprovedStringKernel) CLocalityImprovedStringKernel;
 %rename(MatchWordStringKernel) CMatchWordStringKernel;
-%rename(MultitaskKernelNormalizer) CMultitaskKernelNormalizer;
-%rename(MultitaskKernelMklNormalizer) CMultitaskKernelMklNormalizer;
-%rename(MultitaskKernelTreeNormalizer) CMultitaskKernelTreeNormalizer;
-%rename(MultitaskKernelMaskNormalizer) CMultitaskKernelMaskNormalizer;
-%rename(MultitaskKernelMaskPairNormalizer) CMultitaskKernelMaskPairNormalizer;
-%rename(MultitaskKernelPlifNormalizer) CMultitaskKernelPlifNormalizer;
 %rename(OligoStringKernel) COligoStringKernel;
 %rename(PolyKernel) CPolyKernel;
 %rename(PolyMatchStringKernel) CPolyMatchStringKernel;
@@ -178,12 +172,6 @@ namespace shogun
 %include <shogun/kernel/LocalAlignmentStringKernel.h>
 %include <shogun/kernel/LocalityImprovedStringKernel.h>
 %include <shogun/kernel/MatchWordStringKernel.h>
-%include <shogun/kernel/MultitaskKernelNormalizer.h>
-%include <shogun/kernel/MultitaskKernelMklNormalizer.h>
-%include <shogun/kernel/MultitaskKernelTreeNormalizer.h>
-%include <shogun/kernel/MultitaskKernelMaskNormalizer.h>
-%include <shogun/kernel/MultitaskKernelMaskPairNormalizer.h>
-%include <shogun/kernel/MultitaskKernelPlifNormalizer.h>
 %include <shogun/kernel/OligoStringKernel.h>
 %include <shogun/kernel/PolyKernel.h>
 %include <shogun/kernel/PolyMatchStringKernel.h>

diff --git a/src/interfaces/modular/Kernel_includes.i b/src/interfaces/modular/Kernel_includes.i
@@ -38,12 +38,6 @@
 #include <shogun/kernel/LocalAlignmentStringKernel.h>
 #include <shogun/kernel/LocalityImprovedStringKernel.h>
 #include <shogun/kernel/MatchWordStringKernel.h>
-#include <shogun/kernel/MultitaskKernelNormalizer.h>
-#include <shogun/kernel/MultitaskKernelMklNormalizer.h>
-#include <shogun/kernel/MultitaskKernelTreeNormalizer.h>
-#include <shogun/kernel/MultitaskKernelMaskNormalizer.h>
-#include <shogun/kernel/MultitaskKernelMaskPairNormalizer.h>
-#include <shogun/kernel/MultitaskKernelPlifNormalizer.h>
 #include <shogun/kernel/MultiquadricKernel.h>
 #include <shogun/kernel/OligoStringKernel.h>
 #include <shogun/kernel/PolyKernel.h>

diff --git a/src/interfaces/modular/Multitask.i b/src/interfaces/modular/Multitask.i
@@ -0,0 +1,28 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Written (W) 2012 Sergey Lisitsyn
+ * Copyright (C) 2012 Sergey Lisitsyn
+ */
+
+/* Remove C Prefix */
+%rename(TreeBasedGroupLassoLinearRegression) CTreeBasedGroupLassoLinearRegression;
+%rename(MultitaskKernelNormalizer) CMultitaskKernelNormalizer;
+%rename(MultitaskKernelMklNormalizer) CMultitaskKernelMklNormalizer;
+%rename(MultitaskKernelTreeNormalizer) CMultitaskKernelTreeNormalizer;
+%rename(MultitaskKernelMaskNormalizer) CMultitaskKernelMaskNormalizer;
+%rename(MultitaskKernelMaskPairNormalizer) CMultitaskKernelMaskPairNormalizer;
+%rename(MultitaskKernelPlifNormalizer) CMultitaskKernelPlifNormalizer;
+
+/* Include Class Headers to make them visible from within the target language */
+%include <shogun/multitask/TreeBasedGroupLassoLinearRegression.h>
+%include <shogun/multitask/MultitaskKernelNormalizer.h>
+%include <shogun/multitask/MultitaskKernelNormalizer.h>
+%include <shogun/multitask/MultitaskKernelTreeNormalizer.h>
+%include <shogun/multitask/MultitaskKernelMaskNormalizer.h>
+%include <shogun/multitask/MultitaskKernelMaskPairNormalizer.h>
+%include <shogun/multitask/MultitaskKernelPlifNormalizer.h>
+
diff --git a/src/interfaces/modular/Multitask_includes.i b/src/interfaces/modular/Multitask_includes.i
@@ -0,0 +1,9 @@
+%{
+ #include <shogun/multitask/TreeBasedGroupLassoLinearRegression.h>
+ #include <shogun/multitask/MultitaskKernelNormalizer.h>
+ #include <shogun/multitask/MultitaskKernelMklNormalizer.h>
+ #include <shogun/multitask/MultitaskKernelTreeNormalizer.h>
+ #include <shogun/multitask/MultitaskKernelMaskNormalizer.h>
+ #include <shogun/multitask/MultitaskKernelMaskPairNormalizer.h>
+ #include <shogun/multitask/MultitaskKernelPlifNormalizer.h>
+%}
diff --git a/src/shogun/kernel/WeightedDegreeStringKernel.h b/src/shogun/kernel/WeightedDegreeStringKernel.h
@@ -15,7 +15,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/lib/Trie.h>
 #include <shogun/kernel/StringKernel.h>
-#include <shogun/kernel/MultitaskKernelMklNormalizer.h>
+#include <shogun/multitask/MultitaskKernelMklNormalizer.h>
 #include <shogun/features/StringFeatures.h>
 
 namespace shogun

diff --git a/...un/kernel/MultitaskKernelMaskNormalizer.h → ...multitask/MultitaskKernelMaskNormalizer.h b/...un/kernel/MultitaskKernelMaskNormalizer.h → ...multitask/MultitaskKernelMaskNormalizer.h
diff --git a/...ernel/MultitaskKernelMaskPairNormalizer.h → ...itask/MultitaskKernelMaskPairNormalizer.h b/...ernel/MultitaskKernelMaskPairNormalizer.h → ...itask/MultitaskKernelMaskPairNormalizer.h
diff --git a/...gun/kernel/MultitaskKernelMklNormalizer.h → .../multitask/MultitaskKernelMklNormalizer.h b/...gun/kernel/MultitaskKernelMklNormalizer.h → .../multitask/MultitaskKernelMklNormalizer.h
@@ -12,7 +12,7 @@
 #define _MULTITASKKERNELMKLNORMALIZER_H___
 
 #include <shogun/kernel/KernelNormalizer.h>
-#include <shogun/kernel/MultitaskKernelMklNormalizer.h>
+#include <shogun/multitask/MultitaskKernelMklNormalizer.h>
 #include <shogun/kernel/Kernel.h>
 #include <algorithm>
 #include <string>

diff --git a/...shogun/kernel/MultitaskKernelNormalizer.h → ...gun/multitask/MultitaskKernelNormalizer.h b/...shogun/kernel/MultitaskKernelNormalizer.h → ...gun/multitask/MultitaskKernelNormalizer.h
diff --git a/...un/kernel/MultitaskKernelPlifNormalizer.h → ...multitask/MultitaskKernelPlifNormalizer.h b/...un/kernel/MultitaskKernelPlifNormalizer.h → ...multitask/MultitaskKernelPlifNormalizer.h
@@ -12,7 +12,7 @@
 #define _MULTITASKKERNELPLIFNORMALIZER_H___
 
 #include <shogun/kernel/KernelNormalizer.h>
-#include <shogun/kernel/MultitaskKernelMklNormalizer.h>
+#include <shogun/multitask/MultitaskKernelMklNormalizer.h>
 #include <shogun/kernel/Kernel.h>
 #include <algorithm>
 

diff --git a/...un/kernel/MultitaskKernelTreeNormalizer.h → ...multitask/MultitaskKernelTreeNormalizer.h b/...un/kernel/MultitaskKernelTreeNormalizer.h → ...multitask/MultitaskKernelTreeNormalizer.h
@@ -12,7 +12,7 @@
 #define _MULTITASKKERNELTREENORMALIZER_H___
 
 #include <shogun/kernel/KernelNormalizer.h>
-#include <shogun/kernel/MultitaskKernelMklNormalizer.h>
+#include <shogun/multitask/MultitaskKernelMklNormalizer.h>
 #include <shogun/kernel/Kernel.h>
 #include <algorithm>
 #include <map>