Improvements in StreamingStringFeatures and reindentation of ParseBuf…

…fer.
shogun-toolbox · Aug 26, 2011 · 66c4ffd · 66c4ffd
1 parent 4a4d755
commit 66c4ffd
Show file tree

Hide file tree

Showing 3 changed files with 304 additions and 288 deletions.
diff --git a/src/shogun/features/StreamingStringFeatures.h b/src/shogun/features/StreamingStringFeatures.h
@@ -69,7 +69,7 @@ template <class T> class CStreamingStringFeatures : public CStreamingFeatures
 	~CStreamingStringFeatures()
 	{
 		parser.end_parser();
-		SG_FREE(current_string);
+		SG_UNREF(alphabet);
 	}
 
 	/** 
@@ -102,6 +102,9 @@ template <class T> class CStreamingStringFeatures : public CStreamingFeatures
 	 */
 	void use_alphabet(EAlphabet alpha)
 	{
+		if (alphabet)
+			SG_UNREF(alphabet);
+
 		alphabet=new CAlphabet(alpha);
 		SG_REF(alphabet);
 		num_symbols=alphabet->get_num_symbols();
@@ -115,6 +118,9 @@ template <class T> class CStreamingStringFeatures : public CStreamingFeatures
 	 */
 	void use_alphabet(CAlphabet* alpha)
 	{
+		if (alphabet)
+			SG_UNREF(alphabet);
+
 		alphabet=new CAlphabet(alpha);
 		SG_REF(alphabet);
 		num_symbols=alphabet->get_num_symbols();
@@ -375,7 +381,7 @@ void CStreamingStringFeatures<T>::init()
 {
 	working_file=NULL;
 	alphabet=new CAlphabet();
-	
+
 	current_string=NULL;
 	current_length=-1;
 	current_sgstring.string=current_string;
@@ -391,6 +397,8 @@ void CStreamingStringFeatures<T>::init(CStreamingFile* file,
 	has_labels=is_labelled;
 	working_file=file;
 	parser.init(file, is_labelled, size);
+	parser.set_free_vector_after_release(false);
+	parser.set_free_vectors_on_destruct(false);
 }
 
 template <class T>