Fixed map memory handling for sgvector value case

shogun-toolbox · Aug 12, 2012 · a805d7f · a805d7f
1 parent a2eff59
commit a805d7f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp b/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp
@@ -217,6 +217,7 @@ int main(int argc, char **argv)
 	SG_UNREF(grad_search);
 	SG_UNREF(best_combination);
 	SG_UNREF(result);
+	SG_UNREF(mean);
 
 	exit_shogun();
 

diff --git a/examples/undocumented/libshogun/regression_gaussian_process_gaussian.cpp b/examples/undocumented/libshogun/regression_gaussian_process_gaussian.cpp
@@ -216,6 +216,7 @@ int main(int argc, char **argv)
 	SG_UNREF(grad_search);
 	SG_UNREF(best_combination);
 	SG_UNREF(result);
+	SG_UNREF(mean);
 
 	exit_shogun();
 

diff --git a/src/shogun/lib/Map.h b/src/shogun/lib/Map.h
@@ -436,12 +436,16 @@ IGNORE_IN_CLASSLIST template<class K, class T> class CMap: public CSGObject
 		{
 			for(int32_t i=0; i<array->get_num_elements(); i++)
 			{
-				if (array->get_element(i)!=NULL)
+				CMapNode<K, T>* element = array->get_element(i);
+				if (element!=NULL)
 				{
+					element->key = K();
+					element->data = T();
+
 					if (use_sg_mallocs)
-						SG_FREE(array->get_element(i));
+						SG_FREE(element);
 					else
-						free(array->get_element(i));
+						free(element);
 				}
 			}
 			delete array;