1 files changed, 46 insertions, 52 deletions

@@ -11,72 +11,66 @@
 
 int main(int argc, char** args)
 {
-        srand(time(NULL));
+  srand(time(NULL));
     
-    if (argc == 1)
-    {
-        std::cout << "rawr-gen, version 1.0" << std::endl;
-        std::cout << "Usage: rawr-gen corpus-file" << std::endl;
-        std::cout << "  where 'corpus-file' is the path to your input" << std::endl;
+  if (argc == 1)
+  {
+    std::cout << "rawr-gen, version 1.0" << std::endl;
+    std::cout << "Usage: rawr-gen corpus-file" << std::endl;
+    std::cout << "  where 'corpus-file' is the path to your input" << std::endl;
         
-        return 0;
-    }
+    return 0;
+  }
     
-        std::ifstream infile(args[1]);
-    if (!infile)
-    {
-        std::cout << "rawr-gen, version 1.0" << std::endl;
-        std::cout << "Usage: rawr-gen corpus-file" << std::endl;
-        std::cout << "  where 'corpus-file' is the path to your input" << std::endl;
-        std::cout << std::endl;
-        std::cout << "The file you specified does not exist." << std::endl;
+  std::ifstream infile(args[1]);
+  if (!infile)
+  {
+    std::cout << "rawr-gen, version 1.0" << std::endl;
+    std::cout << "Usage: rawr-gen corpus-file" << std::endl;
+    std::cout << "  where 'corpus-file' is the path to your input" << std::endl;
+    std::cout << std::endl;
+    std::cout << "The file you specified does not exist." << std::endl;
         
-        return 0;
-    }
+    return 0;
+  }
     
-        std::string corpus;
-        std::string line;
-        while (getline(infile, line))
-        {
-                corpus += line + "\n ";
-        }
+  std::string corpus;
+  std::string line;
+  while (getline(infile, line))
+  {
+    corpus += line + "\n ";
+  }
         
-    std::cout << "Preprocessing corpus..." << std::endl;
-        kgramstats* stats = new kgramstats(corpus, 4);
+  std::cout << "Preprocessing corpus..." << std::endl;
+  kgramstats* stats = new kgramstats(corpus, 4);
     
-    std::cout << "Preprocessing freevars..." << std::endl;
-    freevars* vars = new freevars();
-    vars->addVar("name", "names.txt");
-    vars->addVar("noun", "nouns.txt");
+  std::cout << "Preprocessing freevars..." << std::endl;
+  freevars* vars = new freevars();
+  vars->addVar("name", "names.txt");
+  vars->addVar("noun", "nouns.txt");
     
-    std::cout << "Generating..." << std::endl;
-        for (;;)
-        {
-                std::vector<std::string> doc = stats->randomSentence(rand() % 35 + 45);
-                std::string hi;
-                for (std::vector<std::string>::iterator it = doc.begin(); it != doc.end(); ++it)
-                {
-                        hi += vars->parse(*it) + " ";
-                }
-    
-    size_t firstperiod = hi.find_first_of(".!?");
-    if (firstperiod != std::string::npos)
+  std::cout << "Generating..." << std::endl;
+  for (;;)
+  {
+    std::vector<std::string> doc = stats->randomSentence(rand() % 35 + 15);
+    std::string hi;
+    for (std::vector<std::string>::iterator it = doc.begin(); it != doc.end(); ++it)
     {
-      hi = hi.substr(firstperiod+2);
+      hi += vars->parse(*it) + " ";
     }
     
     hi.resize(140);
 
-                size_t lastperiod = hi.find_last_of(".!?");
-                if ((lastperiod != std::string::npos) && (rand() % 3 > 0))
-                {
-                        hi = hi.substr(0, lastperiod+1);
-                }
+    size_t lastperiod = hi.find_last_of(".!?,");
+    if ((lastperiod != std::string::npos) && (rand() % 3 > 0))
+    {
+      hi = hi.substr(0, lastperiod+1);
+    }
 
-                std::cout << hi << std::endl;
+    std::cout << hi << std::endl;
                 
-        getc(stdin);
-        }
+    getc(stdin);
+  }
         
-        return 0;
+  return 0;
 }