src/arff/arff.cpp

@@ -90,7 +90,6 @@ namespace ARFF {
         for (AttributeType type : attributeList) {
             std::cout << type.attribute << " (" << type.values.size() << "):";
             for (std::string value : type.values) {
-                if (value == "?") { continue; }
                 std::cout << " " << value;
             }
             std::cout << '\n';
@@ -114,10 +113,10 @@ namespace ARFF {
         parser >> token;
         // Signifies beginning of data
         // Might add a boolean later to mark this
-        if (token == "@data" || token == "@DATA") {
+        if (token == "@data") {
             return;
         }
-        if (token == "@relation" || token == "@RELATION") {
+        if (token == "@relation") {
             parser >> token;
             relation = token;
             LogInfo("ARFF/Attribute", "Relation set: " + relation);
@@ -126,10 +125,8 @@ namespace ARFF {
         parser >> token;
         attributeList.emplace_back(token);
         LogInfo("ARFF/Attribute", "Added attribute: " + token);
-        while (std::getline(parser, token, ',')) {
+        while (parser >> token) {
             // Clean token from outside pieces
-            token.erase(std::remove(token.begin(), token.end(), ' '), token.end());
-            token.erase(std::remove(token.begin(), token.end(), '\t'), token.end());
             token.erase(std::remove(token.begin(), token.end(), '{'), token.end());
             token.erase(std::remove(token.begin(), token.end(), '}'), token.end());
             token.erase(std::remove(token.begin(), token.end(), ','), token.end());
@@ -138,8 +135,6 @@ namespace ARFF {
             attributeList.back().AddValue(token);
             LogInfo("ARFF/Attribute", "Added value: " + token);
         }
-        // Additional missing value case
-        attributeList.back().AddValue("?");
     }
 
     // Add data to runtime database
@@ -152,7 +147,6 @@ namespace ARFF {
         LogInfo("ARFF/Data", "Added id: " + std::to_string(database.back().id));
         for (int i = 0; i < attributeList.size(); ++i) {
             std::getline(parser, token, ',');
-            token.erase(std::remove(token.begin(), token.end(), ' '), token.end());
             token.erase(std::remove(token.begin(), token.end(), '\r'), token.end());
             token.erase(std::remove(token.begin(), token.end(), '\n'), token.end());
             database.back().values.at(i) = token;