[cig-commits] [commit] pull_39: update tests to use new floating point check (ac2c35d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Dec 8 12:30:23 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : pull_39
Link : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...ac2c35dff40d9f0fb90b442d0086964ebe5d5976
>---------------------------------------------------------------
commit ac2c35dff40d9f0fb90b442d0086964ebe5d5976
Author: Timo Heister <timo.heister at gmail.com>
Date: Mon Dec 8 15:27:44 2014 -0500
update tests to use new floating point check
>---------------------------------------------------------------
ac2c35dff40d9f0fb90b442d0086964ebe5d5976
tests/test_partitioning.py | 7 ++++---
tests/test_spin.py | 7 ++++---
tests/test_vrh.py | 49 +++++++++++++++++++++++-----------------------
tests/tests.py | 16 ++++-----------
4 files changed, 37 insertions(+), 42 deletions(-)
diff --git a/tests/test_partitioning.py b/tests/test_partitioning.py
index 8e2b0a0..b35a3d4 100644
--- a/tests/test_partitioning.py
+++ b/tests/test_partitioning.py
@@ -1,4 +1,5 @@
import unittest
+from util import BurnManTest
import os, sys
sys.path.insert(1,os.path.abspath('..'))
@@ -8,7 +9,7 @@ from burnman import minerals
# TODO: test composite that changes number of entries
-class test(unittest.TestCase):
+class test(BurnManTest):
def test_simple(self):
inp1 = {'Mg':0.213, 'Fe': 0.0626, 'Si':0.242, 'Ca':0., 'Al':0.} # wt%
@@ -24,8 +25,8 @@ class test(unittest.TestCase):
pressure = StartP
temperature = gt([StartP])[0]
(a,b) = burnman.calculate_partition_coefficient(pressure, temperature, rel_mol_per, 0.5)
- self.assertAlmostEqual(a, 0.14347274523)
- self.assertAlmostEqual(b, 0.108980503625)
+ self.assertFloatEqual(a, 0.14347274523)
+ self.assertFloatEqual(b, 0.108980503625)
diff --git a/tests/test_spin.py b/tests/test_spin.py
index 14ac3f8..caa0824 100644
--- a/tests/test_spin.py
+++ b/tests/test_spin.py
@@ -1,4 +1,5 @@
import unittest
+from util import BurnManTest
import os, sys
sys.path.insert(1,os.path.abspath('..'))
@@ -7,7 +8,7 @@ from burnman import minerals
-class spin_transition(unittest.TestCase):
+class spin_transition(BurnManTest):
def test_new(self):
mins = [minerals.Murakami_etal_2012.fe_periclase(), minerals.Murakami_etal_2012.fe_periclase_HS(), minerals.Murakami_etal_2012.fe_periclase_LS()]
@@ -20,7 +21,7 @@ class spin_transition(unittest.TestCase):
#print p.v_s()
f,c = mins[0].unroll()
- self.assertAlmostEqual(c[0].v_s(), mins[1].v_s())
+ self.assertFloatEqual(c[0].v_s(), mins[1].v_s())
#print "LS regime: (on/high/low)"
for p in mins:
@@ -28,7 +29,7 @@ class spin_transition(unittest.TestCase):
#print p.v_s()
f,c = mins[0].unroll()
- self.assertAlmostEqual(c[0].v_s(), mins[2].v_s())
+ self.assertFloatEqual(c[0].v_s(), mins[2].v_s())
if __name__ == '__main__':
diff --git a/tests/test_vrh.py b/tests/test_vrh.py
index 41f46f9..684e345 100644
--- a/tests/test_vrh.py
+++ b/tests/test_vrh.py
@@ -5,6 +5,7 @@ sys.path.insert(1,os.path.abspath('..'))
import burnman
from burnman import minerals
import burnman.averaging_schemes as avg
+from util import BurnManTest
class mypericlase (burnman.Mineral):
"""
@@ -25,35 +26,35 @@ class mypericlase (burnman.Mineral):
'q_0': 1.5,
'eta_s_0': 2.8 }
-class VRH_average(unittest.TestCase):
+class VRH_average(BurnManTest):
def test_one_object(self):
v = avg.voigt_reuss_hill_function([2.0],[0.123])
- self.assertAlmostEqual(0.123, v)
+ self.assertFloatEqual(0.123, v)
def test_two_same(self):
v = avg.voigt_reuss_hill_function([2.0, 2.0],[0.456, 0.456])
- self.assertAlmostEqual(0.456, v)
+ self.assertFloatEqual(0.456, v)
def test_one_no_volume(self):
v = avg.voigt_reuss_hill_function([0.0, 2.0],[0.123, 0.456])
- self.assertAlmostEqual(0.456, v)
+ self.assertFloatEqual(0.456, v)
def test_mix(self):
v = avg.voigt_reuss_hill_function([1.0, 2.0],[0.1, 0.2])
- self.assertAlmostEqual(0.15833333333333, v)
+ self.assertFloatEqual(0.15833333333333, v)
-class VRH(unittest.TestCase):
+class VRH(BurnManTest):
def test_1(self):
rock = burnman.Composite ( [1.0], [mypericlase()] )
rock.set_method('slb3')
rho, v_p, v_s, v_phi, K_vrh, G_vrh = \
burnman.velocities_from_rock(rock, [10e9,], [300,])
- self.assertAlmostEqual(3791.392, rho[0], 2)
- self.assertAlmostEqual(10285.368, v_p[0], 2)
- self.assertAlmostEqual(6308.811, v_s[0], 2)
- self.assertAlmostEqual(7260.900, v_phi[0], 2)
- self.assertAlmostEqual(199.884, K_vrh[0]/1.e9, 2)
- self.assertAlmostEqual(150.901, G_vrh[0]/1.e9, 2)
+ self.assertFloatEqual(3791.392, rho[0])
+ self.assertFloatEqual(10285.368, v_p[0])
+ self.assertFloatEqual(6308.811, v_s[0])
+ self.assertFloatEqual(7260.900, v_phi[0])
+ self.assertFloatEqual(199.884, K_vrh[0]/1.e9)
+ self.assertFloatEqual(150.901, G_vrh[0]/1.e9)
def same(self, number):
rock = burnman.Composite ( [1.0/number] * number, [mypericlase()]*number )
@@ -61,12 +62,12 @@ class VRH(unittest.TestCase):
rock.set_method('slb3')
rho, v_p, v_s, v_phi, K_vrh, G_vrh = \
burnman.velocities_from_rock(rock, [10e9,], [300,])
- self.assertAlmostEqual(3791.392, rho[0], 2)
- self.assertAlmostEqual(10285.368, v_p[0], 2)
- self.assertAlmostEqual(6308.811, v_s[0], 2)
- self.assertAlmostEqual(7260.900, v_phi[0], 2)
- self.assertAlmostEqual(199.884, K_vrh[0]/1.e9, 2)
- self.assertAlmostEqual(150.901, G_vrh[0]/1.e9, 2)
+ self.assertFloatEqual(3791.392, rho[0])
+ self.assertFloatEqual(10285.368, v_p[0])
+ self.assertFloatEqual(6308.811, v_s[0])
+ self.assertFloatEqual(7260.900, v_phi[0])
+ self.assertFloatEqual(199.884, K_vrh[0]/1.e9)
+ self.assertFloatEqual(150.901, G_vrh[0]/1.e9)
def test_same(self):
self.same(2)
@@ -78,12 +79,12 @@ class VRH(unittest.TestCase):
rock.set_method('slb3')
rho, v_p, v_s, v_phi, K_vrh, G_vrh = \
burnman.velocities_from_rock(rock,[10e9,], [300,])
- self.assertAlmostEqual(3791.392, rho[0], 2)
- self.assertAlmostEqual(10285.368, v_p[0], 2)
- self.assertAlmostEqual(6308.811, v_s[0], 2)
- self.assertAlmostEqual(7260.900, v_phi[0], 2)
- self.assertAlmostEqual(199.884, K_vrh[0]/1.e9, 2)
- self.assertAlmostEqual(150.901, G_vrh[0]/1.e9, 2)
+ self.assertFloatEqual(3791.392, rho[0])
+ self.assertFloatEqual(10285.368, v_p[0])
+ self.assertFloatEqual(6308.811, v_s[0])
+ self.assertFloatEqual(7260.900, v_phi[0])
+ self.assertFloatEqual(199.884, K_vrh[0]/1.e9)
+ self.assertFloatEqual(150.901, G_vrh[0]/1.e9)
if __name__ == '__main__':
diff --git a/tests/tests.py b/tests/tests.py
index af65188..d7f1596 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -1,4 +1,5 @@
import unittest
+from util import BurnManTest
from test_vrh import *
from test_spin import *
from test_composite import *
@@ -12,26 +13,17 @@ import burnman
from burnman import minerals
-class TestRock(unittest.TestCase):
+class TestRock(BurnManTest):
def test_rock(self):
amount_perovskite = 0.3
rock = burnman.Composite( [amount_perovskite, 1.0-amount_perovskite], \
[minerals.SLB_2005.mg_fe_perovskite(0.1), minerals.SLB_2005.ferropericlase(0.2)] )
rock.set_method('slb2')
(fr,phases)=rock.unroll()
- self.assertAlmostEqual(fr[0], 0.3, 2)
- self.assertAlmostEqual(fr[1], 0.7, 2)
+ self.assertFloatEqual(fr[0], 0.3)
+ self.assertFloatEqual(fr[1], 0.7)
-#class MyTest(unittest.TestCase):
-# def test(self):
-# self.assertEqual(3, 4)
-
-
-
-#class CompareL2(unittest.TestCase):
-
-#class VsVp(unittest.TestCase):
if __name__ == '__main__':
More information about the CIG-COMMITS
mailing list