updade from Atlas repo

19-coroutine/coroutil.py

@@ -4,8 +4,8 @@ from functools import wraps
 def coroutine(func):
     """Decorator: primes `func` by advancing to first `yield`"""
     @wraps(func)
-    def primer(*args,**kwargs):  # <1>
-        gen = func(*args,**kwargs)  # <2>
+    def primer(*args, **kwargs):  # <1>
+        gen = func(*args, **kwargs)  # <2>
         next(gen)  # <3>
         return gen  # <4>
     return primer

19-coroutine/taxi_sim.py

@@ -49,11 +49,11 @@ See longer sample run at the end of this module.
 
 """
 
-import random
-import collections
-import queue
 import argparse
-import time
+import collections
+import random
+import queue
+
 
 DEFAULT_NUMBER_OF_TAXIS = 3
 DEFAULT_END_TIME = 180
@@ -126,8 +126,8 @@ def compute_duration(previous_action):
     elif previous_action == 'going home':
         interval = 1
     else:
-        raise ValueError('Unknown previous_action: %s' % previous_action)
-    return int(random.expovariate(1/interval)) + 1
+        raise ValueError(f'Unknown previous_action: {previous_action}')
+    return int(random.expovariate(1 / interval)) + 1
 
 
 def main(end_time=DEFAULT_END_TIME, num_taxis=DEFAULT_NUMBER_OF_TAXIS,
@@ -136,7 +136,7 @@ def main(end_time=DEFAULT_END_TIME, num_taxis=DEFAULT_NUMBER_OF_TAXIS,
     if seed is not None:
         random.seed(seed)  # get reproducible results
 
-    taxis = {i: taxi_process(i, (i+1)*2, i*DEPARTURE_INTERVAL)
+    taxis = {i: taxi_process(i, (i + 1) * 2, i * DEPARTURE_INTERVAL)
              for i in range(num_taxis)}
     sim = Simulator(taxis)
     sim.run(end_time)

19-coroutine/taxi_sim0.py

@@ -27,11 +27,10 @@ See explanation and longer sample run at the end of this module.
 
 """
 
-import sys
-import random
+import argparse
 import collections
 import queue
-import argparse
+import random
 
 DEFAULT_NUMBER_OF_TAXIS = 3
 DEFAULT_END_TIME = 80
@@ -44,7 +43,7 @@ Event = collections.namedtuple('Event', 'time proc action')
 
 def compute_delay(interval):
     """Compute action delay using exponential distribution"""
-    return int(random.expovariate(1/interval)) + 1
+    return int(random.expovariate(1 / interval)) + 1
 
 # BEGIN TAXI_PROCESS
 def taxi_process(ident, trips, start_time=0):  # <1>
@@ -68,7 +67,6 @@ class Simulator:
         self.events = queue.PriorityQueue()
         self.procs = dict(procs_map)
 
-
     def run(self, end_time):  # <1>
         """Schedule and display events until time is up"""
         # schedule the first event for each cab
@@ -108,7 +106,7 @@ def main(end_time=DEFAULT_END_TIME, num_taxis=DEFAULT_NUMBER_OF_TAXIS,
     if seed is not None:
         random.seed(seed)  # get reproducible results
 
-    taxis = {i: taxi_process(i, (i+1)*2, i*DEPARTURE_INTERVAL)
+    taxis = {i: taxi_process(i, (i + 1) * 2, i * DEPARTURE_INTERVAL)
              for i in range(num_taxis)}
     sim = Simulator(taxis)
     sim.run(end_time)