The unified diff between revisions [ce0814c2..] and [9d145ae0..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "markov.cc"
#  from [e7dfbe6680e668c1a4cc69fd79c3297d54b92f21]
#    to [49cdf27001d01c35712aba913bf4ac8e7d7f775f]
#
# patch "markov.hh"
#  from [02d5398997e1afc2d1546f8a9ab1485ac1287a51]
#    to [7dab25f5b7ca2e025ff8b7c1933f6a2f89aef7cf]
#
# patch "tokens_test.cc"
#  from [751e06194da82617853d13dac3839bfcb365eff1]
#    to [efaeb144b4b91b3d2bb5d6b24e56511f78f2af05]
#
============================================================
--- markov.cc	e7dfbe6680e668c1a4cc69fd79c3297d54b92f21
+++ markov.cc	49cdf27001d01c35712aba913bf4ac8e7d7f775f
@@ -46,6 +46,7 @@ MarkovState::operator<(const MarkovState
 {
     return s.state < state;
 }
+
 bool
 MarkovState::operator!=(const MarkovState &s)
 {
@@ -57,22 +58,24 @@ MarkovModel::MarkovModel (const Stash &s
     const vector<token_t> stash = s.get_stash ();
     deque<token_t> q;
     MarkovState last_state;
+    size_t seen = 0;

-    cout << "Hello" << endl;
     for (vector<token_t>::const_iterator i=stash.begin();i!=stash.end();i++) {
+        seen++;
         q.push_back (*i);
-        cout << "token: " << *i << " : " << q.size() << endl;
-        if (q.size() == length) {
+//        cout << "token: " << *i << " : " << q.size() << endl;
+        if (seen >= length) {
             MarkovState this_state(q);
             if (last_state.valid) {
                 markov_pair p(last_state, this_state);
                 edges[p]++;
-                cout << "edges go to " << edges[p] << endl;
+//                cout << "edges go to " << edges[p] << endl;
             }
             last_state = MarkovState (q);
             q.pop_front();
         }
     }
+    cout << "debug: " << seen << endl;
 }

 void
============================================================
--- markov.hh	02d5398997e1afc2d1546f8a9ab1485ac1287a51
+++ markov.hh	7dab25f5b7ca2e025ff8b7c1933f6a2f89aef7cf
@@ -2,6 +2,7 @@
 #define __MARKOV_HH

 #include "tokens.hh"
+#include <iostream>
 #include <vector>
 #include <deque>
 #include <map>
============================================================
--- tokens_test.cc	751e06194da82617853d13dac3839bfcb365eff1
+++ tokens_test.cc	efaeb144b4b91b3d2bb5d6b24e56511f78f2af05
@@ -21,11 +21,16 @@ input_test (s_tok &t)
 input_test (s_tok &t)
 {
     string i;
+    int cnt = 0;

-    for (int c=0;c<50;c++) {
-        cin >> i;
+    while (cin >> i) {
+        cnt++;
+        if (!(cnt % 10000)) {
+            cout << cnt << ".." << i << endl;
+        }
         t.add (i);
     }
+    cout << "token reading done" << endl;
 }

 void
@@ -35,15 +40,17 @@ test (void)

     string_test (t);
     input_test (t);
-    t.playback ();
-
+//    t.playback ();
     MarkovModel m(t, 2);
-    m.Dump();
+//    m.Dump();
 }

 int
 main (int argc, char *argv[])
 {
+    cout << "waiting" << endl;
+    sleep (5);
+    cout << "running" << endl;
     test ();
     return 0;
 }