Various tweaks, fixes, and minor changes.

oubiwann · oubiwann · commit c671a6687f57 · 2015-05-03T21:30:22.000-05:00
diff --git a/lib/collector.py b/lib/collector.py
@@ -1,16 +1,6 @@
 import time
 import zmq
-import democfg
-
-def process_results(receiver):
-    data = []
-    # Process results from the workers
-    for _ in range(democfg.task_count):
-        result = receiver.recv_pyobj()
-        print("Processing result: {}".format(result))
-        data.append(result)
-    # Calculate final result
-    print("Final result: {}".format(sum(data)/len(data)))
+import democfg, processor
 
 def collect():
     context = zmq.Context()
@@ -22,8 +12,8 @@ def collect():
     controller.bind(democfg.routing_table["controller"])
     # Wait for start signal
     assert receiver.recv() == democfg.start_flag
-    process_results(receiver)
+    processor.process(receiver)
     # Let workers know that all results have been processed
     controller.send(democfg.done_msg)
-    # Finished
-    time.sleep(5 * democfg.pause_time)  # Give 0MQ time to deliver
+    # Finished, but give 0MQ time to deliver
+    time.sleep(5 * democfg.pause_time)
diff --git a/lib/demo.py b/lib/demo.py
@@ -18,6 +18,5 @@ def main(tasks):
     distributor.distribute(tasks)
 
 if __name__ == "__main__":
-    count = range(democfg.task_count)
-    tasks = [1e8 / democfg.task_count for _ in count]
+    tasks = [1e8 / democfg.task_count] * democfg.task_count
     main(tasks)
diff --git a/lib/distributor.py b/lib/distributor.py
@@ -7,7 +7,7 @@ def distribute(tasks):
     # Socket to send messages on
     sender = context.socket(zmq.PUSH)
     sender.bind(democfg.routing_table["receiver"])
-    # Socket with direct access to the sink used to syncronize start of batch
+    # Socket with direct access to the sink used to synchronize start of batch
     syncher = context.socket(zmq.PUSH)
     syncher.connect(democfg.routing_table["sender"])
     # Give 0MQ time to start up
diff --git a/lib/nbutil.py b/lib/nbutil.py
@@ -5,6 +5,12 @@
 import IPython
 
 
+def hide_axes(axes):
+    axes.set_frame_on(False)
+    [n.set_visible(False) for n in axes.get_xticklabels() + axes.get_yticklabels()]
+    [n.set_visible(False) for n in axes.get_xticklines() + axes.get_yticklines()]
+
+
 def pycat(filename):
     with open(filename) as f:
         code = f.read()
diff --git a/lib/processor.py b/lib/processor.py
@@ -3,6 +3,9 @@
 import democfg
 
 def process(receiver):
+    return get_results(receiver)
+
+def get_results(receiver):
     data = []
     # Process results from the workers
     for _ in range(democfg.task_count):
@@ -11,3 +14,4 @@ def process(receiver):
         data.append(result)
     # Calculate final result
     print("Final result: {}".format(sum(data)/len(data)))
+    return data
diff --git a/lib/worker.py b/lib/worker.py
@@ -1,14 +1,6 @@
 import random
 import zmq
-import democfg
-
-def run_task(task_data):
-    in_circle = 0
-    for _ in range(int(task_data)):
-        (x, y) = (random.random(), random.random())
-        if (x ** 2 + y ** 2) <= 1:
-            in_circle += 1
-    return 4 * in_circle / task_data
+import democfg, tasker
 
 def is_done(socks, controller):
     if (socks.get(controller) == zmq.POLLIN and
@@ -39,7 +31,7 @@ def work(worker_id):
         if socks.get(receiver) == zmq.POLLIN:
             task_data = receiver.recv_pyobj()
             # Process task data
-            result = run_task(task_data)
+            result = tasker.task(task_data)
             sender.send_pyobj(result)
         if is_done(socks, controller):
             run_loop = False
