From 40be8b5f5a0c3832d3dceb2b4292a4c1f54ceba1 Mon Sep 17 00:00:00 2001 From: Nick Walton Date: Wed, 25 Sep 2019 13:32:58 -0600 Subject: [PATCH] update --- generator/ctrl/ctrl_generator.py | 8 ++++---- story/story_manager.py | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/generator/ctrl/ctrl_generator.py b/generator/ctrl/ctrl_generator.py index 9ed1d9b..6a6aff4 100644 --- a/generator/ctrl/ctrl_generator.py +++ b/generator/ctrl/ctrl_generator.py @@ -263,11 +263,11 @@ class CTRLGenerator(): # you can delete theme from the pruned_list # you can comment this out, I'm keeping it in for demonstration purpose tokens_to_disallow = [] - complex_to_dissalow = ["http", "r/nosleep", "EDIT", "UPDATE", "&"] - for _ in range(len(pruned_list)): + complex_to_dissalow = ["http", "r/nosleep", "EDIT", "UPDATE", "&", "[Part", "**", "[Link ", "www."] + for i in range(len(pruned_list)): for complex in complex_to_dissalow: - if complex in self.idx2word[pruned_list[_]]: - tokens_to_disallow.append(_) + if complex in self.idx2word[pruned_list[i]]: + tokens_to_disallow.append(i) pruned_list = np.delete(pruned_list, tokens_to_disallow) # if temperature is 0 diff --git a/story/story_manager.py b/story/story_manager.py index baf187d..3551f3a 100644 --- a/story/story_manager.py +++ b/story/story_manager.py @@ -40,9 +40,9 @@ class Story(): def latest_result(self): if len(self.results) > 1: - return self.results[-2] + self.actions[-1] + self.results[-1] + return self.results[-2] + self.actions[-1] + self.results[-1] + self.actions[-1] elif len(self.results) == 1: - return self.story_start + self.results[-1] + return self.story_start + self.results[-1] + self.actions[-1] else: return self.story_start @@ -208,8 +208,6 @@ class CTRLStoryManager(ConstrainedStoryManager): for phrase in self.action_phrases: result = self.generate_action_result(self.story_context(), phrase, options=options) location = result[0].split()[location_pos+1] - print("result is ", result) - print("location is ", location) options["word_whitelist"][location_pos].remove(location) results.append(result)