Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #587 from kmcquisten/master
Kernel normalizer references fix
  • Loading branch information
lisitsyn committed Jun 18, 2012
2 parents ccfeb3a + 0159ce6 commit aa9ad6a
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/shogun/kernel/CommUlongStringKernel.cpp
Expand Up @@ -10,7 +10,7 @@

#include <shogun/lib/common.h>
#include <shogun/kernel/CommUlongStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/StringFeatures.h>
#include <shogun/io/SGIO.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/CommWordStringKernel.cpp
Expand Up @@ -14,7 +14,7 @@
#include <shogun/base/Parameter.h>

#include <shogun/kernel/CommWordStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/StringFeatures.h>

using namespace shogun;
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/FixedDegreeStringKernel.cpp
Expand Up @@ -10,7 +10,7 @@

#include <shogun/lib/common.h>
#include <shogun/kernel/FixedDegreeStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/features/StringFeatures.h>
#include <shogun/io/SGIO.h>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/GaussianMatchStringKernel.cpp
Expand Up @@ -11,7 +11,7 @@
#include <shogun/lib/common.h>
#include <shogun/io/SGIO.h>
#include <shogun/kernel/GaussianMatchStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/features/StringFeatures.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/Kernel.cpp
Expand Up @@ -22,7 +22,7 @@
#include <shogun/base/Parallel.h>

#include <shogun/kernel/Kernel.h>
#include <shogun/kernel/IdentityKernelNormalizer.h>
#include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/base/Parameter.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/MatchWordStringKernel.cpp
Expand Up @@ -12,7 +12,7 @@
#include <shogun/mathematics/Math.h>
#include <shogun/io/SGIO.h>
#include <shogun/kernel/MatchWordStringKernel.h>
#include <shogun/kernel/AvgDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/AvgDiagKernelNormalizer.h>
#include <shogun/features/StringFeatures.h>

using namespace shogun;
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/OligoStringKernel.cpp
Expand Up @@ -12,7 +12,7 @@
*
*/
#include <shogun/kernel/OligoStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/StringFeatures.h>

#include <map>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/PolyKernel.cpp
Expand Up @@ -13,7 +13,7 @@
#include <shogun/lib/common.h>
#include <shogun/io/SGIO.h>
#include <shogun/kernel/PolyKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/DotFeatures.h>

using namespace shogun;
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/PolyMatchStringKernel.cpp
Expand Up @@ -11,7 +11,7 @@
#include <shogun/lib/common.h>
#include <shogun/io/SGIO.h>
#include <shogun/kernel/PolyMatchStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/features/StringFeatures.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/PolyMatchWordStringKernel.cpp
Expand Up @@ -11,7 +11,7 @@
#include <shogun/lib/common.h>
#include <shogun/io/SGIO.h>
#include <shogun/kernel/PolyMatchWordStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/features/StringFeatures.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/SNPStringKernel.cpp
Expand Up @@ -11,7 +11,7 @@
#include <shogun/lib/common.h>
#include <shogun/io/SGIO.h>
#include <shogun/kernel/SNPStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/features/StringFeatures.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/WeightedDegreePositionStringKernel.cpp
Expand Up @@ -16,7 +16,7 @@
#include <shogun/base/Parallel.h>

#include <shogun/kernel/WeightedDegreePositionStringKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/features/StringFeatures.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/WeightedDegreeStringKernel.cpp
Expand Up @@ -17,7 +17,7 @@
#include <shogun/base/Parallel.h>

#include <shogun/kernel/WeightedDegreeStringKernel.h>
#include <shogun/kernel/FirstElementKernelNormalizer.h>
#include <shogun/kernel/normalize/FirstElementKernelNormalizer.h>
#include <shogun/features/Features.h>
#include <shogun/features/StringFeatures.h>

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/multiclass/ScatterSVM.cpp
Expand Up @@ -14,7 +14,7 @@

#include <shogun/kernel/Kernel.h>
#include <shogun/multiclass/ScatterSVM.h>
#include <shogun/kernel/ScatterKernelNormalizer.h>
#include <shogun/kernel/normalize/ScatterKernelNormalizer.h>
#include <shogun/multiclass/MulticlassOneVsRestStrategy.h>
#include <shogun/io/SGIO.h>

Expand Down
16 changes: 8 additions & 8 deletions src/shogun/ui/GUIKernel.cpp
Expand Up @@ -47,15 +47,15 @@
#include <shogun/kernel/OligoStringKernel.h>
#include <shogun/kernel/DistanceKernel.h>
#include <shogun/kernel/TensorProductPairKernel.h>
#include <shogun/kernel/AvgDiagKernelNormalizer.h>
#include <shogun/kernel/RidgeKernelNormalizer.h>
#include <shogun/kernel/FirstElementKernelNormalizer.h>
#include <shogun/kernel/IdentityKernelNormalizer.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/VarianceKernelNormalizer.h>
#include <shogun/kernel/ScatterKernelNormalizer.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/classifier/svm/SVM.h>
#include <shogun/kernel/ZeroMeanCenterKernelNormalizer.h>
#include <shogun/kernel/normalize/ZeroMeanCenterKernelNormalizer.h>
#include <shogun/kernel/WaveletKernel.h>

#include <string.h>
Expand Down

0 comments on commit aa9ad6a

Please sign in to comment.