diff --git a/generator/ctrl/ctrl_generator.py b/generator/ctrl/ctrl_generator.py index 9bcd03e..b2725df 100644 --- a/generator/ctrl/ctrl_generator.py +++ b/generator/ctrl/ctrl_generator.py @@ -177,6 +177,9 @@ class CTRLGenerator(): if not first_letter_capitalized: result = result[0].lower() + result[1:] + while("\n \n \n " in result): + result = result.replace("\n \n \n ", "\n \n ") + # print("\n\nAFTER RESULT_REPLACE:") # print(repr(result)) @@ -191,7 +194,6 @@ class CTRLGenerator(): options["used_verbs"] = set() first_token = True - prompt_length = len(prompt) # tokenize provided prompt split_prompt = self.bpe.apply([prompt])[0].split() @@ -256,7 +258,7 @@ class CTRLGenerator(): if first_token: for word in get_possible_verbs(): if word not in options["used_verbs"]: - prompt_logits[_token][self.word2idx[word]] += 5 + prompt_logits[_token][self.word2idx[word]] += 100 # compute probabilities from logits prompt_probs = np.exp(prompt_logits[_token]) @@ -320,12 +322,4 @@ class CTRLGenerator(): first_token = False - - print("\n\nPrompt is \n", prompt) - print("\n\nCut off") - print(repr(result)) - - import pdb - pdb.set_trace() - return self.result_replace(result) diff --git a/story/story_data.yaml b/story/story_data.yaml index d2d0beb..1ea5ccd 100644 --- a/story/story_data.yaml +++ b/story/story_data.yaml @@ -6,5 +6,5 @@ prompts: action_verbs: classic: ["You attack", "You tell", "You use", "You go"] - anything: ["You", "You", "You", "You"] + anything: ["You", "You"] diff --git a/story/story_manager.py b/story/story_manager.py index 565148e..b1fd483 100644 --- a/story/story_manager.py +++ b/story/story_manager.py @@ -167,9 +167,7 @@ class CTRLStoryManager(ConstrainedStoryManager): options["used_verbs"] = set(used_verbs) result = self.generate_action_result(self.story_context(), phrase, options=options) - print("Result string? ", result[0].split()) used_verb = result[0].split()[1] - print("Used verb is ", used_verb) used_verbs.append(used_verb) results.append(result)