Changeset 6.1.39 for main.py

Timestamp:

08/20/2016 09:24:21 PM (8 years ago)

Author:

David Owen <dsowen@fugue88.ws>

branch-nick:

state

revision id:

dsowen@fugue88.ws-20160820212421-8n0c6gf6pytyy6np

Message:

Moved assemble_team() to state object

File:

• main.py (modified) (3 diffs)

main.py

@@ -64 +64 @@
         self.team_size = team_size
 
+    def assemble_team(self):
+        print("Captain is {}".format(self.shared.captain))
+        team = self.shared.players[self.shared.captain].propose_team(self.team_size)
+        print("He proposed {}".format(team))
+
+        votes = [p.approve_team(team) for p in self.shared.players]
+        approvals = sum(votes)
+        approved = approvals > self.team_size / 2
+
+        print("Team {}: {} for, {} against".format(
+            {True: "approved", False: "rejected"}[approved],
+            approvals, self.shared.player_count - approvals
+        ))
+
+        for p in self.shared.players:
+            p.observe_team_vote(approved, votes)
+
+        self.shared.captain = (self.shared.captain + 1) % self.shared.player_count
+
+        if approved:
+            self.shared.team_failures = 0
+            return PerformMission(self.shared, team)
+        else:
+            self.shared.team_failures += 1
+            return AssembleTeam(self.shared, self.team_size)
+
 
 class PerformMission(object):
@@ -94 +120 @@
     losses = 0
 
-    def assemble_team():
-        print("Captain is {}".format(state.shared.captain))
-        team = state.shared.players[state.shared.captain].propose_team(state.team_size)
-        print("He proposed {}".format(team))
-
-        votes = [p.approve_team(team) for p in state.shared.players]
-        approvals = sum(votes)
-        approved = approvals > state.team_size / 2
-
-        print("Team {}: {} for, {} against".format(
-            {True: "approved", False: "rejected"}[approved],
-            approvals, state.shared.player_count - approvals
-        ))
-
-        for p in state.shared.players:
-            p.observe_team_vote(approved, votes)
-
-        state.shared.captain = (state.shared.captain + 1) % state.shared.player_count
-
-        if approved:
-            state.shared.team_failures = 0
-            return PerformMission(shared, team)
-        else:
-            state.shared.team_failures += 1
-            return AssembleTeam(shared, state.team_size)
-
     def perform_mission():
         nonlocal wins, losses
@@ -149 +149 @@
             state = state.do()
         elif isinstance(state, AssembleTeam):
-            state = assemble_team()
+            state = state.assemble_team()
         elif isinstance(state, PerformMission):
             state = perform_mission()