Merge branch 'development' of github.com:cool-RR/GarlicSim into development

Ram Rachum · Ram Rachum · commit 6434533ff84e · 2011-07-21T18:19:13.000-04:00
diff --git a/garlicsim/garlicsim/asynchronous_crunching/crunchers/process_cruncher/process.py b/garlicsim/garlicsim/asynchronous_crunching/crunchers/process_cruncher/process.py
@@ -26,11 +26,11 @@ class Process(multiprocessing.Process):
     '''The actual system process used by `ProcessCruncher`.'''
     # One of the reasons that `Process` is a separate entity from
     # `ProcessCruncher` is that because the way the `multiprocessing` module
-    # works, all arguments to `Process.__init__` must be pickleable, which would
-    # prevent us from getting the crunching manager as an argument, since it's
-    # not pickleable.
+    # works, all arguments to `Process.__init__` must be pickleable, which
+    # would prevent us from getting the crunching manager as an argument, since
+    # it's not pickleable.
     
-    def __init__(self, step_iterator_getter, initial_state, crunching_profile):        
+    def __init__(self, step_iterator_getter, initial_state, crunching_profile):
         multiprocessing.Process.__init__(self)
         
         self.step_iterator_getter = step_iterator_getter
@@ -89,10 +89,10 @@ def run(self):
         Internal method.
         
         This is called when the cruncher is started. It just calls the
-        `main_loop` method in a try clause, excepting `ObsoleteCruncherException`;
-        That exception means that the cruncher has been retired in the middle of
-        its job, so it is propagated up to this level, where it causes the
-        cruncher to terminate.
+        `main_loop` method in a try clause, excepting
+        `ObsoleteCruncherException`; That exception means that the cruncher has
+        been retired in the middle of its job, so it is propagated up to this
+        level, where it causes the cruncher to terminate.
         '''
         try:
             self.main_loop()
@@ -159,8 +159,9 @@ def check_crunching_profile(self, state):
         we retire the cruncher.
         '''
         if self.crunching_profile.state_satisfies(state):
-            raise ObsoleteCruncherException("We're done working, the clock target "
-                                        "has been reached. Shutting down.")
+            raise ObsoleteCruncherException("We're done working, the clock "
+                                            "target has been reached. "
+                                            "Shutting down.")
     
         
     def get_order(self):
@@ -179,8 +180,8 @@ def process_order(self, order):
         '''Process an order receieved from `.order_queue`.'''
         
         if order == 'retire':
-            raise ObsoleteCruncherException("Cruncher received a 'retire' order; "
-                                        "Shutting down.")
+            raise ObsoleteCruncherException("Cruncher received a 'retire' "
+                                            "order; Shutting down.")
         
         elif isinstance(order, CrunchingProfile):
             self.process_crunching_profile_order(order)
@@ -190,7 +191,7 @@ def process_order(self, order):
     def process_crunching_profile_order(self, order):
         '''Process an order to update the crunching profile.'''
         if self.crunching_profile.step_profile != order.step_profile:
-            raise ObsoleteCruncherException('Step profile changed; shutting down. '
-                                        'Crunching manager should create a '
-                                        'new cruncher.')
+            raise ObsoleteCruncherException('Step profile changed; shutting '
+                                            'down. Crunching manager should '
+                                            'create a new cruncher.')
         self.crunching_profile = order
diff --git a/garlicsim/garlicsim/asynchronous_crunching/crunchers/process_cruncher/process_cruncher.py b/garlicsim/garlicsim/asynchronous_crunching/crunchers/process_cruncher/process_cruncher.py
@@ -41,11 +41,10 @@ class ProcessCruncher(BaseCruncher):
     Read more about crunchers in the documentation of the `crunchers` package.
     
     The advantage of `ProcessCruncher` over `ThreadCruncher` is that
-    `ProcessCruncher` is able to run on a different core of the processor in the
-    machine, thus using the full power of the processor.
+    `ProcessCruncher` is able to run on a different core of the processor in
+    the machine, thus using the full power of the processor.
     '''
     
-    
     gui_explanation = string_tools.docstring_trim(
     '''
     `ProcessCruncher`:
@@ -94,9 +93,9 @@ def can_be_used_with_simpack_grokker(simpack_grokker):
         '''
         Return whether `ProcessCruncher` can be used with `simpack_grokker`.
         
-        For `ProcessCruncher` to be usable, the `multiprocessing` module must be
-        installed. Assuming it's installed, `ProcessCruncher` can be used if and
-        only if the simpack is not history-dependent.
+        For `ProcessCruncher` to be usable, the `multiprocessing` module must
+        be installed. Assuming it's installed, `ProcessCruncher` can be used if
+        and only if the simpack is not history-dependent.
         '''
         
         if not import_tools.exists('multiprocessing'):
diff --git a/garlicsim/garlicsim/asynchronous_crunching/crunchers/thread_cruncher.py b/garlicsim/garlicsim/asynchronous_crunching/crunchers/thread_cruncher.py
@@ -60,9 +60,10 @@ class ThreadCruncher(threading.Thread, BaseCruncher):
     
      - Easy to debug.
     
-     - On a single-core computer, it may be faster than `ProcessCruncher` because
-       of shared memory.
-     '''
+     - On a single-core computer, it may be faster than `ProcessCruncher`\
+       because of shared memory.
+       
+    '''
     )
     
     
@@ -107,10 +108,10 @@ def run(self):
         Internal method.
         
         This is called when the cruncher is started. It just calls the
-        `main_loop` method in a `try` clause, excepting `ObsoleteCruncherException`;
-        That exception means that the cruncher has been retired in the middle of
-        its job, so it is propagated up to this level, where it causes the
-        cruncher to terminate.
+        `main_loop` method in a `try` clause, excepting
+        `ObsoleteCruncherException`; That exception means that the cruncher has
+        been retired in the middle of its job, so it is propagated up to this
+        level, where it causes the cruncher to terminate.
         '''
         try:
             self.main_loop()
@@ -179,8 +180,9 @@ def check_crunching_profile(self, state):
         we retire the cruncher.
         '''
         if self.crunching_profile.state_satisfies(state):
-            raise ObsoleteCruncherException("We're done working, the clock target "
-                                        "has been reached. Shutting down.")
+            raise ObsoleteCruncherException("We're done working, the clock "
+                                            "target has been reached. "
+                                            "Shutting down.")
 
         
     def get_order(self):
@@ -198,8 +200,8 @@ def get_order(self):
     def process_order(self, order):
         '''Process an order receieved from `.order_queue`.'''
         if order == 'retire':
-            raise ObsoleteCruncherException("Cruncher received a 'retire' order; "
-                                        "Shutting down.")
+            raise ObsoleteCruncherException("Cruncher received a 'retire' "
+                                            "order; Shutting down.")
         
         elif isinstance(order, CrunchingProfile):
             self.process_crunching_profile_order(order)
@@ -208,9 +210,9 @@ def process_order(self, order):
     def process_crunching_profile_order(self, order):
         '''Process an order to update the crunching profile.'''
         if self.crunching_profile.step_profile != order.step_profile:
-            raise ObsoleteCruncherException('Step profile changed; shutting down. '
-                                        'Crunching manager should create a '
-                                        'new cruncher.')
+            raise ObsoleteCruncherException('Step profile changed; shutting '
+                                            'down. Crunching manager should '
+                                            'create a new cruncher.')
         self.crunching_profile = order
 
         
diff --git a/garlicsim/garlicsim/general_misc/persistent/human_names/female.txt b/garlicsim/garlicsim/general_misc/persistent/human_names/female.txt
diff --git a/garlicsim/garlicsim/general_misc/persistent/personality.py b/garlicsim/garlicsim/general_misc/persistent/personality.py
@@ -37,7 +37,10 @@ def __init__(self, persistent):
         
         u = int(persistent._CrossProcessPersistent__uuid)
         
-        (u, human_name_seed) = divmod(u, 5494)        
+        (u, human_name_seed) = divmod(
+            u,
+            len(human_names.name_list)
+        )
         self.human_name = human_names.name_list[human_name_seed]
         '''A human name. (e.g. "Jeffrey".)'''
         
