Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Moved liblinear MTL to transfer folder and undo unnecessary stl includes
  • Loading branch information
lisitsyn committed Jun 8, 2012
1 parent c29a9b2 commit a85ee05
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 6 deletions.
1 change: 0 additions & 1 deletion src/.generate_link_dependencies.py
Expand Up @@ -27,7 +27,6 @@
deps['enumtypeunsafe.swg']=[]
deps['exception.i']=[]
deps['stdint.i']=[]
deps['std_vector.i']=[]
deps['modshogun_doxygen.i']=[]

modular_deps=['modshogun_doxygen.i']
Expand Down
2 changes: 0 additions & 2 deletions src/interfaces/modular/Classifier.i
Expand Up @@ -21,7 +21,6 @@
%rename(GPBTSVM) CGPBTSVM;
%rename(LDA) CLDA;
%rename(LibLinear) CLibLinear;
%rename(LibLinearMTL) CLibLinearMTL;
%rename(LibSVM) CLibSVM;
%rename(LibSVMOneClass) CLibSVMOneClass;
%rename(LinearMachine) CLinearMachine;
Expand Down Expand Up @@ -72,7 +71,6 @@
%include <shogun/classifier/svm/GPBTSVM.h>
%include <shogun/classifier/LDA.h>
%include <shogun/classifier/svm/LibLinear.h>
%include <shogun/classifier/svm/LibLinearMTL.h>
%include <shogun/classifier/svm/LibSVM.h>
%include <shogun/classifier/svm/LibSVMOneClass.h>
%include <shogun/classifier/LPBoost.h>
Expand Down
1 change: 0 additions & 1 deletion src/interfaces/modular/Classifier_includes.i
Expand Up @@ -5,7 +5,6 @@
#include <shogun/machine/DistanceMachine.h>
#include <shogun/classifier/LDA.h>
#include <shogun/classifier/svm/LibLinear.h>
#include <shogun/classifier/svm/LibLinearMTL.h>
#include <shogun/classifier/svm/LibSVM.h>
#include <shogun/classifier/svm/LibSVMOneClass.h>
#include <shogun/machine/LinearMachine.h>
Expand Down
4 changes: 4 additions & 0 deletions src/interfaces/modular/Transfer.i
Expand Up @@ -16,6 +16,8 @@
%rename(MultitaskKernelMaskPairNormalizer) CMultitaskKernelMaskPairNormalizer;
%rename(MultitaskKernelPlifNormalizer) CMultitaskKernelPlifNormalizer;

%rename(LibLinearMTL) CLibLinearMTL;

/* Domain adaptation renames */
#ifdef USE_SVMLIGHT
%rename(DomainAdaptationSVM) CDomainAdaptationSVM;
Expand All @@ -31,6 +33,8 @@
%include <shogun/transfer/multitask/MultitaskKernelMaskPairNormalizer.h>
%include <shogun/transfer/multitask/MultitaskKernelPlifNormalizer.h>

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

/* Domain adaptation includes */
#ifdef USE_SVMLIGHT
%include <shogun/transfer/domain_adaptation/DomainAdaptationSVM.h>
Expand Down
2 changes: 2 additions & 0 deletions src/interfaces/modular/Transfer_includes.i
Expand Up @@ -6,6 +6,8 @@
#include <shogun/transfer/multitask/MultitaskKernelMaskPairNormalizer.h>
#include <shogun/transfer/multitask/MultitaskKernelPlifNormalizer.h>

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

#ifdef USE_SVMLIGHT
#include <shogun/transfer/domain_adaptation/DomainAdaptationSVM.h>
#endif /* USE_SVMLIGHT */
Expand Down
Expand Up @@ -19,7 +19,7 @@
#include <shogun/lib/Signal.h>
#include <shogun/lib/Time.h>
#include <shogun/base/Parameter.h>
#include <shogun/classifier/svm/LibLinearMTL.h>
#include <shogun/transfer/multitask/LibLinearMTL.h>
#include <shogun/lib/external/tron.h>
#include <shogun/features/DotFeatures.h>

Expand Down
Expand Up @@ -289,7 +289,6 @@ class CLibLinearMTL : public CLinearMachine
/** duality gap */
float64_t duality_gap;


};

#endif //HAVE_LAPACK
Expand Down

0 comments on commit a85ee05

Please sign in to comment.