fix a few crashers related to sgvector transition

shogun-toolbox · May 4, 2012 · f46645d · f46645d
1 parent 392ab41
commit f46645d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/shogun/evaluation/CrossValidation.cpp b/src/shogun/evaluation/CrossValidation.cpp
@@ -179,8 +179,6 @@ CrossValidationResult CCrossValidation::evaluate()
 		result.conf_int_up=0;
 	}
 
-	SG_FREE(results.vector);
-
 	/* unlock machine if it was locked in this method */
 	if (m_machine->is_data_locked() && m_do_unlock)
 	{
@@ -309,8 +307,5 @@ float64_t CCrossValidation::evaluate_one_run()
 	float64_t mean=CStatistics::mean(
 			SGVector <float64_t> (results, num_subsets));
 
-	/* clean up */
-	SG_FREE(results);
-
 	return mean;
 }
diff --git a/src/shogun/modelselection/ModelSelectionParameters.cpp b/src/shogun/modelselection/ModelSelectionParameters.cpp
@@ -139,8 +139,8 @@ void CModelSelectionParameters::build_values(EMSParamType value_type, void* min,
 				*((float64_t*)step),
 				*((float64_t*)type_base));
 
-		m_values.vector=(char*)values.vector;
-		m_values.vlen=values.vlen;
+		m_values = SGVector<char>((char*) values.vector, values.vlen);
+
 	}
 	else if (value_type==MSPT_INT32)
 	{
@@ -150,9 +150,7 @@ void CModelSelectionParameters::build_values(EMSParamType value_type, void* min,
 				type,
 				*((int32_t*)step),
 				*((int32_t*)type_base));
-
-		m_values.vector=(char*)values.vector;
-		m_values.vlen=values.vlen;
+		m_values = SGVector<char>((char*) values.vector, values.vlen);
 	}
 	else if (value_type==MSPT_NONE)
 	{
@@ -458,10 +456,10 @@ void CModelSelectionParameters::delete_values()
 		switch (m_value_type)
 		{
 		case MSPT_FLOAT64:
-			SG_FREE((float64_t*) m_values.vector);
+			m_values.unref();
 			break;
 		case MSPT_INT32:
-			SG_FREE((int32_t*) m_values.vector);
+			m_values.unref();
 			break;
 		case MSPT_NONE:
 			SG_ERROR("Value node has no type!\n");

diff --git a/src/shogun/modelselection/ModelSelectionParameters.h b/src/shogun/modelselection/ModelSelectionParameters.h
@@ -172,7 +172,7 @@ template <class T> SGVector<T> create_range_array(T min, T max,
 
 	/* create value vector */
 	index_t num_values=CMath::round(max-min)/step+1;
-	SGVector<T> result(num_values);
+	SGVector<T> result(num_values, false);
 
 	/* fill array */
 	for (index_t i=0; i<num_values; ++i)