Moved string kernels to separate dir

shogun-toolbox · Aug 11, 2012 · 6cf79ef · 6cf79ef
1 parent 52369c9
commit 6cf79ef
Show file tree

Hide file tree

Showing 59 changed files with 123 additions and 123 deletions.
diff --git a/examples/undocumented/libshogun/modelselection_grid_search_string_kernel.cpp b/examples/undocumented/libshogun/modelselection_grid_search_string_kernel.cpp
@@ -18,7 +18,7 @@
 #include <shogun/labels/BinaryLabels.h>
 #include <shogun/features/StringFeatures.h>
 #include <shogun/classifier/svm/LibSVM.h>
-#include <shogun/kernel/DistantSegmentsKernel.h>
+#include <shogun/kernel/string/DistantSegmentsKernel.h>
 
 
 using namespace shogun;

diff --git a/examples/undocumented/libshogun/modelselection_model_selection_parameters_test.cpp b/examples/undocumented/libshogun/modelselection_model_selection_parameters_test.cpp
@@ -14,7 +14,7 @@
 #include <shogun/kernel/GaussianKernel.h>
 #include <shogun/kernel/PowerKernel.h>
 #include <shogun/distance/MinkowskiMetric.h>
-#include <shogun/kernel/DistantSegmentsKernel.h>
+#include <shogun/kernel/string/DistantSegmentsKernel.h>
 
 using namespace shogun;
 

diff --git a/examples/undocumented/libshogun/modelselection_parameter_tree.cpp b/examples/undocumented/libshogun/modelselection_parameter_tree.cpp
@@ -17,7 +17,7 @@
 #include <shogun/kernel/LinearKernel.h>
 #include <shogun/distance/MinkowskiMetric.h>
 #include <shogun/distance/EuclideanDistance.h>
-#include <shogun/kernel/DistantSegmentsKernel.h>
+#include <shogun/kernel/string/DistantSegmentsKernel.h>
 #include <shogun/regression/gp/ExactInferenceMethod.h>
 #include <shogun/regression/gp/GaussianLikelihood.h>
 #include <shogun/regression/gp/ZeroMean.h>

diff --git a/examples/undocumented/libshogun/parameter_modsel_parameters.cpp b/examples/undocumented/libshogun/parameter_modsel_parameters.cpp
@@ -11,7 +11,7 @@
 #include <shogun/lib/config.h>
 #include <shogun/classifier/svm/LibSVM.h>
 #include <shogun/classifier/svm/LibLinear.h>
-#include <shogun/kernel/DistantSegmentsKernel.h>
+#include <shogun/kernel/string/DistantSegmentsKernel.h>
 #include <shogun/kernel/GaussianKernel.h>
 #include <shogun/kernel/PowerKernel.h>
 #include <shogun/distance/MinkowskiMetric.h>

diff --git a/examples/undocumented/libshogun/parameter_set_from_parameters.cpp b/examples/undocumented/libshogun/parameter_set_from_parameters.cpp
@@ -12,7 +12,7 @@
 #include <shogun/io/SGIO.h>
 #include <shogun/mathematics/Math.h>
 #include <shogun/base/Parameter.h>
-#include <shogun/kernel/DistantSegmentsKernel.h>
+#include <shogun/kernel/string/DistantSegmentsKernel.h>
 #include <shogun/kernel/GaussianKernel.h>
 
 using namespace shogun;

diff --git a/src/interfaces/modular/Kernel.i b/src/interfaces/modular/Kernel.i
@@ -111,7 +111,7 @@ namespace shogun
 }
 
 /* Templated Class StringKernel */
-%include <shogun/kernel/StringKernel.h>
+%include <shogun/kernel/string/StringKernel.h>
 namespace shogun
 {
 #ifdef USE_FLOAT64
@@ -156,51 +156,51 @@ namespace shogun
 %include <shogun/kernel/Chi2Kernel.h>
 %include <shogun/kernel/CombinedKernel.h>
 %include <shogun/kernel/ProductKernel.h>
-%include <shogun/kernel/CommUlongStringKernel.h>
-%include <shogun/kernel/CommWordStringKernel.h>
+%include <shogun/kernel/string/CommUlongStringKernel.h>
+%include <shogun/kernel/string/CommWordStringKernel.h>
 %include <shogun/kernel/ConstKernel.h>
 %include <shogun/kernel/CustomKernel.h>
 %include <shogun/kernel/DiagKernel.h>
 %include <shogun/kernel/DistanceKernel.h>
-%include <shogun/kernel/DistantSegmentsKernel.h>
+%include <shogun/kernel/string/DistantSegmentsKernel.h>
 %include <shogun/kernel/ExponentialKernel.h>
-%include <shogun/kernel/FixedDegreeStringKernel.h>
+%include <shogun/kernel/string/FixedDegreeStringKernel.h>
 %include <shogun/kernel/GaussianKernel.h>
 %include <shogun/kernel/DirectorKernel.h>
 %include <shogun/kernel/GaussianShiftKernel.h>
 %include <shogun/kernel/GaussianShortRealKernel.h>
 %include <shogun/kernel/HistogramIntersectionKernel.h>
-%include <shogun/kernel/HistogramWordStringKernel.h>
+%include <shogun/kernel/string/HistogramWordStringKernel.h>
 %include <shogun/kernel/InverseMultiQuadricKernel.h>
 %include <shogun/kernel/LinearKernel.h>
-%include <shogun/kernel/LinearStringKernel.h>
-%include <shogun/kernel/SparseSpatialSampleStringKernel.h>
-%include <shogun/kernel/LocalAlignmentStringKernel.h>
-%include <shogun/kernel/LocalityImprovedStringKernel.h>
-%include <shogun/kernel/MatchWordStringKernel.h>
-%include <shogun/kernel/OligoStringKernel.h>
+%include <shogun/kernel/string/LinearStringKernel.h>
+%include <shogun/kernel/string/SparseSpatialSampleStringKernel.h>
+%include <shogun/kernel/string/LocalAlignmentStringKernel.h>
+%include <shogun/kernel/string/LocalityImprovedStringKernel.h>
+%include <shogun/kernel/string/MatchWordStringKernel.h>
+%include <shogun/kernel/string/OligoStringKernel.h>
 %include <shogun/kernel/PolyKernel.h>
-%include <shogun/kernel/PolyMatchStringKernel.h>
+%include <shogun/kernel/string/PolyMatchStringKernel.h>
 %include <shogun/kernel/PowerKernel.h>
 %include <shogun/kernel/LogKernel.h>
-%include <shogun/kernel/GaussianMatchStringKernel.h>
-%include <shogun/kernel/SNPStringKernel.h>
-%include <shogun/kernel/RegulatoryModulesStringKernel.h>
-%include <shogun/kernel/PolyMatchWordStringKernel.h>
-%include <shogun/kernel/SalzbergWordStringKernel.h>
+%include <shogun/kernel/string/GaussianMatchStringKernel.h>
+%include <shogun/kernel/string/SNPStringKernel.h>
+%include <shogun/kernel/string/RegulatoryModulesStringKernel.h>
+%include <shogun/kernel/string/PolyMatchWordStringKernel.h>
+%include <shogun/kernel/string/SalzbergWordStringKernel.h>
 %include <shogun/kernel/SigmoidKernel.h>
-%include <shogun/kernel/SimpleLocalityImprovedStringKernel.h>
+%include <shogun/kernel/string/SimpleLocalityImprovedStringKernel.h>
 %include <shogun/kernel/SphericalKernel.h>
 %include <shogun/kernel/SplineKernel.h>
 %include <shogun/kernel/TensorProductPairKernel.h>
 %include <shogun/kernel/TStudentKernel.h>
 %include <shogun/kernel/WaveKernel.h>
 %include <shogun/kernel/WaveletKernel.h>
-%include <shogun/kernel/WeightedCommWordStringKernel.h>
-%include <shogun/kernel/WeightedDegreePositionStringKernel.h>
-%include <shogun/kernel/WeightedDegreeStringKernel.h>
+%include <shogun/kernel/string/WeightedCommWordStringKernel.h>
+%include <shogun/kernel/string/WeightedDegreePositionStringKernel.h>
+%include <shogun/kernel/string/WeightedDegreeStringKernel.h>
 %include <shogun/kernel/WeightedDegreeRBFKernel.h>
-%include <shogun/kernel/SpectrumMismatchRBFKernel.h>
+%include <shogun/kernel/string/SpectrumMismatchRBFKernel.h>
 %include <shogun/kernel/MultiquadricKernel.h>
 %include <shogun/kernel/RationalQuadraticKernel.h>
 %include <shogun/kernel/JensenShannonKernel.h>
diff --git a/src/interfaces/modular/Kernel_includes.i b/src/interfaces/modular/Kernel_includes.i
@@ -11,62 +11,62 @@
 #include <shogun/kernel/Chi2Kernel.h>
 #include <shogun/kernel/CombinedKernel.h>
 #include <shogun/kernel/ProductKernel.h>
-#include <shogun/kernel/CommUlongStringKernel.h>
-#include <shogun/kernel/CommWordStringKernel.h>
+#include <shogun/kernel/string/CommUlongStringKernel.h>
+#include <shogun/kernel/string/CommWordStringKernel.h>
 #include <shogun/kernel/CircularKernel.h>
 #include <shogun/kernel/ConstKernel.h>
 #include <shogun/kernel/CustomKernel.h>
 #include <shogun/kernel/DiagKernel.h>
-#include <shogun/kernel/DistantSegmentsKernel.h>
+#include <shogun/kernel/string/DistantSegmentsKernel.h>
 #include <shogun/kernel/normalizer/DiceKernelNormalizer.h>
 #include <shogun/kernel/ExponentialKernel.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/string/FixedDegreeStringKernel.h>
 #include <shogun/kernel/GaussianKernel.h>
 #include <shogun/kernel/DirectorKernel.h>
 #include <shogun/kernel/GaussianShiftKernel.h>
 #include <shogun/kernel/GaussianShortRealKernel.h>
 #include <shogun/kernel/HistogramIntersectionKernel.h>
-#include <shogun/kernel/HistogramWordStringKernel.h>
+#include <shogun/kernel/string/HistogramWordStringKernel.h>
 #include <shogun/kernel/normalizer/IdentityKernelNormalizer.h>
 #include <shogun/kernel/InverseMultiQuadricKernel.h>
 #include <shogun/kernel/DotKernel.h>
 #include <shogun/kernel/LinearKernel.h>
-#include <shogun/kernel/LinearStringKernel.h>
-#include <shogun/kernel/SparseSpatialSampleStringKernel.h>
-#include <shogun/kernel/LocalAlignmentStringKernel.h>
-#include <shogun/kernel/LocalityImprovedStringKernel.h>
-#include <shogun/kernel/MatchWordStringKernel.h>
+#include <shogun/kernel/string/LinearStringKernel.h>
+#include <shogun/kernel/string/SparseSpatialSampleStringKernel.h>
+#include <shogun/kernel/string/LocalAlignmentStringKernel.h>
+#include <shogun/kernel/string/LocalityImprovedStringKernel.h>
+#include <shogun/kernel/string/MatchWordStringKernel.h>
 #include <shogun/kernel/MultiquadricKernel.h>
-#include <shogun/kernel/OligoStringKernel.h>
+#include <shogun/kernel/string/OligoStringKernel.h>
 #include <shogun/kernel/PolyKernel.h>
-#include <shogun/kernel/PolyMatchStringKernel.h>
+#include <shogun/kernel/string/PolyMatchStringKernel.h>
 #include <shogun/kernel/PowerKernel.h>
 #include <shogun/kernel/LogKernel.h>
-#include <shogun/kernel/GaussianMatchStringKernel.h>
-#include <shogun/kernel/SNPStringKernel.h>
-#include <shogun/kernel/RegulatoryModulesStringKernel.h>
-#include <shogun/kernel/PolyMatchWordStringKernel.h>
-#include <shogun/kernel/SalzbergWordStringKernel.h>
+#include <shogun/kernel/string/GaussianMatchStringKernel.h>
+#include <shogun/kernel/string/SNPStringKernel.h>
+#include <shogun/kernel/string/RegulatoryModulesStringKernel.h>
+#include <shogun/kernel/string/PolyMatchWordStringKernel.h>
+#include <shogun/kernel/string/SalzbergWordStringKernel.h>
 #include <shogun/kernel/SigmoidKernel.h>
-#include <shogun/kernel/SimpleLocalityImprovedStringKernel.h>
+#include <shogun/kernel/string/SimpleLocalityImprovedStringKernel.h>
 #include <shogun/kernel/SparseKernel.h>
 #include <shogun/kernel/SphericalKernel.h>
 #include <shogun/kernel/SplineKernel.h>
 #include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 #include <shogun/kernel/normalizer/TanimotoKernelNormalizer.h>
 #include <shogun/kernel/TensorProductPairKernel.h>
 #include <shogun/kernel/TStudentKernel.h>
 #include <shogun/kernel/WaveletKernel.h>
 #include <shogun/kernel/WaveKernel.h>
-#include <shogun/kernel/WeightedCommWordStringKernel.h>
-#include <shogun/kernel/WeightedDegreePositionStringKernel.h>
-#include <shogun/kernel/WeightedDegreeStringKernel.h>
+#include <shogun/kernel/string/WeightedCommWordStringKernel.h>
+#include <shogun/kernel/string/WeightedDegreePositionStringKernel.h>
+#include <shogun/kernel/string/WeightedDegreeStringKernel.h>
 #include <shogun/kernel/WeightedDegreeRBFKernel.h>
-#include <shogun/kernel/SpectrumMismatchRBFKernel.h>
+#include <shogun/kernel/string/SpectrumMismatchRBFKernel.h>
 #include <shogun/kernel/normalizer/ZeroMeanCenterKernelNormalizer.h>
 #include <shogun/kernel/RationalQuadraticKernel.h>
 #include <shogun/kernel/CircularKernel.h>

diff --git a/src/shogun/kernel/normalizer/DiceKernelNormalizer.h b/src/shogun/kernel/normalizer/DiceKernelNormalizer.h
@@ -12,7 +12,7 @@
 #define _DICEKERNELNORMALIZER_H___
 
 #include <shogun/kernel/normalizer/KernelNormalizer.h>
-#include <shogun/kernel/CommWordStringKernel.h>
+#include <shogun/kernel/string/CommWordStringKernel.h>
 
 namespace shogun
 {

diff --git a/src/shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h b/src/shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h
@@ -12,7 +12,7 @@
 #define _SQRTDIAGKERNELNORMALIZER_H___
 
 #include <shogun/kernel/normalizer/KernelNormalizer.h>
-#include <shogun/kernel/CommWordStringKernel.h>
+#include <shogun/kernel/string/CommWordStringKernel.h>
 
 namespace shogun
 {

diff --git a/src/shogun/kernel/normalizer/TanimotoKernelNormalizer.h b/src/shogun/kernel/normalizer/TanimotoKernelNormalizer.h
@@ -12,7 +12,7 @@
 #define _TANIMOTOKERNELNORMALIZER_H___
 
 #include <shogun/kernel/normalizer/KernelNormalizer.h>
-#include <shogun/kernel/CommWordStringKernel.h>
+#include <shogun/kernel/string/CommWordStringKernel.h>
 
 namespace shogun
 {

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

diff --git a/src/shogun/kernel/CommUlongStringKernel.h → ...gun/kernel/string/CommUlongStringKernel.h b/src/shogun/kernel/CommUlongStringKernel.h → ...gun/kernel/string/CommUlongStringKernel.h
@@ -14,7 +14,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/mathematics/Math.h>
 #include <shogun/lib/DynamicArray.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 
 namespace shogun
 {

diff --git a/src/shogun/kernel/CommWordStringKernel.cpp → ...un/kernel/string/CommWordStringKernel.cpp b/src/shogun/kernel/CommWordStringKernel.cpp → ...un/kernel/string/CommWordStringKernel.cpp
@@ -13,7 +13,7 @@
 
 #include <shogun/base/Parameter.h>
 
-#include <shogun/kernel/CommWordStringKernel.h>
+#include <shogun/kernel/string/CommWordStringKernel.h>
 #include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/src/shogun/kernel/CommWordStringKernel.h → ...ogun/kernel/string/CommWordStringKernel.h b/src/shogun/kernel/CommWordStringKernel.h → ...ogun/kernel/string/CommWordStringKernel.h
@@ -14,7 +14,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/mathematics/Math.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 
 namespace shogun
 {

diff --git a/src/shogun/kernel/DistantSegmentsKernel.cpp → ...n/kernel/string/DistantSegmentsKernel.cpp b/src/shogun/kernel/DistantSegmentsKernel.cpp → ...n/kernel/string/DistantSegmentsKernel.cpp
@@ -9,7 +9,7 @@
  * Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
  */
 
-#include <shogun/kernel/DistantSegmentsKernel.h>
+#include <shogun/kernel/string/DistantSegmentsKernel.h>
 #include <string>
 
 using namespace shogun;

diff --git a/src/shogun/kernel/DistantSegmentsKernel.h → ...gun/kernel/string/DistantSegmentsKernel.h b/src/shogun/kernel/DistantSegmentsKernel.h → ...gun/kernel/string/DistantSegmentsKernel.h
@@ -12,7 +12,7 @@
 #ifndef DISTANTSEGMENTSKERNEL_H_
 #define DISTANTSEGMENTSKERNEL_H_
 
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 
 namespace shogun
 {

diff --git a/...shogun/kernel/FixedDegreeStringKernel.cpp → ...kernel/string/FixedDegreeStringKernel.cpp b/...shogun/kernel/FixedDegreeStringKernel.cpp → ...kernel/string/FixedDegreeStringKernel.cpp
@@ -9,7 +9,7 @@
  */
 
 #include <shogun/lib/common.h>
-#include <shogun/kernel/FixedDegreeStringKernel.h>
+#include <shogun/kernel/string/FixedDegreeStringKernel.h>
 #include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>

diff --git a/src/shogun/kernel/FixedDegreeStringKernel.h → ...n/kernel/string/FixedDegreeStringKernel.h b/src/shogun/kernel/FixedDegreeStringKernel.h → ...n/kernel/string/FixedDegreeStringKernel.h
@@ -12,7 +12,7 @@
 #define _FIXEDDEGREESTRINGKERNEL_H___
 
 #include <shogun/lib/common.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 
 namespace shogun
 {

diff --git a/...ogun/kernel/GaussianMatchStringKernel.cpp → ...rnel/string/GaussianMatchStringKernel.cpp b/...ogun/kernel/GaussianMatchStringKernel.cpp → ...rnel/string/GaussianMatchStringKernel.cpp
@@ -10,7 +10,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
-#include <shogun/kernel/GaussianMatchStringKernel.h>
+#include <shogun/kernel/string/GaussianMatchStringKernel.h>
 #include <shogun/kernel/normalizer/SqrtDiagKernelNormalizer.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>

diff --git a/...shogun/kernel/GaussianMatchStringKernel.h → ...kernel/string/GaussianMatchStringKernel.h b/...shogun/kernel/GaussianMatchStringKernel.h → ...kernel/string/GaussianMatchStringKernel.h
@@ -12,7 +12,7 @@
 #define _GAUSSIANMATCHSTRINGKERNEL_H___
 
 #include <shogun/lib/common.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 
 namespace shogun
 {

diff --git a/...ogun/kernel/HistogramWordStringKernel.cpp → ...rnel/string/HistogramWordStringKernel.cpp b/...ogun/kernel/HistogramWordStringKernel.cpp → ...rnel/string/HistogramWordStringKernel.cpp
@@ -10,7 +10,7 @@
  */
 
 #include <shogun/lib/common.h>
-#include <shogun/kernel/HistogramWordStringKernel.h>
+#include <shogun/kernel/string/HistogramWordStringKernel.h>
 #include <shogun/features/Features.h>
 #include <shogun/features/StringFeatures.h>
 #include <shogun/classifier/PluginEstimate.h>

diff --git a/...shogun/kernel/HistogramWordStringKernel.h → ...kernel/string/HistogramWordStringKernel.h b/...shogun/kernel/HistogramWordStringKernel.h → ...kernel/string/HistogramWordStringKernel.h
@@ -13,7 +13,7 @@
 #define _HISTOGRAMWORDKERNEL_H___
 
 #include <shogun/lib/common.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 #include <shogun/classifier/PluginEstimate.h>
 #include <shogun/features/StringFeatures.h>
 

diff --git a/src/shogun/kernel/LinearStringKernel.cpp → ...ogun/kernel/string/LinearStringKernel.cpp b/src/shogun/kernel/LinearStringKernel.cpp → ...ogun/kernel/string/LinearStringKernel.cpp
@@ -11,7 +11,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/mathematics/Math.h>
-#include <shogun/kernel/LinearStringKernel.h>
+#include <shogun/kernel/string/LinearStringKernel.h>
 #include <shogun/features/StringFeatures.h>
 
 using namespace shogun;

diff --git a/src/shogun/kernel/LinearStringKernel.h → ...shogun/kernel/string/LinearStringKernel.h b/src/shogun/kernel/LinearStringKernel.h → ...shogun/kernel/string/LinearStringKernel.h
@@ -12,7 +12,7 @@
 #define _LINEARSTRINGKERNEL_H___
 
 #include <shogun/lib/common.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 
 namespace shogun
 {

diff --git a/...gun/kernel/LocalAlignmentStringKernel.cpp → ...nel/string/LocalAlignmentStringKernel.cpp b/...gun/kernel/LocalAlignmentStringKernel.cpp → ...nel/string/LocalAlignmentStringKernel.cpp
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <ctype.h>
 #include <string.h>
-#include <shogun/kernel/LocalAlignmentStringKernel.h>
+#include <shogun/kernel/string/LocalAlignmentStringKernel.h>
 
 using namespace shogun;
 

diff --git a/...hogun/kernel/LocalAlignmentStringKernel.h → ...ernel/string/LocalAlignmentStringKernel.h b/...hogun/kernel/LocalAlignmentStringKernel.h → ...ernel/string/LocalAlignmentStringKernel.h
@@ -12,7 +12,7 @@
 #define _LOCALALIGNMENTSTRINGKERNEL_H___
 
 #include <shogun/lib/common.h>
-#include <shogun/kernel/StringKernel.h>
+#include <shogun/kernel/string/StringKernel.h>
 
 namespace shogun
 {

diff --git a/...n/kernel/LocalityImprovedStringKernel.cpp → ...l/string/LocalityImprovedStringKernel.cpp b/...n/kernel/LocalityImprovedStringKernel.cpp → ...l/string/LocalityImprovedStringKernel.cpp
@@ -11,7 +11,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/io/SGIO.h>
-#include <shogun/kernel/LocalityImprovedStringKernel.h>
+#include <shogun/kernel/string/LocalityImprovedStringKernel.h>
 #include <shogun/features/StringFeatures.h>
 
 using namespace shogun;