3 files changed, 22 insertions, 10 deletions

@@ -30,7 +30,7 @@ int main(int argc, char** args)
         }
 
     cout << "Preprocessing corpus..." << endl;
-        kgramstats* stats = new kgramstats(corpus, 5);
+        kgramstats* stats = new kgramstats(corpus, 3);
     
     cout << "Preprocessing freevars..." << endl;
     freevars* vars = new freevars();
@@ -46,6 +46,12 @@ int main(int argc, char** args)
                 {
                         hi += vars->parse(*it) + " ";
                 }
+
+                size_t lastperiod = hi.find_last_of(".");
+                if ((lastperiod != string::npos) && (rand() % 3 > 0))
+                {
+                        hi = hi.substr(0, lastperiod+1);
+                }
         
                 hi = hi.substr(0,140);
 
@@ -170,8 +176,8 @@ int main(int argc, char** args)
                 printf( "\ntwitterClient:: twitCurl::statusUpdate error:\n%s\n", replyMsg.c_str() );
             }
 
-                sleep(delay);
+                sleep(rand() % delay);
         }
         
         return 0;
-}
\ No newline at end of file
+}
@@ -44,7 +44,7 @@ int main(int argc, char** args)
         }
         
     cout << "Preprocessing corpus..." << endl;
-        kgramstats* stats = new kgramstats(corpus, 5);
+        kgramstats* stats = new kgramstats(corpus, 3);
     
     cout << "Preprocessing freevars..." << endl;
     freevars* vars = new freevars();
@@ -61,10 +61,16 @@ int main(int argc, char** args)
                         hi += vars->parse(*it) + " ";
                 }
 
+                size_t lastperiod = hi.find_last_of(".");
+                if ((lastperiod != string::npos) && (rand() % 3 > 0))
+                {
+                        hi = hi.substr(0, lastperiod+1);
+                }
+
                 cout << hi << endl;
                 
         getc(stdin);
         }
         
         return 0;
-}
\ No newline at end of file
+}
@@ -206,7 +206,7 @@ vector<string> kgramstats::randomSentence(int n)
     {
       if (rand() % (maxK - cur.size() + 1) == 0)
       {
-        while (cur.size() > 0)
+        while (cur.size() > 1)
         {
           if ((rand() % (n)) < cuts)
           {
@@ -246,7 +246,7 @@ vector<string> kgramstats::randomSentence(int n)
     {
       nextToken[0] = toupper(nextToken[0]);
     }
-    
+    /*
     if (startquote < next->startquote)
     {
       nextToken = "\"" + nextToken;
@@ -288,7 +288,7 @@ vector<string> kgramstats::randomSentence(int n)
       
       nextToken += ",";
     }
-
+*/
                 if (cur.size() == maxK)
                 {
                         cur.pop_front();
@@ -336,5 +336,5 @@ std::string canonize(std::string f)
   string result;
   remove_copy_if(canonical.begin(), canonical.end(), std::back_inserter(result), removeIf);
         
-        return result;
-}
\ No newline at end of file
+        return canonical;
+}