checks for memory error in a few more places.

included csgui.py in the python package.

Author: tanmaykm

circuitscape/compute.py

@@ -566,6 +566,8 @@ def single_ground_all_pair_resistances(self, g_habitat, fp, cs, report_status):
                 else:
                     try:
                         result = Compute.single_ground_solver(G, local_src, local_dst, options.solver, self.state.amg_hierarchy)
+                    except MemoryError:
+                        raise MemoryError
                     except:
                         result = None
                     post_solve(result)

circuitscape/state.py

@@ -44,6 +44,8 @@ def worker_pool_submit(self, function, callback, *args):
         else:
             try:
                 result = function(*args)
+            except MemoryError:
+                raise MemoryError
             except:
                 result = None
             callback(result)

setup.py

@@ -8,7 +8,7 @@
     author = __author__,
     author_email = __email__,
     packages = ['circuitscape', 'circuitscape.verify'],
-    scripts = ['bin/csrun.py','bin/csverify.py'],
+    scripts = ['bin/csrun.py','bin/csgui.py','bin/csverify.py'],
     url = 'http://www.circuitscape.org/',
     license = 'LICENSE.txt',
     description = 'Circuitscape borrows algorithms from electronic circuit theory to predict patterns of movement, gene flow, and genetic differentiation among plant and animal populations in heterogeneous landscapes.',