Included VwParser more cleanly in IO.i

shogun-toolbox · Aug 24, 2011 · 7cf81e6 · 7cf81e6
1 parent 6be180c
commit 7cf81e6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/src/interfaces/modular/Classifier.i b/src/interfaces/modular/Classifier.i
@@ -109,8 +109,6 @@
 %include <shogun/classifier/vw/VowpalWabbit.h>
 %include <shogun/classifier/svm/DomainAdaptationSVMLinear.h>
 
-enum E_VW_PARSER_TYPE { T_VW, T_SVMLIGHT, T_DENSE };
-
 #ifdef HAVE_PYTHON
 %pythoncode %{
   class SVM(CSVM):

diff --git a/src/interfaces/modular/IO.i b/src/interfaces/modular/IO.i
@@ -27,6 +27,7 @@
 %rename(SerializableXmlFile) CSerializableXmlFile;
 %rename(SimpleFile) CSimpleFile;
 %rename(MemoryMappedFile) CMemoryMappedFile;
+%rename(VwParser) CVwParser;
 
 %include <shogun/io/File.h>
 %include <shogun/io/StreamingFile.h>
@@ -70,6 +71,7 @@ namespace shogun
 
 %include <shogun/io/AsciiFile.h>
 %include <shogun/io/StreamingAsciiFile.h>
+%include <shogun/classifier/vw/VwParser.h>
 %include <shogun/io/StreamingVwFile.h>
 %include <shogun/io/StreamingVwCacheFile.h>
 %include <shogun/io/BinaryFile.h>

diff --git a/src/interfaces/modular/IO_includes.i b/src/interfaces/modular/IO_includes.i
@@ -9,6 +9,7 @@
 #include <shogun/io/StreamingFileFromSimpleFeatures.h>
 #include <shogun/io/AsciiFile.h>
 #include <shogun/io/StreamingAsciiFile.h>
+#include <shogun/classifier/vw/VwParser.h>
 #include <shogun/io/StreamingVwFile.h>
 #include <shogun/io/StreamingVwCacheFile.h>
 #include <shogun/io/BinaryFile.h>

diff --git a/src/shogun/classifier/vw/VwParser.h b/src/shogun/classifier/vw/VwParser.h
@@ -61,7 +61,7 @@ class CVwParser: public CSGObject
 	/**
 	 * Destructor
 	 */
-	~CVwParser();
+	virtual ~CVwParser();
 
 	/**
 	 * Get the environment

diff --git a/src/shogun/io/StreamingVwFile.cpp b/src/shogun/io/StreamingVwFile.cpp
@@ -72,4 +72,5 @@ void CStreamingVwFile::init()
 
 	set_parser_type(T_VW);
 	write_to_cache = false;
+	SG_REF(env);
 }