Merge pull request #16 from dslosky-usgs/updates

Add core tests and roll version

setup.py

@@ -29,7 +29,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.0a3',
+    version='0.0a4',
 
     description='Potential impact calculation for well defined facilities due to an input earthquake hazard',
     long_description=long_description,

shakecastaebm/capacity.py

@@ -432,6 +432,7 @@ def get_ultimate_point(ductility, d_y, a_y, post_yield):
 
 def get_ultimate_period(d, a):
     return math.sqrt(d / (a * 9.779738))
+
 def get_elastic_damping(mbt):
     lookup = {
         'C1': .07,

shakecastaebm/core.py

@@ -14,7 +14,7 @@ def run(capacity, hazard, hazard_beta,
         capacity: a capacity curve generated by the capacity module
         hazard: spectral curve describing a natural hazard
 
-            [{'x': .01, 'y': .8}, {'x': .02, 'y': 1.1}, ...}]
+            [{'disp': .01, 'acc': .8}, {'disp': .02, 'acc': 1.1}, ...}]
 
         hazard_beta: uncertainty in the hazard curve
         pref_periods: a list of periods to interpolate

shakecastaebm/tests/bundle.py

@@ -1,3 +1,4 @@
+from .core import *
 from .damage import *
 from .damping import *
 from .spectrum import *

shakecastaebm/tests/core.py

@@ -0,0 +1,29 @@
+import unittest
+
+from shakecastaebm.capacity import get_capacity
+from shakecastaebm.core import run
+
+class TestRun(unittest.TestCase):
+    def test_Runs(self):
+        # run shakecast example
+        hazard = [
+            {'x': .03, 'y': 1.1377},
+            {'x': 1.0, 'y': .8302},
+            {'x': 3.0, 'y': .348}
+        ]
+
+        hazard_beta = .5
+        mag = 6.7
+        r_rup = 20
+
+        capacity = get_capacity('C2', 'high', 1, 24, 2, 1990, 'very_poor', 'poor')
+
+        results = run(capacity,
+                hazard, hazard_beta, mag, r_rup)
+
+        for result in results:
+            self.assertIsNotNone(result)
+
+
+if __name__ == '__main__':
+    unittest.main()

shakecastaebm/tests/performance_point.py

@@ -21,8 +21,6 @@ def test_performancePoint(self):
         self.assertTrue('acc' in pp.keys())
         self.assertTrue('period' in pp.keys())
 
-def main():
-    unittest.main()
 
 if __name__ == '__main__':
-    main()
+    unittest.main()