Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Refactored SLEP multitask
  • Loading branch information
lisitsyn committed Jun 15, 2012
1 parent bc2cf3e commit a1cbb5a
Show file tree
Hide file tree
Showing 21 changed files with 803 additions and 503 deletions.
4 changes: 0 additions & 4 deletions src/interfaces/modular/Regression.i
Expand Up @@ -19,8 +19,6 @@
%rename(LibLinearRegression) CLibLinearRegression;
%rename(MKL) CMKL;
%rename(MKLRegression) CMKLRegression;
%rename(IndicesTree) CIndicesTree;
%rename(FeatureTreeLeastSquaresRegression) CFeatureTreeLeastSquaresRegression;
#ifdef USE_SVMLIGHT
%rename(SVRLight) CSVRLight;
#endif //USE_SVMLIGHT
Expand All @@ -36,9 +34,7 @@
%include <shogun/regression/svr/LibLinearRegression.h>
%include <shogun/classifier/mkl/MKL.h>
%include <shogun/regression/svr/MKLRegression.h>
%include <shogun/lib/IndicesTree.h>
%include <shogun/machine/SLEPMachine.h>
%include <shogun/regression/FeatureTreeLeastSquaresRegression.h>

#ifdef USE_SVMLIGHT
%include <shogun/regression/svr/SVRLight.h>
Expand Down
2 changes: 0 additions & 2 deletions src/interfaces/modular/Regression_includes.i
Expand Up @@ -13,9 +13,7 @@
#include <shogun/regression/svr/LibLinearRegression.h>
#include <shogun/classifier/mkl/MKL.h>
#include <shogun/regression/svr/MKLRegression.h>
#include <shogun/lib/IndicesTree.h>
#include <shogun/machine/SLEPMachine.h>
#include <shogun/regression/FeatureTreeLeastSquaresRegression.h>
#ifdef USE_SVMLIGHT
#include <shogun/classifier/svm/SVMLight.h>
#include <shogun/regression/svr/SVRLight.h>
Expand Down
14 changes: 11 additions & 3 deletions src/interfaces/modular/Transfer.i
Expand Up @@ -16,6 +16,11 @@
%rename(MultitaskKernelMaskPairNormalizer) CMultitaskKernelMaskPairNormalizer;
%rename(MultitaskKernelPlifNormalizer) CMultitaskKernelPlifNormalizer;

%rename(Task) CTask;
%rename(TaskGroup) CTaskGroup;
%rename(TaskTree) CTaskTree;
%rename(MultitaskLSRegression) CMultitaskLSRegression;

%rename(LibLinearMTL) CLibLinearMTL;

/* Domain adaptation renames */
Expand All @@ -25,9 +30,6 @@
%rename(DomainAdaptationSVMLinear) CDomainAdaptationSVMLinear;


/* Includes */
%include <shogun/lib/IndicesTree.h>

/* Multitask includes */
%include <shogun/transfer/multitask/MultitaskKernelNormalizer.h>
%include <shogun/transfer/multitask/MultitaskKernelMklNormalizer.h>
Expand All @@ -36,6 +38,12 @@
%include <shogun/transfer/multitask/MultitaskKernelMaskPairNormalizer.h>
%include <shogun/transfer/multitask/MultitaskKernelPlifNormalizer.h>

%include <shogun/transfer/multitask/TaskRelation.h>
%include <shogun/transfer/multitask/Task.h>
%include <shogun/transfer/multitask/TaskGroup.h>
%include <shogun/transfer/multitask/TaskTree.h>
%include <shogun/transfer/multitask/MultitaskLSRegression.h>

%include <shogun/transfer/multitask/LibLinearMTL.h>

/* Domain adaptation includes */
Expand Down
8 changes: 6 additions & 2 deletions src/interfaces/modular/Transfer_includes.i
@@ -1,6 +1,4 @@
%{
#include <shogun/lib/IndicesTree.h>

#include <shogun/transfer/multitask/MultitaskKernelNormalizer.h>
#include <shogun/transfer/multitask/MultitaskKernelMklNormalizer.h>
#include <shogun/transfer/multitask/MultitaskKernelTreeNormalizer.h>
Expand All @@ -10,6 +8,12 @@

#include <shogun/transfer/multitask/LibLinearMTL.h>

#include <shogun/transfer/multitask/TaskRelation.h>
#include <shogun/transfer/multitask/Task.h>
#include <shogun/transfer/multitask/TaskGroup.h>
#include <shogun/transfer/multitask/TaskTree.h>
#include <shogun/transfer/multitask/MultitaskLSRegression.h>

#ifdef USE_SVMLIGHT
#include <shogun/transfer/domain_adaptation/DomainAdaptationSVM.h>
#endif /* USE_SVMLIGHT */
Expand Down
43 changes: 0 additions & 43 deletions src/shogun/lib/IndicesTree.cpp

This file was deleted.

174 changes: 0 additions & 174 deletions src/shogun/lib/IndicesTree.h

This file was deleted.

0 comments on commit a1cbb5a

Please sign in to comment.