X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FModels%2FChatLib.php;h=3f1530b396b9b752652918c45d9f0a0fdea3d596;hb=26d47ca368d8e7c2690cec49f6ae2ad509a0428d;hp=cf5d7dd6c825f6d8f37451dbfe7136bd0c91b787;hpb=a45648fa8ecf7712c7fd00eb2b93e862b5264f04;p=alttp.git

diff --git a/app/Models/ChatLib.php b/app/Models/ChatLib.php
index cf5d7dd..3f1530b 100644
--- a/app/Models/ChatLib.php
+++ b/app/Models/ChatLib.php
@@ -6,19 +6,23 @@ use Illuminate\Support\Facades\Storage;
 
 class ChatLib {
 
-	public function addMessage($msg) {
-		$tokens = $this->tokenize($msg->text_content);
+	public function addMessage(ChatLog $msg) {
+		$this->addText($msg->text_content);
+	}
+
+	public function addText($text) {
+		$tokens = $this->tokenize($text);
 		if (empty($tokens)) return;
 		$tokens[] = '';
 		foreach ($tokens as $num => $token) {
 			if ($num === 0) {
 				$this->addTransition([], $token);
 			} else {
-				$start = max(0, $num - $this->size);
+				$start = max(0, $num - $this->size - 1);
 				$end = $num;
 				for ($i = $start; $i < $end; ++$i) {
 					$this->addTransition(array_slice($tokens, $i, $end - $i), $token);
-					if ($end - $i < 3) break;
+					if ($end - $i < 5) break;
 				}
 			}
 		}
@@ -34,11 +38,11 @@ class ChatLib {
 	}
 
 	public function generate($limit = 100) {
-		$tokens = [];
+		$tokens = [''];
 		$generated = '';
 		while (strlen($generated) < $limit) {
 			$next = $this->randomNext($tokens);
-			if (empty($next)) break;
+			if ($next === '') break;
 			$tokens[] = $next;
 			$generated .= $next;
 		}
@@ -71,11 +75,13 @@ class ChatLib {
 			if (is_array(end($entry['examples']))) {
 				// already processed
 				$examples = $entry['examples'];
+			} else if ($key === ' ') {
+				$examples = [[' ', 0, 1]];
 			} else {
 				$subsum = 0;
 				foreach ($entry['examples'] as $example => $subweight) {
 					$sublower = $subsum;
-					$subsum += $subweight * $subweight;
+					$subsum += $subweight;
 					$examples[] = [$example, $sublower, $subsum];
 				}
 			}
@@ -86,8 +92,8 @@ class ChatLib {
 
 	private function randomNext($tokens) {
 		$cnt = count($tokens);
-		for ($size = min($this->size, $cnt); $size >= 0; --$size) {
-			$cmb = $this->generalize(array_slice($tokens, $cnt - $size, $size));
+		for ($size = min($this->size, $cnt); $size > 0; --$size) {
+			$cmb = $this->generalize(array_slice($tokens, -$size));
 			if (isset($this->transitions[$cmb])) {
 				$pick = $this->pick($this->transitions[$cmb]);
 				if (!is_null($pick)) {
@@ -158,8 +164,10 @@ class ChatLib {
 		$str = '';
 		foreach ($tokens as $token) {
 			$replaced = preg_replace('/\d+/', '0', $token);
+			$replaced = preg_replace('/\s+/', ' ', $token);
+			$replaced = preg_replace('/(.)\1{2,}/', '$1', $token);
 			$replaced = strtolower($replaced);
-			$str .= empty($replaced) ? $token : $replaced;
+			$str .= $replaced;
 		}
 		return $str;
 	}
@@ -169,7 +177,7 @@ class ChatLib {
 		return $example[0];
 	}
 
-	private $size = 5;
+	private $size = 7;
 	private $transitions = [];
 
 }