Input format for map changed

Author: kimden

task1/map.cpp

@@ -5,19 +5,18 @@
 
 int main(int argc, char** argv) {
 
-    // std::cerr << "Map params:";
-    // for(int i = 0; i < argc; ++i){
-    //     std::cerr << " " << argv[i];
-    // }
+	// std::cerr << "Map params:";
+	// for(int i = 0; i < argc; ++i){
+	//     std::cerr << " " << argv[i];
+	// }
     // std::cerr << std::endl;
 
-    std::string str;
-    std::stringstream sstr;
-    while(std::cin >> str){
-        sstr.clear();
-        sstr.str(str);
-        while(sstr >> str){
-            std::cout << str << "\t" << 1 << std::endl;
-        }
-    }
+	std::string str, key, value;
+	std::stringstream sstr;
+	while(std::getline(std::cin, str)){
+		int div = str.find('\t');
+		key = str.substr(0, div);
+		value = str.substr(div + 1, str.length() -  div - 1);
+		std::cout << value << "\t" << 1 << std::endl;
+	}
 }

task1/mapreduce.cpp

@@ -25,7 +25,7 @@ int main(int argc, char** argv) {
             std::cerr << "Reduce:\tpath_to_program reduce path_to_reduce_script (script parameters) input_file output_file" << std::endl;
             std::cerr << "Help:\tpath_to_program help" << std::endl;
             std::cerr << std::endl;
-            std::cerr << "Each line of input file for reduce operation must contain tab-separated values: \"key \\t value\"" << std::endl;
+            std::cerr << "Each line of input file must contain tab-separated values: \"key \\t value\"" << std::endl;
             std::cerr << "Each line of output file will contain tab-separated values: \"key \\t value\"" << std::endl;
             std::cerr << std::endl;
             return 0;

task1/reduce.cpp

@@ -5,23 +5,26 @@
 
 int main(int argc, char** argv) {
 
-    // std::cerr << "Reduce params:";
-    // for(int i = 0; i < argc; ++i){
-    //     std::cerr << " " << argv[i];
-    // }
-    // std::cerr << std::endl;
+	// std::cerr << "Reduce params:";
+	// for(int i = 0; i < argc; ++i){
+	//     std::cerr << " " << argv[i];
+	// }
+	// std::cerr << std::endl;
 
-    std::string str;
-    std::string key;
-    int value;
-    int result = 0;
-    std::stringstream sstr;
-    for(; std::getline(std::cin, str);){
-        sstr.clear();
-        sstr.str(str);
-        sstr >> key;
-        sstr >> value;
-        result += value;
-    }
-    std::cout << key << "\t" << result << std::endl;
+	std::string str;
+	std::string key;
+	std::string value;
+	int val;
+	int result = 0;
+	std::stringstream sstr;
+	for(; std::getline(std::cin, str);){
+		int div = str.find('\t');
+		key = str.substr(0, div);
+		value = str.substr(div + 1, str.length() -  div - 1);
+		sstr.clear();
+		sstr.str(value);
+		sstr >> val;
+		result += val;
+	}
+	std::cout << key << "\t" << result << std::endl;
 }