Skip to content

Commit

Permalink
Moved normalizers to special directory in kernels
Browse files Browse the repository at this point in the history
  • Loading branch information
@lisitsyn
lisitsyn committed Jun 18, 2012
1 parent c3bfbbe commit 70d6259
Show file tree
Hide file tree
Showing 21 changed files with 40 additions and 38 deletions.
21 changes: 11 additions & 10 deletions src/interfaces/modular/Kernel.i
View file
Expand Up @@ -137,12 +137,20 @@ namespace shogun
#endif
}

%include <shogun/kernel/KernelNormalizer.h>
%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/PyramidChi2.h>
%include <shogun/kernel/ANOVAKernel.h>
%include <shogun/kernel/AUCKernel.h>
%include <shogun/kernel/AvgDiagKernelNormalizer.h>
%include <shogun/kernel/RidgeKernelNormalizer.h>
%include <shogun/kernel/CauchyKernel.h>
%include <shogun/kernel/CircularKernel.h>
%include <shogun/kernel/Chi2Kernel.h>
Expand All @@ -153,9 +161,6 @@ namespace shogun
%include <shogun/kernel/ConstKernel.h>
%include <shogun/kernel/CustomKernel.h>
%include <shogun/kernel/DiagKernel.h>
%include <shogun/kernel/DiceKernelNormalizer.h>
%include <shogun/kernel/ScatterKernelNormalizer.h>
%include <shogun/kernel/VarianceKernelNormalizer.h>
%include <shogun/kernel/DistanceKernel.h>
%include <shogun/kernel/DistantSegmentsKernel.h>
%include <shogun/kernel/ExponentialKernel.h>
Expand All @@ -166,7 +171,6 @@ namespace shogun
%include <shogun/kernel/GaussianShortRealKernel.h>
%include <shogun/kernel/HistogramIntersectionKernel.h>
%include <shogun/kernel/HistogramWordStringKernel.h>
%include <shogun/kernel/IdentityKernelNormalizer.h>
%include <shogun/kernel/InverseMultiQuadricKernel.h>
%include <shogun/kernel/LinearKernel.h>
%include <shogun/kernel/LinearStringKernel.h>
Expand All @@ -188,8 +192,6 @@ namespace shogun
%include <shogun/kernel/SimpleLocalityImprovedStringKernel.h>
%include <shogun/kernel/SphericalKernel.h>
%include <shogun/kernel/SplineKernel.h>
%include <shogun/kernel/SqrtDiagKernelNormalizer.h>
%include <shogun/kernel/TanimotoKernelNormalizer.h>
%include <shogun/kernel/TensorProductPairKernel.h>
%include <shogun/kernel/TStudentKernel.h>
%include <shogun/kernel/WaveKernel.h>
Expand All @@ -199,7 +201,6 @@ namespace shogun
%include <shogun/kernel/WeightedDegreeStringKernel.h>
%include <shogun/kernel/WeightedDegreeRBFKernel.h>
%include <shogun/kernel/SpectrumMismatchRBFKernel.h>
%include <shogun/kernel/ZeroMeanCenterKernelNormalizer.h>
%include <shogun/kernel/MultiquadricKernel.h>
%include <shogun/kernel/RationalQuadraticKernel.h>
%include <shogun/kernel/JensenShannonKernel.h>
20 changes: 10 additions & 10 deletions src/interfaces/modular/Kernel_includes.i
View file
@@ -1,12 +1,12 @@
%{
#include <shogun/features/FeatureTypes.h>
#include <shogun/kernel/Kernel.h>
#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/PyramidChi2.h>
#include <shogun/kernel/ANOVAKernel.h>
#include <shogun/kernel/AUCKernel.h>
#include <shogun/kernel/AvgDiagKernelNormalizer.h>
#include <shogun/kernel/RidgeKernelNormalizer.h>
#include <shogun/kernel/normalize/AvgDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/RidgeKernelNormalizer.h>
#include <shogun/kernel/CauchyKernel.h>
#include <shogun/kernel/Chi2Kernel.h>
#include <shogun/kernel/CombinedKernel.h>
Expand All @@ -18,10 +18,10 @@
#include <shogun/kernel/CustomKernel.h>
#include <shogun/kernel/DiagKernel.h>
#include <shogun/kernel/DistantSegmentsKernel.h>
#include <shogun/kernel/DiceKernelNormalizer.h>
#include <shogun/kernel/normalize/DiceKernelNormalizer.h>
#include <shogun/kernel/ExponentialKernel.h>
#include <shogun/kernel/ScatterKernelNormalizer.h>
#include <shogun/kernel/VarianceKernelNormalizer.h>
#include <shogun/kernel/normalize/ScatterKernelNormalizer.h>
#include <shogun/kernel/normalize/VarianceKernelNormalizer.h>
#include <shogun/kernel/DistanceKernel.h>
#include <shogun/kernel/FixedDegreeStringKernel.h>
#include <shogun/kernel/GaussianKernel.h>
Expand All @@ -30,7 +30,7 @@
#include <shogun/kernel/GaussianShortRealKernel.h>
#include <shogun/kernel/HistogramIntersectionKernel.h>
#include <shogun/kernel/HistogramWordStringKernel.h>
#include <shogun/kernel/IdentityKernelNormalizer.h>
#include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
#include <shogun/kernel/InverseMultiQuadricKernel.h>
#include <shogun/kernel/DotKernel.h>
#include <shogun/kernel/LinearKernel.h>
Expand All @@ -55,9 +55,9 @@
#include <shogun/kernel/SparseKernel.h>
#include <shogun/kernel/SphericalKernel.h>
#include <shogun/kernel/SplineKernel.h>
#include <shogun/kernel/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/normalize/SqrtDiagKernelNormalizer.h>
#include <shogun/kernel/StringKernel.h>
#include <shogun/kernel/TanimotoKernelNormalizer.h>
#include <shogun/kernel/normalize/TanimotoKernelNormalizer.h>
#include <shogun/kernel/TensorProductPairKernel.h>
#include <shogun/kernel/TStudentKernel.h>
#include <shogun/kernel/WaveletKernel.h>
Expand All @@ -67,7 +67,7 @@
#include <shogun/kernel/WeightedDegreeStringKernel.h>
#include <shogun/kernel/WeightedDegreeRBFKernel.h>
#include <shogun/kernel/SpectrumMismatchRBFKernel.h>
#include <shogun/kernel/ZeroMeanCenterKernelNormalizer.h>
#include <shogun/kernel/normalize/ZeroMeanCenterKernelNormalizer.h>
#include <shogun/kernel/RationalQuadraticKernel.h>
#include <shogun/kernel/CircularKernel.h>
#include <shogun/kernel/JensenShannonKernel.h>
Expand Down
4 changes: 4 additions & 0 deletions src/interfaces/modular/Machine.i
View file
Expand Up @@ -33,6 +33,7 @@
%enddef

namespace shogun {
/*
APPLY_MULTICLASS(CMulticlassMachine);
APPLY_MULTICLASS(CKernelMulticlassMachine);
APPLY_MULTICLASS(CLinearMulticlassMachine);
Expand All @@ -52,8 +53,10 @@ APPLY_REGRESSION(CLinearRidgeRegression);
APPLY_REGRESSION(CLeastSquaresRegression);
APPLY_REGRESSION(CLeastAngleRegression);
APPLY_REGRESSION(CGaussianProcessRegression);
*/
}

/*
%rename(apply_generic) CMachine::apply(CFeatures* data=NULL);
%rename(apply_generic) CMulticlassMachine::apply(CFeatures* data=NULL);
%rename(apply_generic) CKernelMulticlassMachine::apply(CFeatures* data=NULL);
Expand All @@ -72,6 +75,7 @@ APPLY_REGRESSION(CGaussianProcessRegression);
%rename(apply_generic) CLeastAngleRegression::apply(CFeatures* data=NULL);
%rename(apply_generic) CGaussianProcessRegression::apply(CFeatures* data=NULL);
%rename(apply_generic) CConjugateIndex::apply(CFeatures* data=NULL);
*/

#undef APPLY_MULTICLASS
#undef APPLY_BINARY
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/Kernel.h
View file
Expand Up @@ -22,7 +22,7 @@
#include <shogun/features/FeatureTypes.h>
#include <shogun/base/SGObject.h>
#include <shogun/features/Features.h>
#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>

namespace shogun
{
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/AvgDiagKernelNormalizer.h → ...ernel/normalize/AvgDiagKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _AVGDIAGKERNELNORMALIZER_H___
#define _AVGDIAGKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
namespace shogun
{
/** @brief Normalize the kernel by either a constant or the average value of the
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/DiceKernelNormalizer.h → ...n/kernel/normalize/DiceKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _DICEKERNELNORMALIZER_H___
#define _DICEKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/CommWordStringKernel.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion ...gun/kernel/FirstElementKernelNormalizer.h → .../normalize/FirstElementKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _FIRSTELEMENTKERNELNORMALIZER_H___
#define _FIRSTELEMENTKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>

namespace shogun
{
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/IdentityKernelNormalizer.h → ...rnel/normalize/IdentityKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _IDENTITYKERNELNORMALIZER_H___
#define _IDENTITYKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>

namespace shogun
{
Expand Down
0 src/shogun/kernel/KernelNormalizer.h → ...hogun/kernel/normalize/KernelNormalizer.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/shogun/kernel/RidgeKernelNormalizer.h → .../kernel/normalize/RidgeKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _RIDGEKERNELNORMALIZER_H___
#define _RIDGEKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>

namespace shogun
{
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/kernel/ScatterKernelNormalizer.h → ...ernel/normalize/ScatterKernelNormalizer.h
View file
Expand Up @@ -11,8 +11,8 @@
#ifndef _SCATTERKERNELNORMALIZER_H___
#define _SCATTERKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/IdentityKernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/normalize/IdentityKernelNormalizer.h>
#include <shogun/kernel/Kernel.h>
#include <shogun/labels/Labels.h>
#include <shogun/labels/MulticlassLabels.h>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/SqrtDiagKernelNormalizer.h → ...rnel/normalize/SqrtDiagKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _SQRTDIAGKERNELNORMALIZER_H___
#define _SQRTDIAGKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/CommWordStringKernel.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/TanimotoKernelNormalizer.h → ...rnel/normalize/TanimotoKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _TANIMOTOKERNELNORMALIZER_H___
#define _TANIMOTOKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/CommWordStringKernel.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/kernel/VarianceKernelNormalizer.h → ...rnel/normalize/VarianceKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _VARIANCEKERNELNORMALIZER_H___
#define _VARIANCEKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>

namespace shogun
{
Expand Down
2 changes: 1 addition & 1 deletion ...n/kernel/ZeroMeanCenterKernelNormalizer.h → ...ormalize/ZeroMeanCenterKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _ZEROMEANCENTERKERNELNORMALIZER_H___
#define _ZEROMEANCENTERKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>

namespace shogun
{
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/transfer/multitask/MultitaskKernelMaskNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _MULTITASKKERNELMASKNORMALIZER_H___
#define _MULTITASKKERNELMASKNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/Kernel.h>
#include <set>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/transfer/multitask/MultitaskKernelMaskPairNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _MULTITASKKERNELMASKPAIRNORMALIZER_H___
#define _MULTITASKKERNELMASKPAIRNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/Kernel.h>

#include <string>
Expand Down
1 change: 0 additions & 1 deletion src/shogun/transfer/multitask/MultitaskKernelMklNormalizer.h
View file
Expand Up @@ -11,7 +11,6 @@
#ifndef _MULTITASKKERNELMKLNORMALIZER_H___
#define _MULTITASKKERNELMKLNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/transfer/multitask/MultitaskKernelMklNormalizer.h>
#include <shogun/kernel/Kernel.h>
#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/transfer/multitask/MultitaskKernelNormalizer.h
View file
Expand Up @@ -11,7 +11,7 @@
#ifndef _MULTITASKKERNELNORMALIZER_H___
#define _MULTITASKKERNELNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/kernel/normalize/KernelNormalizer.h>
#include <shogun/kernel/Kernel.h>
#include <algorithm>
#include <vector>
Expand Down
1 change: 0 additions & 1 deletion src/shogun/transfer/multitask/MultitaskKernelPlifNormalizer.h
View file
Expand Up @@ -11,7 +11,6 @@
#ifndef _MULTITASKKERNELPLIFNORMALIZER_H___
#define _MULTITASKKERNELPLIFNORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/transfer/multitask/MultitaskKernelMklNormalizer.h>
#include <shogun/kernel/Kernel.h>
#include <algorithm>
Expand Down
1 change: 0 additions & 1 deletion src/shogun/transfer/multitask/MultitaskKernelTreeNormalizer.h
View file
Expand Up @@ -11,7 +11,6 @@
#ifndef _MULTITASKKERNELTREENORMALIZER_H___
#define _MULTITASKKERNELTREENORMALIZER_H___

#include <shogun/kernel/KernelNormalizer.h>
#include <shogun/transfer/multitask/MultitaskKernelMklNormalizer.h>
#include <shogun/kernel/Kernel.h>
#include <algorithm>
Expand Down

0 comments on commit 70d6259

Please sign in to comment.