pair stack final

Author: schroedp

Trie.h

@@ -215,14 +215,29 @@ template<class T, class E = char> class Trie {
 			return this->stackyTheLittleStack == rhs.stackyTheLittleStack;
 		};
 
+//		TrieIterator& operator ++() {
+//			while(stackyTheLittleStack.top().first++ == stackyTheLittleStack.top().second){
+//				stackyTheLittleStack.pop();
+//			}
+//			viewTrie + '\n' + addSpace(stackyTheLittleStack.size()) + stackyTheLittleStack.top().first++->first;
+//			slideLeft(static_cast<InternalNode*>(stackyTheLittleStack.top().first++->second));
+//			return *this;
+//		};
 		TrieIterator& operator ++() {
-			while(stackyTheLittleStack.top().first++ == stackyTheLittleStack.top().second){
-				stackyTheLittleStack.pop();
-			}
-			viewTrie + '\n' + addSpace(stackyTheLittleStack.size()) + stackyTheLittleStack.top().first++->first;
-			slideLeft(static_cast<InternalNode*>(stackyTheLittleStack.top().first++->second));
-			return *this;
-		};
+					popStack();
+					viewTrie += '\n' + addSpace(stackyTheLittleStack.size()) += stackyTheLittleStack.top().first->first;
+					slideLeft(static_cast<InternalNode*>(stackyTheLittleStack.top().first->second));
+					return *this;
+				};
+
+				void popStack() {
+					typename mappy::iterator topIter = ++(stackyTheLittleStack.top().first);
+					typename mappy::iterator topEnd = (stackyTheLittleStack.top().second);
+					if (topIter == topEnd) {
+						stackyTheLittleStack.pop();
+						popStack();
+					}
+				}
 
 		std::string addSpace(int stackSize){
 			std::string result = "";
@@ -263,7 +278,7 @@ template<class T, class E = char> class Trie {
 	 *   Insert a single InternalNode or Leaf.
 	 */
 	iterator insert(const value_type& value) {
-		key_type a = value.first;
+		key_type a = value.first + '#';
 		T b = value.second;
 		root->insert(a,b);
 		//return find(a);
@@ -294,8 +309,10 @@ template<class T, class E = char> class Trie {
 
 	void showTrie() {
 		iterator cd = begin();
-		while(cd != end())  {
+		iterator ed = cd;
+ 		while(cd != end() && ++ed != end())  {
 			++cd;
+			ed=cd;
 		}
 		std::cout << cd.viewTrie << std::endl;
 		cd.viewTrie = "";

main.cpp

@@ -22,12 +22,24 @@ Trie<string> baum;
 *  Main Method to work with the Trie.
 */
 int main() {
-    baum.insert(pair<const basic_string<char>,string> ("test#","#test#"));
-    baum.insert(pair<const basic_string<char>,string> ("klaus#","#klaus#"));
-    baum.insert(pair<const basic_string<char>,string> ("fack#","#fack#"));
-    baum.insert(pair<const basic_string<char>,string> ("fuck#","#fuck#"));
-    cout << baum.begin().operator *();
+    baum.insert(pair<const basic_string<char>,string> ("a","Meaning:a"));
+    baum.insert(pair<const basic_string<char>,string> ("b","Meaning:b"));
+    baum.insert(pair<const basic_string<char>,string> ("c","Meaning:c"));
+    baum.insert(pair<const basic_string<char>,string> ("d","Meaning:d"));
+    cout << baum.root->mappyTheLittleMap.size()<< endl;
 
+//
+//    for (auto it=baum.root->mappyTheLittleMap.begin(); it!=baum.root->mappyTheLittleMap.end(); ++it){
+//        std::cout << it->first << std::endl;
+//    }
 
+
+
+    cout << "a"<< baum.begin().operator *() << endl;
+    cout << "b"<< baum.begin().operator ++().operator *()<< endl;
+    cout << "c"<< baum.begin().operator ++().operator ++().operator *()<< endl;
+    cout << "d"<< baum.begin().operator ++().operator ++().operator ++().operator *()<< endl;
+
+     baum.showTrie();
 }