move kernel normalizers to shogun/kernel/normalizer

shogun-toolbox · Jun 20, 2012 · f4d348f · f4d348f
1 parent 140515f
commit f4d348f
Show file tree

Hide file tree

Showing 32 changed files with 57 additions and 57 deletions.
diff --git a/src/interfaces/modular/Kernel.i b/src/interfaces/modular/Kernel.i
@@ -137,16 +137,16 @@ namespace shogun
 #endif
 }
 
-%include <shogun/kernel/normalize/KernelNormalizer.h>
-%include <shogun/kernel/normalize/AvgDiagKernelNormalizer.h>
-%include <shogun/kernel/normalize/RidgeKernelNormalizer.h>
-%include <shogun/kernel/normalize/DiceKernelNormalizer.h>
-%include <shogun/kernel/normalize/ScatterKernelNormalizer.h>
-%include <shogun/kernel/normalize/VarianceKernelNormalizer.h>
-%include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
-%include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
-%include <shogun/kernel/normalize/TanimotoKernelNormalizer.h>
-%include <shogun/kernel/normalize/ZeroMeanCenterKernelNormalizer.h>
+%include <shogun/kernel/normalizer/KernelNormalizer.h>
+%include <shogun/kernel/normalizer/AvgDiagKernelNormalizer.h>
+%include <shogun/kernel/normalizer/RidgeKernelNormalizer.h>
+%include <shogun/kernel/normalizer/DiceKernelNormalizer.h>
+%include <shogun/kernel/normalizer/ScatterKernelNormalizer.h>
+%include <shogun/kernel/normalizer/VarianceKernelNormalizer.h>
+%include <shogun/kernel/normalizer/IdentityKernelNormalizer.h>
+%include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
+%include <shogun/kernel/normalizer/TanimotoKernelNormalizer.h>
+%include <shogun/kernel/normalizer/ZeroMeanCenterKernelNormalizer.h>
 
 %include <shogun/kernel/PyramidChi2.h>
 %include <shogun/kernel/ANOVAKernel.h>

diff --git a/src/interfaces/modular/Kernel_includes.i b/src/interfaces/modular/Kernel_includes.i
@@ -1,12 +1,12 @@
 %{
 #include <shogun/features/FeatureTypes.h>
 #include <shogun/kernel/Kernel.h>
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 #include <shogun/kernel/PyramidChi2.h>
 #include <shogun/kernel/ANOVAKernel.h>
 #include <shogun/kernel/AUCKernel.h>
-#include <shogun/kernel/normalize/AvgDiagKernelNormalizer.h>
-#include <shogun/kernel/normalize/RidgeKernelNormalizer.h>
+#include <shogun/kernel/normalizer/AvgDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/RidgeKernelNormalizer.h>
 #include <shogun/kernel/CauchyKernel.h>
 #include <shogun/kernel/Chi2Kernel.h>
 #include <shogun/kernel/CombinedKernel.h>
@@ -18,10 +18,10 @@
 #include <shogun/kernel/CustomKernel.h>
 #include <shogun/kernel/DiagKernel.h>
 #include <shogun/kernel/DistantSegmentsKernel.h>
-#include <shogun/kernel/normalize/DiceKernelNormalizer.h>
+#include <shogun/kernel/normalizer/DiceKernelNormalizer.h>
 #include <shogun/kernel/ExponentialKernel.h>
-#include <shogun/kernel/normalize/ScatterKernelNormalizer.h>
-#include <shogun/kernel/normalize/VarianceKernelNormalizer.h>
+#include <shogun/kernel/normalizer/ScatterKernelNormalizer.h>
+#include <shogun/kernel/normalizer/VarianceKernelNormalizer.h>
 #include <shogun/kernel/DistanceKernel.h>
 #include <shogun/kernel/FixedDegreeStringKernel.h>
 #include <shogun/kernel/GaussianKernel.h>
@@ -30,7 +30,7 @@
 #include <shogun/kernel/GaussianShortRealKernel.h>
 #include <shogun/kernel/HistogramIntersectionKernel.h>
 #include <shogun/kernel/HistogramWordStringKernel.h>
-#include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
+#include <shogun/kernel/normalizer/IdentityKernelNormalizer.h>
 #include <shogun/kernel/InverseMultiQuadricKernel.h>
 #include <shogun/kernel/DotKernel.h>
 #include <shogun/kernel/LinearKernel.h>
@@ -55,9 +55,9 @@
 #include <shogun/kernel/SparseKernel.h>
 #include <shogun/kernel/SphericalKernel.h>
 #include <shogun/kernel/SplineKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/kernel/StringKernel.h>
-#include <shogun/kernel/normalize/TanimotoKernelNormalizer.h>
+#include <shogun/kernel/normalizer/TanimotoKernelNormalizer.h>
 #include <shogun/kernel/TensorProductPairKernel.h>
 #include <shogun/kernel/TStudentKernel.h>
 #include <shogun/kernel/WaveletKernel.h>
@@ -67,7 +67,7 @@
 #include <shogun/kernel/WeightedDegreeStringKernel.h>
 #include <shogun/kernel/WeightedDegreeRBFKernel.h>
 #include <shogun/kernel/SpectrumMismatchRBFKernel.h>
-#include <shogun/kernel/normalize/ZeroMeanCenterKernelNormalizer.h>
+#include <shogun/kernel/normalizer/ZeroMeanCenterKernelNormalizer.h>
 #include <shogun/kernel/RationalQuadraticKernel.h>
 #include <shogun/kernel/CircularKernel.h>
 #include <shogun/kernel/JensenShannonKernel.h>

diff --git a/src/shogun/kernel/CommUlongStringKernel.cpp b/src/shogun/kernel/CommUlongStringKernel.cpp
@@ -10,7 +10,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/kernel/CommUlongStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/StringFeatures.h>
 #include <shogun/io/SGIO.h>
 

diff --git a/src/shogun/kernel/CommWordStringKernel.cpp b/src/shogun/kernel/CommWordStringKernel.cpp
@@ -14,7 +14,7 @@
 #include <shogun/base/Parameter.h>
 
 #include <shogun/kernel/CommWordStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/StringFeatures.h>
 
 using namespace shogun;

diff --git a/src/shogun/kernel/FixedDegreeStringKernel.cpp b/src/shogun/kernel/FixedDegreeStringKernel.cpp
@@ -10,7 +10,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/kernel/FixedDegreeStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 #include <shogun/io/SGIO.h>

diff --git a/src/shogun/kernel/GaussianMatchStringKernel.cpp b/src/shogun/kernel/GaussianMatchStringKernel.cpp
@@ -11,7 +11,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/kernel/GaussianMatchStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/src/shogun/kernel/Kernel.cpp b/src/shogun/kernel/Kernel.cpp
@@ -22,7 +22,7 @@
 #include <shogun/base/Parallel.h>
 
 #include <shogun/kernel/Kernel.h>
-#include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
+#include <shogun/kernel/normalizer/IdentityKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/base/Parameter.h>
 

diff --git a/src/shogun/kernel/Kernel.h b/src/shogun/kernel/Kernel.h
@@ -22,7 +22,7 @@
 #include <shogun/features/FeatureTypes.h>
 #include <shogun/base/SGObject.h>
 #include <shogun/features/Features.h>
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 
 namespace shogun
 {

diff --git a/src/shogun/kernel/MatchWordStringKernel.cpp b/src/shogun/kernel/MatchWordStringKernel.cpp
@@ -12,7 +12,7 @@
 #include <shogun/mathematics/Math.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/kernel/MatchWordStringKernel.h>
-#include <shogun/kernel/normalize/AvgDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/AvgDiagKernelNormalizer.h>
 #include <shogun/features/StringFeatures.h>
 
 using namespace shogun;

diff --git a/src/shogun/kernel/OligoStringKernel.cpp b/src/shogun/kernel/OligoStringKernel.cpp
@@ -12,7 +12,7 @@
  *
  */
 #include <shogun/kernel/OligoStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/StringFeatures.h>
 
 #include <map>

diff --git a/src/shogun/kernel/PolyKernel.cpp b/src/shogun/kernel/PolyKernel.cpp
@@ -13,7 +13,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/kernel/PolyKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/DotFeatures.h>
 
 using namespace shogun;

diff --git a/src/shogun/kernel/PolyMatchStringKernel.cpp b/src/shogun/kernel/PolyMatchStringKernel.cpp
@@ -11,7 +11,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/kernel/PolyMatchStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/src/shogun/kernel/PolyMatchWordStringKernel.cpp b/src/shogun/kernel/PolyMatchWordStringKernel.cpp
@@ -11,7 +11,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/kernel/PolyMatchWordStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/src/shogun/kernel/SNPStringKernel.cpp b/src/shogun/kernel/SNPStringKernel.cpp
@@ -11,7 +11,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/kernel/SNPStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/src/shogun/kernel/WeightedDegreePositionStringKernel.cpp b/src/shogun/kernel/WeightedDegreePositionStringKernel.cpp
@@ -16,7 +16,7 @@
 #include <shogun/base/Parallel.h>
 
 #include <shogun/kernel/WeightedDegreePositionStringKernel.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/src/shogun/kernel/WeightedDegreeStringKernel.cpp b/src/shogun/kernel/WeightedDegreeStringKernel.cpp
@@ -17,7 +17,7 @@
 #include <shogun/base/Parallel.h>
 
 #include <shogun/kernel/WeightedDegreeStringKernel.h>
-#include <shogun/kernel/normalize/FirstElementKernelNormalizer.h>
+#include <shogun/kernel/normalizer/FirstElementKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/...ernel/normalize/AvgDiagKernelNormalizer.h → ...rnel/normalizer/AvgDiagKernelNormalizer.h b/...ernel/normalize/AvgDiagKernelNormalizer.h → ...rnel/normalizer/AvgDiagKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _AVGDIAGKERNELNORMALIZER_H___
 #define _AVGDIAGKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 namespace shogun
 {
 /** @brief Normalize the kernel by either a constant or the average value of the

diff --git a/...n/kernel/normalize/DiceKernelNormalizer.h → .../kernel/normalizer/DiceKernelNormalizer.h b/...n/kernel/normalize/DiceKernelNormalizer.h → .../kernel/normalizer/DiceKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _DICEKERNELNORMALIZER_H___
 #define _DICEKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 #include <shogun/kernel/CommWordStringKernel.h>
 
 namespace shogun

diff --git a/.../normalize/FirstElementKernelNormalizer.h → ...normalizer/FirstElementKernelNormalizer.h b/.../normalize/FirstElementKernelNormalizer.h → ...normalizer/FirstElementKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _FIRSTELEMENTKERNELNORMALIZER_H___
 #define _FIRSTELEMENTKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 
 namespace shogun
 {

diff --git a/...rnel/normalize/IdentityKernelNormalizer.h → ...nel/normalizer/IdentityKernelNormalizer.h b/...rnel/normalize/IdentityKernelNormalizer.h → ...nel/normalizer/IdentityKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _IDENTITYKERNELNORMALIZER_H___
 #define _IDENTITYKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 
 namespace shogun
 {

diff --git a/...hogun/kernel/normalize/KernelNormalizer.h → ...ogun/kernel/normalizer/KernelNormalizer.h b/...hogun/kernel/normalize/KernelNormalizer.h → ...ogun/kernel/normalizer/KernelNormalizer.h
diff --git a/.../kernel/normalize/RidgeKernelNormalizer.h → ...kernel/normalizer/RidgeKernelNormalizer.h b/.../kernel/normalize/RidgeKernelNormalizer.h → ...kernel/normalizer/RidgeKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _RIDGEKERNELNORMALIZER_H___
 #define _RIDGEKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 
 namespace shogun
 {

diff --git a/...ernel/normalize/ScatterKernelNormalizer.h → ...rnel/normalizer/ScatterKernelNormalizer.h b/...ernel/normalize/ScatterKernelNormalizer.h → ...rnel/normalizer/ScatterKernelNormalizer.h
@@ -11,8 +11,8 @@
 #ifndef _SCATTERKERNELNORMALIZER_H___
 #define _SCATTERKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
-#include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/IdentityKernelNormalizer.h>
 #include <shogun/kernel/Kernel.h>
 #include <shogun/labels/Labels.h>
 #include <shogun/labels/MulticlassLabels.h>

diff --git a/...rnel/normalize/SqrtDiagKernelNormalizer.h → ...nel/normalizer/SqrtDiagKernelNormalizer.h b/...rnel/normalize/SqrtDiagKernelNormalizer.h → ...nel/normalizer/SqrtDiagKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _SQRTDIAGKERNELNORMALIZER_H___
 #define _SQRTDIAGKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 #include <shogun/kernel/CommWordStringKernel.h>
 
 namespace shogun

diff --git a/...rnel/normalize/TanimotoKernelNormalizer.h → ...nel/normalizer/TanimotoKernelNormalizer.h b/...rnel/normalize/TanimotoKernelNormalizer.h → ...nel/normalizer/TanimotoKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _TANIMOTOKERNELNORMALIZER_H___
 #define _TANIMOTOKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 #include <shogun/kernel/CommWordStringKernel.h>
 
 namespace shogun

diff --git a/...rnel/normalize/VarianceKernelNormalizer.h → ...nel/normalizer/VarianceKernelNormalizer.h b/...rnel/normalize/VarianceKernelNormalizer.h → ...nel/normalizer/VarianceKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _VARIANCEKERNELNORMALIZER_H___
 #define _VARIANCEKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 
 namespace shogun
 {

diff --git a/...ormalize/ZeroMeanCenterKernelNormalizer.h → ...rmalizer/ZeroMeanCenterKernelNormalizer.h b/...ormalize/ZeroMeanCenterKernelNormalizer.h → ...rmalizer/ZeroMeanCenterKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _ZEROMEANCENTERKERNELNORMALIZER_H___
 #define _ZEROMEANCENTERKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 
 namespace shogun
 {

diff --git a/src/shogun/multiclass/ScatterSVM.cpp b/src/shogun/multiclass/ScatterSVM.cpp
@@ -14,7 +14,7 @@
 
 #include <shogun/kernel/Kernel.h>
 #include <shogun/multiclass/ScatterSVM.h>
-#include <shogun/kernel/normalize/ScatterKernelNormalizer.h>
+#include <shogun/kernel/normalizer/ScatterKernelNormalizer.h>
 #include <shogun/multiclass/MulticlassOneVsRestStrategy.h>
 #include <shogun/io/SGIO.h>
 

diff --git a/src/shogun/transfer/multitask/MultitaskKernelMaskNormalizer.h b/src/shogun/transfer/multitask/MultitaskKernelMaskNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _MULTITASKKERNELMASKNORMALIZER_H___
 #define _MULTITASKKERNELMASKNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 #include <shogun/kernel/Kernel.h>
 #include <set>
 #include <string>

diff --git a/src/shogun/transfer/multitask/MultitaskKernelMaskPairNormalizer.h b/src/shogun/transfer/multitask/MultitaskKernelMaskPairNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _MULTITASKKERNELMASKPAIRNORMALIZER_H___
 #define _MULTITASKKERNELMASKPAIRNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 #include <shogun/kernel/Kernel.h>
 
 #include <string>

diff --git a/src/shogun/transfer/multitask/MultitaskKernelNormalizer.h b/src/shogun/transfer/multitask/MultitaskKernelNormalizer.h
@@ -11,7 +11,7 @@
 #ifndef _MULTITASKKERNELNORMALIZER_H___
 #define _MULTITASKKERNELNORMALIZER_H___
 
-#include <shogun/kernel/normalize/KernelNormalizer.h>
+#include <shogun/kernel/normalizer/KernelNormalizer.h>
 #include <shogun/kernel/Kernel.h>
 #include <algorithm>
 #include <vector>

diff --git a/src/shogun/ui/GUIKernel.cpp b/src/shogun/ui/GUIKernel.cpp
@@ -47,15 +47,15 @@
 #include <shogun/kernel/OligoStringKernel.h>
 #include <shogun/kernel/DistanceKernel.h>
 #include <shogun/kernel/TensorProductPairKernel.h>
-#include <shogun/kernel/normalize/AvgDiagKernelNormalizer.h>
-#include <shogun/kernel/normalize/RidgeKernelNormalizer.h>
-#include <shogun/kernel/normalize/FirstElementKernelNormalizer.h>
-#include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
-#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
-#include <shogun/kernel/normalize/VarianceKernelNormalizer.h>
-#include <shogun/kernel/normalize/ScatterKernelNormalizer.h>
+#include <shogun/kernel/normalizer/AvgDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/RidgeKernelNormalizer.h>
+#include <shogun/kernel/normalizer/FirstElementKernelNormalizer.h>
+#include <shogun/kernel/normalizer/IdentityKernelNormalizer.h>
+#include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
+#include <shogun/kernel/normalizer/VarianceKernelNormalizer.h>
+#include <shogun/kernel/normalizer/ScatterKernelNormalizer.h>
 #include <shogun/classifier/svm/SVM.h>
-#include <shogun/kernel/normalize/ZeroMeanCenterKernelNormalizer.h>
+#include <shogun/kernel/normalizer/ZeroMeanCenterKernelNormalizer.h>
 #include <shogun/kernel/WaveletKernel.h>
 
 #include <string.h>