anagram: naive approach, iteration 1

cpp/anagram/anagram.cpp

@@ -1,8 +1,6 @@
 #include "anagram.h"
 
 #include <algorithm>
-#include <locale>
-#include <iostream>
 
 
 namespace anagram {
@@ -11,45 +9,48 @@ namespace anagram {
 using namespace std;
 
 
-static inline string normalize(const string &str)
+namespace {
+
+struct Helper
 {
-    string result = str;
+    Helper(const string &str, const locale &loc)
+    {
+        lowercase = str;
+        transform(lowercase.begin(), lowercase.end(),
+                  lowercase.begin(), [=](char c){return tolower(c, loc);});
 
-    transform(result.begin(), result.end(),
+        normalized = lowercase;
-            result.begin(),
+        sort(normalized.begin(), normalized.end());
-            [](char c){return tolower(c);});
+    }
 
-    sort(result.begin(), result.end());
+    string lowercase;
+    string normalized;
+};
 
-    cout << str << " -> " << result << endl;
-
-    return result;
 }
 
 anagram::anagram(const string &_key)
+  : key(_key)
 {
-    cout << "New test, key=" << _key << endl;
-    key = normalize(_key);
 }
 
 StringContainer
-anagram::matches(const StringContainer &input) const
+anagram::matches(const StringContainer &input,
+                 const locale &loc) const
 {
     StringContainer result(input.size());
 
-    cout << "Input: {";
+    const Helper key_helper(key, loc);
-    for (auto s : input)
+
-        cout << s << " ";
+    auto is_anagram = [=](const string &str) {
-    cout << "}" << endl;
+
+        Helper helper(str, loc);
+        return helper.normalized == key_helper.normalized
+            && helper.lowercase  != key_helper.lowercase;
+    };
 
     auto iter = copy_if(input.cbegin(), input.cend(),
-            result.begin(),
+                        result.begin(), is_anagram);
-            [=](const string &s){return key == normalize(s);});
-
-    cout << "Output: {";
-    for (auto s : result)
-        cout << s << " ";
-    cout << "}" << endl;
 
     result.resize(distance(result.begin(), iter));
 

cpp/anagram/anagram.h

@@ -3,6 +3,7 @@
 #define EXERCISM_RUN_ALL_TESTS
 
 #include <list>
+#include <locale>
 #include <string>
 
 
@@ -19,7 +20,8 @@ public:
 
     anagram(const std::string &_key);
 
-    StringContainer matches(const StringContainer &input) const;
+    StringContainer matches(const StringContainer &input,
+                            const std::locale &locale = std::locale()) const;
 };
 
 }