From 92a4a0e7db8336f8ccc11c053dc29847a303ad88 Mon Sep 17 00:00:00 2001
From: Feffernoose <fefferburbia@gmail.com>
Date: Fri, 4 Oct 2013 14:49:11 -0400
Subject: Changed incidence of random kgram-trimming

Also added better terminal output
---
 kgramstats.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'kgramstats.cpp')

diff --git a/kgramstats.cpp b/kgramstats.cpp
index 708013f..d196e8f 100644
--- a/kgramstats.cpp
+++ b/kgramstats.cpp
@@ -76,7 +76,7 @@ vector<string> kgramstats::randomSentence(int n)
 	
 	for (int i=0; i<n; i++)
 	{
-		if ((rand() % 4) != 0)
+		if ((rand() % (maxK - cur.size() + 1)) == 0)
 		{
 			for (int i=0; i<cur.size(); i++)
 			{
@@ -124,14 +124,20 @@ vector<string> kgramstats::randomSentence(int n)
 		{
 			nextToken += ".";
 		}
-		
-		cout << next->first << " | " << nextToken << endl;
 
 		if (cur.size() == maxK)
 		{
 			cur.pop_front();
 		}
-
+		
+		/* DEBUG */
+		for (kgram::iterator it = cur.begin(); it != cur.end(); it++)
+		{
+			cout << *it << " ";
+		}
+		
+		cout << "-> \"" << nextToken << "\" (" << next->second->all << "/" << max << ")" << endl;
+		
 		cur.push_back(next->first);
 		result.push_back(nextToken);
 	}
-- 
cgit 1.4.1