From e8e435435857588efe8f0de46287ea84af4f352a Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Sun, 29 Jul 2012 22:36:11 -0500 Subject: [PATCH] Markov: many working backwards bugfixes wrapped together --- modules/Markov.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/Markov.py b/modules/Markov.py index 675dad0..46b14f2 100644 --- a/modules/Markov.py +++ b/modules/Markov.py @@ -369,13 +369,23 @@ class Markov(Module): # now work backwards until we randomly bump into a start while True: key_hits = self._retrieve_k2_for_value(working_backwards[0], context_id) - if self.start2 in key_hits: - self.log.debug("working backwards found start, finishing") - gen_words = gen_words + working_backwards + if self.start2 in key_hits and len(working_backwards) > 2: + self.log.debug("working backwards forced start, finishing") + gen_words += working_backwards + self.log.debug("gen_words: {0:s}".format(" ".join(gen_words))) + break + elif len(key_hits) == 0: + self.log.debug("no key_hits, finishing") + gen_words += working_backwards + self.log.debug("gen_words: {0:s}".format(" ".join(gen_words))) + break + elif len(key_hits) == 1 and self.start2 in key_hits: + self.log.debug("only start2 in key_hits, finishing") + gen_words += working_backwards self.log.debug("gen_words: {0:s}".format(" ".join(gen_words))) break else: - found_word = random.choice(filter(lambda a: a != self.stop, key_hits)) + found_word = random.choice(filter(lambda a: a != self.start2, key_hits)) working_backwards.insert(0, found_word) self.log.debug("added '{0:s}' to working_backwards".format(found_word)) self.log.debug("working_backwards: {0:s}".format(" ".join(working_backwards)))