use SGVector<char> as workaround for SGVector<void>

shogun-toolbox · Oct 12, 2011 · 49c5ef7 · 49c5ef7
1 parent 2440e3a
commit 49c5ef7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/src/shogun/features/Features.h b/src/shogun/features/Features.h
@@ -257,7 +257,7 @@ class CFeatures : public CSGObject
 		 * @param indices indices of feature elements to copy
 		 * @return new CFeatures instance with copies of feature data
 		 */
-		CFeatures* copy_subset(SGVector<index_t> indices);
+		virtual CFeatures* copy_subset(SGVector<index_t> indices);
 
 	private:
 		/** feature properties */

diff --git a/src/shogun/modelselection/ModelSelectionParameters.cpp b/src/shogun/modelselection/ModelSelectionParameters.cpp
@@ -66,8 +66,8 @@ CModelSelectionParameters::~CModelSelectionParameters()
 void CModelSelectionParameters::append_child(CModelSelectionParameters* child)
 {
 	/* only possible if there are no values set */
-	//FIXME void if (m_values.vector)
-	//FIXME void 	SG_ERROR("not possible to append child: there already is a range\n");
+	if (m_values.vector)
+		SG_ERROR("not possible to append child: there already is a range\n");
 
 	/* do a basic check if the add is possible */
 	if (m_sgobject)
@@ -98,7 +98,7 @@ void CModelSelectionParameters::set_values(SGVector<T> values)
 {
 	/* possibly delete old range values */
 	delete_values();
-	//FIXME void m_values=values;
+	m_values=(SGVector<char>) values;
 }
 
 void CModelSelectionParameters::build_values(float64_t min, float64_t max,
@@ -139,8 +139,8 @@ void CModelSelectionParameters::build_values(EMSParamType value_type, void* min,
 				*((float64_t*)step),
 				*((float64_t*)type_base));
 
-		//FIXME void m_values.vector=(void*)values.vector;
-		//FIXME void m_values.vlen=values.vlen;
+		m_values.vector=(char*)values.vector;
+		m_values.vlen=values.vlen;
 	}
 	else if (value_type==MSPT_INT32)
 	{
@@ -151,8 +151,8 @@ void CModelSelectionParameters::build_values(EMSParamType value_type, void* min,
 				*((int32_t*)step),
 				*((int32_t*)type_base));
 
-		//FIXME void m_values.vector=(void*)values.vector;
-		//FIXME void m_values.vlen=values.vlen;
+		m_values.vector=(char*)values.vector;
+		m_values.vlen=values.vlen;
 	}
 	else if (value_type==MSPT_NONE)
 	{
@@ -173,7 +173,6 @@ CDynamicObjectArray<CParameterCombination>* CModelSelectionParameters::get_combi
 	 * build trees of Parameter instances which each contain one value
 	 */
 
-	/* FIXME void
 	if (m_values.vector)
 	{
 		for (index_t i=0; i<m_values.vlen; ++i)
@@ -201,7 +200,7 @@ CDynamicObjectArray<CParameterCombination>* CModelSelectionParameters::get_combi
 		}
 
 		return result;
-	}*/
+	}
 
 
 	/* two cases here, similar
@@ -225,12 +224,10 @@ CDynamicObjectArray<CParameterCombination>* CModelSelectionParameters::get_combi
 			CModelSelectionParameters* current=m_child_nodes->get_element(i);
 
 			/* split children with values and children with other */
-	/* FIXME void
 			if (current->m_values.vector)
 				value_children.append_element(current);
 			else
 				non_value_children.append_element(current);
-	*/
 
 			SG_UNREF(current);
 		}
@@ -419,8 +416,7 @@ void CModelSelectionParameters::print_tree(int prefix_num)
 		}
 		else
 		{
-			/* FIXME
-			void if (m_values.vector)
+			if (m_values.vector)
 			{
 				// value node
 				SG_PRINT("%s%s with values: ", prefix, m_node_name);
@@ -443,7 +439,6 @@ void CModelSelectionParameters::print_tree(int prefix_num)
 			}
 			else
 				SG_PRINT("root\n");
-			*/
 		}
 	}
 
@@ -452,7 +447,6 @@ void CModelSelectionParameters::print_tree(int prefix_num)
 
 void CModelSelectionParameters::delete_values()
 {
-	/* FIXME void
 	if (m_values.vector)
 	{
 		switch (m_value_type)
@@ -470,5 +464,5 @@ void CModelSelectionParameters::delete_values()
 			SG_ERROR("Unknown type for model selection parameter!\n");
 			break;
 		}
-	}*/
+	}
 }
diff --git a/src/shogun/modelselection/ModelSelectionParameters.h b/src/shogun/modelselection/ModelSelectionParameters.h
@@ -147,8 +147,7 @@ class CModelSelectionParameters: public CSGObject
 private:
 	CSGObject* m_sgobject;
 	const char* m_node_name;
-	//FIXME void is not possible w/ SGVector<void> m_values;
-	void* m_values;
+	SGVector<char> m_values; // dummy void type char
 	CDynamicObjectArray<CModelSelectionParameters>* m_child_nodes;
 	EMSParamType m_value_type;
 };