Added int constructors for labels

shogun-toolbox · Jan 3, 2012 · 5197553 · 5197553
1 parent 87ba5fe
commit 5197553
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/shogun/features/Labels.cpp b/src/shogun/features/Labels.cpp
@@ -42,6 +42,34 @@ CLabels::CLabels(SGVector<float64_t> src)
 	m_num_classes=get_num_classes();
 }
 
+CLabels::CLabels(SGVector<int32_t> src)
+: CSGObject()
+{
+	init();
+
+	SGVector<float64_t> converted(src.vlen);	
+	for (int32_t i=0; i<src.vlen; i++)
+		converted[i] = (float64_t)src[i];
+	src.free_vector();		
+
+	set_labels(converted);
+	m_num_classes=get_num_classes();
+}
+
+CLabels::CLabels(SGVector<int64_t> src)
+: CSGObject()
+{
+	init();
+
+	SGVector<float64_t> converted(src.vlen);	
+	for (int32_t i=0; i<src.vlen; i++)
+		converted[i] = (float64_t)src[i];
+	src.free_vector();		
+
+	set_labels(converted);
+	m_num_classes=get_num_classes();
+}
+
 void CLabels::set_to_one()
 {
 	ASSERT(labels.vector);

diff --git a/src/shogun/features/Labels.h b/src/shogun/features/Labels.h
@@ -50,6 +50,18 @@ class CLabels : public CSGObject
 		 */
 		CLabels(SGVector<float64_t> src);
 
+		/** constructor
+		 * 
+		 * @param labels labels 
+		 */
+		CLabels(SGVector<int32_t> labels);
+
+		/** constructor
+		 * 
+		 * @param labels labels 
+		 */
+		CLabels(SGVector<int64_t> labels);
+
 		/** constructor
 		 *
 		 * @param loader File object via which to load data