Merge pull request #29 from MarcCote/bf_names_ambiguity

BF: Object names disambiguation

Author: tavianator

textworld/generator/inform7/tests/test_world2inform7.py

@@ -165,7 +165,7 @@ def test_names_disambiguation():
         assert "tasty apple" in game_state.inventory
         assert "tasty apple" not in game_state.description
 
-    # With two-argument actions.
+    # Actions with two arguments.
     M = textworld.GameMaker()
     roomA = M.new_room("roomA")
     roomB = M.new_room("roomB")
@@ -213,6 +213,53 @@ def test_names_disambiguation():
         game_state, _, done = env.step("go west")
         assert "-= Roomc =-" in game_state.description
 
+    # Test invariance of the order in which ambiguous object names are defined.
+    # First define "type G safe" then a "safe".
+    M = textworld.GameMaker()
+    garage = M.new_room("garage")
+    M.set_player(garage)
+
+    key = M.new(type="k", name="key")    
+    typeG_safe = M.new(type="c", name="type G safe")
+    safe = M.new(type="c", name="safe")
+
+    safe.add(key)
+    garage.add(safe, typeG_safe)
+    
+    M.add_fact("open", safe)
+
+    game = M.build()
+    game_name = "test_names_disambiguation"
+    with make_temp_directory(prefix=game_name) as tmpdir:
+        game_file = compile_game(game, game_name, games_folder=tmpdir)
+        env = textworld.start(game_file)
+        game_state = env.reset()
+        game_state, _, done = env.step("take key from safe")
+        assert "key" in game_state.inventory
+
+    # First define "safe" then "type G safe".
+    M = textworld.GameMaker()
+    garage = M.new_room("garage")
+    M.set_player(garage)
+
+    key = M.new(type="k", name="key")    
+    safe = M.new(type="c", name="safe")
+    typeG_safe = M.new(type="c", name="type G safe")
+
+    safe.add(key)
+    garage.add(safe, typeG_safe)
+    
+    M.add_fact("open", safe)
+
+    game = M.build()
+    game_name = "test_names_disambiguation"
+    with make_temp_directory(prefix=game_name) as tmpdir:
+        game_file = compile_game(game, game_name, games_folder=tmpdir)
+        env = textworld.start(game_file)
+        game_state = env.reset()
+        game_state, _, done = env.step("take key from safe")
+        assert "key" in game_state.inventory
+
 
 def test_take_all_and_variants():
     M = textworld.GameMaker()

textworld/generator/inform7/world2inform7.py

@@ -326,14 +326,15 @@ def generate_inform7_source(game, seed=1234, use_i7_description=False):
 
     """)
 
-    # Refeering to an object by it whole name shouldn't be ambiguous.
+    # Referring to an object by its whole name shouldn't be ambiguous.
     source += textwrap.dedent("""\
-    Does the player mean doing something with something (called target):
-	if the player's command matches the text printed name of the target and the second noun is nothing:
-		it is very likely;
-	if the player's command matches the text printed name of the target and the player's command matches the text printed name of the second noun:
-		it is very likely.  [Handle action with two arguments.]
-
+    Does the player mean doing something:
+        if the noun is not nothing and the second noun is nothing and the player's command matches the text printed name of the noun:
+            it is likely;
+        if the noun is nothing and the second noun is not nothing and the player's command matches the text printed name of the second noun:
+            it is likely;
+        if the noun is not nothing and the second noun is not nothing and the player's command matches the text printed name of the noun and the player's command matches the text printed name of the second noun:
+            it is very likely.  [Handle action with two arguments.]
     """)
 
     # Useful for listing room contents with their properties.
@@ -393,7 +394,8 @@ def generate_inform7_source(game, seed=1234, use_i7_description=False):
         remove the list of containers from L;
         remove the list of supporters from L;
         remove the list of doors from L;
-        say "There is [L with indefinite articles] on the floor.";
+        if the number of entries in L is greater than 0:
+            say "There is [L with indefinite articles] on the floor.";
         
     """)