Changeset 6.1.6

Timestamp:

08/20/2016 05:52:14 PM (8 years ago)

Author:

David Owen <dsowen@fugue88.ws>

branch-nick:

state

revision id:

dsowen@fugue88.ws-20160820175214-brf0y4zu97rxsoft

Message:

Extracted assemble_team()

File:

• main.py (modified) (2 diffs)

main.py

@@ -58 +58 @@
     team_failures = 0
     mission = 1
+    team = None
+    approved = None
+
+    def assemble_team():
+        nonlocal approved, captain, team
+
+        print("Captain is {}".format(captain))
+        team = players[captain].propose_team(team_size)
+        print("He proposed {}".format(team))
+
+        votes = [p.approve_team(team) for p in players]
+        approvals = sum(votes)
+        approved = approvals > team_size / 2
+
+        print("Team {}: {} for, {} against".format(
+            {True: "approved", False: "rejected"}[approved],
+            approvals, player_count - approvals
+        ))
+
+        for p in players:
+            p.observe_team_vote(approved, votes)
+
+        captain = (captain + 1) % player_count
 
     def perform_mission():
@@ -86 +109 @@
         print("Mission {} needs {} members".format(mission, team_size))
         for attempt in range(5):
-            print("Captain is {}".format(captain))
-            team = players[captain].propose_team(team_size)
-            print("He proposed {}".format(team))
-            votes = [p.approve_team(team) for p in players]
-            approvals = sum(votes)
-            approved = approvals > team_size / 2
-            print("Team {}: {} for, {} against".format(
-                {True: "approved", False: "rejected"}[approved],
-                approvals, player_count - approvals
-            ))
-
-            for p in players:
-                p.observe_team_vote(approved, votes)
-
-            captain = (captain + 1) % player_count
+            assemble_team()
 
             if approved: