Changeset 31921

Timestamp:

04/05/09 12:18:06 (4 years ago)

Author:

nishio

Message:

/lang/python/spaghetti_monster separate tests

Location:

lang/python/spaghetti_monster

Files:

• main.py (modified) (8 diffs)
• tests.py (added)

lang/python/spaghetti_monster/main.py

@@ -4 +4 @@
 
 """
+
+class Inputter(object):
+    def __init__(self, is_human=False, buf=[]):
+        self.is_human = is_human
+        self.buf = buf
+    def get(self, msg="?>", typ=str):
+        if self.is_human:
+            s = raw_input(msg)
+            return typ(s)
+        else:
+            return self.buf.pop(0)
+
+inputter = Inputter(is_human=True)
+
 
 class Card(object):
@@ -24 +38 @@
         print self.description % dict((k, k) for k in self.variables)
         print self.variables
-        pos = raw_input("?>")
+        pos = inputter.get()
         self.variables[pos] += value
         self.modifiers.append("%s%+d" % (pos, value))
@@ -79 +93 @@
         for i in range(self.variables["x"]):
             c = game.select_card()
-            c.change_value(self.variables["y"] * direction)
+            c.change_value(self.variables["y"] * self.direction)
             
 
@@ -162 +176 @@
         cards = [game.get_card(-1), game.get_card(1)]
         print cards
-        pos = input("?>")
+        pos = inputter.get("?>", int)
         cards[pos].removed = True
 
@@ -263 +277 @@
         for p in enumerate(self.cards):
             print "%2d: %s" % p
-        return self.cards[input("?>")]
+        return self.cards[inputter.get("?>", int)]
 
     def select_player(self):
@@ -269 +283 @@
         for p in enumerate(self.players):
             print "%2d: %s" % p
-        return self.players[input("?>")]
+        return self.players[inputter.get("?>", int)]
 
     def select_bit(self):
-        c = game.select_card()
+        c = self.select_card()
         print ", ".join("%d:%s" % (i, b.mark) for i, b in enumerate(c.bits))
-        pos = input("?>")
+        pos = inputter.get("?>", int)
         return (c, pos)
     
     def eval_card(self):
         c = self.cards[self.pc]
-        if not c.bits: return False
+        if not c.bits:
+            self.progress_pc()
+            return self.eval_card()
         print "eval: ", c
         self.cur_card = c
         for b in c.bits:
             self.cur_player = b
-            if input("activate %s?" % c):
+            if inputter.get("activate %s?" % c, int):
                 c.then_action(self)
             else:
@@ -297 +313 @@
         for i in range(len(self.cards)):
             c = self.get_card(i)
-            pos = new_card.find(c)
-            if pos >= 0:
-                self.pc = pos
-                break
+            try:
+                pos = new_card.index(c)
+            except:
+                continue
+            self.pc = pos
+            break
         # bit個数判定
         # ライフ判定
@@ -309 +327 @@
         # new_bits を追加する
         for c in self.cards:
-            c.bits.extend(c.new_bits)
-        pass
-
+            new_bits = [b for b in c.bits if b != NULL_BIT]
+            new_bits.extend(c.new_bits)
+            c.bits = new_bits
+
+    def progress_pc(self):
+        self.pc += self.direction
+        self.pc %= len(self.cards)
+        
     def main_loop(self):
         while 1:
             to_reprint = self.eval_card()
             if to_reprint: self.pretty_print()
-            self.pc += self.direction
-            self.pc %= len(self.cards)
-
-
-def test_worm():
-    cards = [Worm()]
-    players = [Player("nishio", "(N)")]
-    cards[0].bits.append(players[0])
-    g = GameManager(cards, players)
-    g.pretty_print()
-    g.eval_card()
-    g.pretty_print()
-
-def test_heal():
-    cards = [Heal()]
-    players = [Player("nishio", "(N)")]
-    cards[0].bits.append(players[0])
-    g = GameManager(cards, players)
-    g.pretty_print()
-    g.eval_card()
-    g.pretty_print()
-
-def test_inc():
-    cards = [Inc(), Heal()]
-    players = [Player("nishio", "(N)")]
-    cards[0].bits.append(players[0])
-    cards[1].bits.append(players[0])
-    g = GameManager(cards, players)
-    g.pretty_print()
-    g.main_loop()
-
-def test_mimic():
-    cards = [Mimic(), Inc(), Inc()]
-    players = [Player("nishio", "(N)")]
-    cards[0].bits.append(players[0])
-    g = GameManager(cards, players)
-    g.pretty_print()
-    g.eval_card()
-    g.pretty_print()
-    
-
-def test_rm_bit():
-    cards = [RemoveBit(), Inc(), Inc()]
-    players = [Player("nishio", "(N)")]
-    cards[0].bits.append(players[0])
-    g = GameManager(cards, players)
-    g.pretty_print()
-    g.eval_card()
-    g.pretty_print()
-
-    
-def test_float():
-    cards = [Test("A"), Test("B"), Float(), Test("C"), Test("D")]
-    players = [Player("nishio", "(N)")]
-    cards[2].bits.append(players[0])
-    g = GameManager(cards, players)
-    g.pretty_print()
-    g.main_loop()
-
-
+            self.progress_pc()
+
+
+