Add meta example features-char-string

shogun-toolbox · Dec 13, 2018 · be01de6 · be01de6
1 parent d751f66
commit be01de6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/examples/meta/generator/targets/cpp.json b/examples/meta/generator/targets/cpp.json
@@ -45,7 +45,7 @@
     "Type": {
         "RealFeatures": "DenseFeatures<float64_t>",
         "RealSubsetFeatures": "DenseSubsetFeatures<float64_t>",
-        "StringCharFeatures": "CStringFeatures<char>",
+        "StringCharFeatures": "StringFeatures<char>",
         "Default": "$typeName",
         "bool": "bool",
         "string": "char*",

diff --git a/examples/meta/src/features/string_char.sg b/examples/meta/src/features/string_char.sg
@@ -0,0 +1,10 @@
+File words = csv_file("../../data/words.dat")
+
+#![create_features]
+Features f = string_features(words, enum EAlphabet.RAWBYTE)
+#![create_features]
+
+#![output stat]
+int max_string_length = f.get_int("max_string_length")
+int number_of_strings = f.get_num_vectors()
+#![output stat]
diff --git a/src/shogun/features/StringFeatures.h b/src/shogun/features/StringFeatures.h
@@ -20,6 +20,7 @@
 #include <shogun/features/Features.h>
 #include <shogun/features/Alphabet.h>
 #include <shogun/lib/SGString.h>
+#include <shogun/lib/SGStringList.h>
 
 namespace shogun
 {

diff --git a/src/shogun/util/factory.h b/src/shogun/util/factory.h
@@ -96,16 +96,16 @@ namespace shogun
 	}
 
 	CFeatures* string_features(
-	    CFile* file, EAlphabet alpha = DNA,
-	    EPrimitiveType primitive_type = PT_CHAR)
+	    CFile* file, machine_int_t alphabet_type = DNA,
+	    machine_int_t primitive_type = PT_CHAR)
 	{
 		REQUIRE(file, "No file provided.\n");
 		CFeatures* result = nullptr;
 
 		switch (primitive_type)
 		{
 		case PT_CHAR:
-			result = new CStringFeatures<char>(file, alpha);
+			result = new CStringFeatures<char>(file, static_cast<EAlphabet>(alphabet_type));
 			break;
 		default:
 			SG_SNOTIMPLEMENTED