Skip to content

Commit

Permalink
Added VW to swig definitions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@frx
frx committed Aug 17, 2011
1 parent eb4c839 commit 79ae518
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 42 deletions.
2 changes: 2 additions & 0 deletions src/interfaces/modular/Classifier.i
View file
Expand Up @@ -54,6 +54,7 @@
%rename(MKLClassification) CMKLClassification;
%rename(MKLOneClass) CMKLOneClass;
%rename(MKLMultiClass) CMKLMultiClass;
%rename(VowpalWabbit) CVowpalWabbit;
#ifdef USE_SVMLIGHT
%rename(SVMLight) CSVMLight;
%rename(DomainAdaptationSVM) CDomainAdaptationSVM;
Expand Down Expand Up @@ -105,6 +106,7 @@
%include <shogun/classifier/mkl/MKLClassification.h>
%include <shogun/classifier/mkl/MKLOneClass.h>
%include <shogun/classifier/mkl/MKLMultiClass.h>
%include <shogun/classifier/vw/VowpalWabbit.h>
%include <shogun/classifier/svm/DomainAdaptationSVMLinear.h>

#ifdef HAVE_PYTHON
Expand Down
1 change: 1 addition & 0 deletions src/interfaces/modular/Classifier_includes.i
View file
Expand Up @@ -37,6 +37,7 @@
#include <shogun/classifier/mkl/MKLClassification.h>
#include <shogun/classifier/mkl/MKLOneClass.h>
#include <shogun/classifier/mkl/MKLMultiClass.h>
#include <shogun/classifier/vw/VowpalWabbit.h>
#ifdef USE_SVMLIGHT
#include <shogun/classifier/svm/SVMLight.h>
#include <shogun/classifier/svm/SVMLightOneClass.h>
Expand Down
6 changes: 4 additions & 2 deletions src/interfaces/modular/Features.i
View file
Expand Up @@ -25,6 +25,7 @@
%rename(StreamingFeatures) CStreamingFeatures;
%rename(DotFeatures) CDotFeatures;
%rename(StreamingDotFeatures) CStreamingDotFeatures;
%rename(StreamingVwFeatures) CStreamingVwFeatures;
%rename(DummyFeatures) CDummyFeatures;
%rename(AttributeFeatures) CAttributeFeatures;
%rename(Alphabet) CAlphabet;
Expand All @@ -48,9 +49,10 @@
%include <shogun/features/FeatureTypes.h>
%include <shogun/lib/Compressor.h>
%include <shogun/features/Features.h>
%include <shogun/features/StreamingFeatures.h>
%include <shogun/features/DotFeatures.h>
%include <shogun/features/StreamingFeatures.h>
%include <shogun/features/StreamingDotFeatures.h>
%include <shogun/features/StreamingVwFeatures.h>

/* Templated Class StringFeatures */
%include <shogun/features/StringFeatures.h>
Expand Down Expand Up @@ -145,7 +147,7 @@ namespace shogun
/* Templated Class StreamingSimpleFeatures */
%include <shogun/features/StreamingSimpleFeatures.h>
namespace shogun
{
{
%template(StreamingBoolFeatures) CStreamingSimpleFeatures<bool>;
%template(StreamingCharFeatures) CStreamingSimpleFeatures<char>;
%template(StreamingByteFeatures) CStreamingSimpleFeatures<uint8_t>;
Expand Down
45 changes: 5 additions & 40 deletions src/interfaces/modular/IO.i
View file
Expand Up @@ -15,6 +15,8 @@
%rename(StreamingFile) CStreamingFile;
%rename(AsciiFile) CAsciiFile;
%rename(StreamingAsciiFile) CStreamingAsciiFile;
%rename(StreamingVwFile) CStreamingVwFile;
%rename(StreamingVwCacheFile) CStreamingVwCacheFile;
%rename(StreamingFileFromFeatures) CStreamingFileFromFeatures;
%rename(BinaryFile) CBinaryFile;
%rename(HDF5File) CHDF5File;
Expand All @@ -27,48 +29,11 @@
%rename(MemoryMappedFile) CMemoryMappedFile;

%include <shogun/io/File.h>
%include <shogun/io/StreamingFile.h>
%include <shogun/io/StreamingFileFromFeatures.h>

/* Template Class StreamingFileFromSparseFeatures */
%include <shogun/io/StreamingFileFromSparseFeatures.h>
namespace shogun
{
%template(StreamingFileFromSparseBoolFeatures) CStreamingFileFromSparseFeatures<bool>;
%template(StreamingFileFromSparseCharFeatures) CStreamingFileFromSparseFeatures<char>;
%template(StreamingFileFromSparseByteFeatures) CStreamingFileFromSparseFeatures<uint8_t>;
%template(StreamingFileFromSparseShortFeatures) CStreamingFileFromSparseFeatures<int16_t>;
%template(StreamingFileFromSparseWordFeatures) CStreamingFileFromSparseFeatures<uint16_t>;
%template(StreamingFileFromSparseIntFeatures) CStreamingFileFromSparseFeatures<int32_t>;
%template(StreamingFileFromSparseUIntFeatures) CStreamingFileFromSparseFeatures<uint32_t>;
%template(StreamingFileFromSparseLongFeatures) CStreamingFileFromSparseFeatures<int64_t>;
%template(StreamingFileFromSparseUlongFeatures) CStreamingFileFromSparseFeatures<uint64_t>;
%template(StreamingFileFromSparseShortRealFeatures) CStreamingFileFromSparseFeatures<float32_t>;
%template(StreamingFileFromSparseRealFeatures) CStreamingFileFromSparseFeatures<float64_t>;
%template(StreamingFileFromSparseLongRealFeatures) CStreamingFileFromSparseFeatures<floatmax_t>;
}

/* Template Class StreamingFileFromSimpleFeatures */
%include <shogun/io/StreamingFileFromSimpleFeatures.h>
namespace shogun
{
%template(StreamingFileFromBoolFeatures) CStreamingFileFromSimpleFeatures<bool>;
%template(StreamingFileFromCharFeatures) CStreamingFileFromSimpleFeatures<char>;
%template(StreamingFileFromByteFeatures) CStreamingFileFromSimpleFeatures<uint8_t>;
%template(StreamingFileFromShortFeatures) CStreamingFileFromSimpleFeatures<int16_t>;
%template(StreamingFileFromWordFeatures) CStreamingFileFromSimpleFeatures<uint16_t>;
%template(StreamingFileFromIntFeatures) CStreamingFileFromSimpleFeatures<int32_t>;
%template(StreamingFileFromUIntFeatures) CStreamingFileFromSimpleFeatures<uint32_t>;
%template(StreamingFileFromLongFeatures) CStreamingFileFromSimpleFeatures<int64_t>;
%template(StreamingFileFromUlongFeatures) CStreamingFileFromSimpleFeatures<uint64_t>;
%template(StreamingFileFromShortRealFeatures) CStreamingFileFromSimpleFeatures<float32_t>;
%template(StreamingFileFromRealFeatures) CStreamingFileFromSimpleFeatures<float64_t>;
%template(StreamingFileFromLongRealFeatures) CStreamingFileFromSimpleFeatures<floatmax_t>;
}


%include <shogun/io/AsciiFile.h>
%include <shogun/io/StreamingFile.h>
%include <shogun/io/StreamingAsciiFile.h>
%include <shogun/io/StreamingVwFile.h>
%include <shogun/io/StreamingVwCacheFile.h>
%include <shogun/io/BinaryFile.h>
%include <shogun/io/HDF5File.h>
%include <shogun/io/SerializableFile.h>
Expand Down
2 changes: 2 additions & 0 deletions src/interfaces/modular/IO_includes.i
View file
Expand Up @@ -9,6 +9,8 @@
#include <shogun/io/StreamingFileFromSimpleFeatures.h>
#include <shogun/io/AsciiFile.h>
#include <shogun/io/StreamingAsciiFile.h>
#include <shogun/io/StreamingVwFile.h>
#include <shogun/io/StreamingVwCacheFile.h>
#include <shogun/io/BinaryFile.h>
#include <shogun/io/HDF5File.h>
#include <shogun/io/SerializableFile.h>
Expand Down

0 comments on commit 79ae518

Please sign in to comment.