fixed memory bug for streaming data parser and added unit-test

shogun-toolbox · Jul 1, 2016 · c613b04 · c613b04
1 parent ea78548
commit c613b04
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/src/shogun/features/streaming/StreamingDenseFeatures.cpp b/src/shogun/features/streaming/StreamingDenseFeatures.cpp
@@ -70,6 +70,7 @@ template<class T> void CStreamingDenseFeatures<T>::reset_stream()
 		parser.exit_parser();
 		parser.init(working_file, has_labels, 1);
 		parser.set_free_vector_after_release(false);
+		parser.set_free_vectors_on_destruct(false);
 		parser.start_parser();
 	}
 }

diff --git a/src/shogun/io/streaming/InputParser.h b/src/shogun/io/streaming/InputParser.h
@@ -403,6 +403,7 @@ template <class T>
     else
         example_type = E_UNLABELLED;
 
+	SG_UNREF(examples_ring);
     examples_ring = new CParseBuffer<T>(size);
     SG_REF(examples_ring);
 

diff --git a/tests/unit/features/StreamingDenseFeatures_unittest.cc b/tests/unit/features/StreamingDenseFeatures_unittest.cc
@@ -92,3 +92,33 @@ TEST(StreamingDenseFeaturesTest, example_reading_from_features)
 
 	SG_UNREF(feats);
 }
+
+TEST(StreamingDenseFeaturesTest, reset_stream)
+{
+	index_t n=20;
+	index_t dim=2;
+
+	SGMatrix<float64_t> data(dim,n);
+	for (index_t i=0; i<dim*n; ++i)
+		data.matrix[i]=sg_rand->std_normal_distrib();
+
+	CDenseFeatures<float64_t>* orig_feats=new CDenseFeatures<float64_t>(data);
+	CStreamingDenseFeatures<float64_t>* feats=new CStreamingDenseFeatures<float64_t>(orig_feats);
+
+	feats->start_parser();
+
+	CDenseFeatures<float64_t>* streamed=dynamic_cast<CDenseFeatures<float64_t>*>(feats->get_streamed_features(n));
+	ASSERT_TRUE(streamed!=nullptr);
+	ASSERT_TRUE(orig_feats->equals(streamed));
+	SG_UNREF(streamed);
+
+	feats->reset_stream();
+
+	streamed=dynamic_cast<CDenseFeatures<float64_t>*>(feats->get_streamed_features(n));
+	ASSERT_TRUE(streamed!=nullptr);
+	ASSERT_TRUE(orig_feats->equals(streamed));
+	SG_UNREF(streamed);
+
+	feats->end_parser();
+	SG_UNREF(feats);
+}