Changeset 33793

Timestamp:

06/05/09 03:45:29 (4 years ago)

Author:

nishio

Message:

finished get_python_encoder, get_python_decoder

Location:

lang/python/retrograde

Files:

• mapgenerator.py (modified) (4 diffs)
• test.py (modified) (7 diffs)

lang/python/retrograde/mapgenerator.py

@@ -91 +91 @@
         self.var_name = var_name 
         utils.set_node_name(self)
-        assert n > 1
+        #assert n > 1
         self.vars = [(utils.INT_TYPE, var_name, "[0, %d)" % n)]
 
@@ -168 +168 @@
             # 正規化のコードを入れる
             result += ["if %s_1:" % oname]
-            result += ["    %s, %s = %s_0, %s_1" % (r1vname, r2vname, r1vname, r2vname)]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s = %s_0" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s = %s_1" % (v, v)])
             result += ["else:"]
-            result += ["    %s, %s = %s_1, %s_0" % (r1vname, r2vname, r1vname, r2vname)]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s = %s_1" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s = %s_0" % (v, v)])
 
         result += self.r1.get_python_encoder(context) 
@@ -195 +201 @@
             r2vname = self.r2.var_name
             result += ["if %s_0:" % oname]
-            result += ["    %s_1, %s_0 = %s, %s" % (r1vname, r2vname, r1vname, r2vname)]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s_1 = %s" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s_0 = %s" % (v, v)])
             result += ["else:"]
-            result += ["    %s_0, %s_1 = %s, %s" % (r1vname, r2vname, r1vname, r2vname)]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s_0 = %s" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s_1 = %s" % (v, v)])
 
         return result
@@ -371 +383 @@
                 "%s = %s + %s" % (rname1, name, rname0),]
         else:
-            # FIXME
             result += [
                 "n = %d" % (n - 1),

lang/python/retrograde/test.py

@@ -169 +169 @@
 else:
     if is_bar_1:
-        foo, bar = foo_0, bar_1
-    else:
-        foo, bar = foo_1, bar_0
+        foo = foo_0
+        bar = bar_1
+    else:
+        foo = foo_1
+        bar = bar_0
     choice0 = foo
     choice1 = bar
@@ -218 +220 @@
     bar = choice1
     if is_bar_0:
-        foo_1, bar_0 = foo, bar
-    else:
-        foo_0, bar_1 = foo, bar
+        foo_1 = foo
+        bar_0 = bar
+    else:
+        foo_0 = foo
+        bar_1 = bar
 is_bar_1 = not(is_bar_xor ^ is_bar_0)"""
 
@@ -273 +277 @@
 else:
     if is_bar_1:
-        foo, bar = foo_0, bar_1
-    else:
-        foo, bar = foo_1, bar_0
+        foo = foo_0
+        bar = bar_1
+    else:
+        foo = foo_1
+        bar = bar_0
     choice0 = foo
     take0 = bar
@@ -322 +328 @@
     bar = take0
     if is_bar_0:
-        foo_1, bar_0 = foo, bar
-    else:
-        foo_0, bar_1 = foo, bar
+        foo_1 = foo
+        bar_0 = bar
+    else:
+        foo_0 = foo
+        bar_1 = bar
 is_bar_1 = not(is_bar_xor ^ is_bar_0)"""
+
 def test_unordered_or_take_decode():
     _reset()
@@ -364 +373 @@
 
 
-def test_kirin_size():
+def test_kirin_encode_decode():
+    _reset()
     r = Resource(10, "X")
-    Mochigoma = NoChoice()
+    Mochigoma = Choice(1, "dummy")
     Player = Choice(2, "kirin_player")
     Kirin = Unordered(
@@ -372 +382 @@
             Or(r.take("kirin"), 
                Mochigoma,
-               "kirin_is_not_mochigoma"),
+               "kirin_is_mochigoma"),
             Player))
-    print Kirin
-    print Kirin.get_python_encoder({"X": 10})
-    print Kirin.get_python_decoder({"X": 10})
+
+    params = dict(kirin_0=0, kirin_1=1, 
+                  kirin_player_0=0, kirin_player_1=0, 
+                  kirin_is_mochigoma_0=False, kirin_is_mochigoma_1=False)
+    ns = en_de_code(
+        Kirin, {"X": []},
+        **params)
+
+    params = dict(kirin_0=0, dummy_1=0,
+                  kirin_player_0=0, kirin_player_1=0, 
+                  kirin_is_mochigoma_0=False, kirin_is_mochigoma_1=True)
+    ns = en_de_code(
+        Kirin, {"X": []},
+        **params)
+
+    params = dict(dummy_0=0, dummy_1=0, 
+                  kirin_player_0=0, kirin_player_1=0, 
+                  kirin_is_mochigoma_0=True, kirin_is_mochigoma_1=True)
+    ns = en_de_code(
+        Kirin, {"X": []},
+        **params)
+
 
 if __name__ == "__main__":
@@ -382 +411 @@
     test_lion_decode()
     test_kirin_size()
+    test_kirin_encode_decode()
+
     test_or_encode()
     test_or_decode()