wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-08-10 12:40:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Futurize 1, futurize 2, pasteurize.

Browse Source
This commit is contained in:
Brendan Smithyman
2016-07-16 14:17:02 -05:00
parent 362975d2bd
commit ca8d8f8c2d
197 changed files with 2618 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/utils/__init__.py
+6
View File
@@ -1,3 +1,9 @@
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
if __name__ == '__main__':
import os
import glob
tests/utils/test_Zero.py
+22 -15
View File
@@ -1,3 +1,10 @@
from __future__ import division
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
from past.utils import old_div
import unittest
from SimPEG.Utils import Zero, Identity, sdiag, mkvc
from SimPEG import np, sp
@@ -19,7 +26,7 @@ class Tests(unittest.TestCase):
assert z - 3 -z == -3
assert 3*z == 0
assert z*3 == 0
assert z/3 == 0
assert old_div(z,3) == 0
a = 1
a += z
@@ -27,7 +34,7 @@ class Tests(unittest.TestCase):
a = 1
a += z
assert a == 1
self.assertRaises(ZeroDivisionError, lambda:3/z)
self.assertRaises(ZeroDivisionError, lambda:old_div(3,z))
assert mkvc(z) == 0
assert sdiag(z)*a == 0
@@ -68,12 +75,12 @@ class Tests(unittest.TestCase):
assert 3 - -o == 4
assert 3 - o == 2
assert o/2 == 0
assert o/2. == 0.5
assert -o/2 == -1
assert -o/2. == -0.5
assert 2/o == 2
assert 2/-o == -2
assert old_div(o,2) == 0
assert old_div(o,2.) == 0.5
assert old_div(-o,2) == -1
assert old_div(-o,2.) == -0.5
assert old_div(2,o) == 2
assert old_div(2,-o) == -2
def test_mat_one(self):
@@ -87,9 +94,9 @@ class Tests(unittest.TestCase):
check(o * S, [[2,0],[0,3]])
check(S * -o, [[-2,0],[0,-3]])
check(-o * S, [[-2,0],[0,-3]])
check(S/o, [[2,0],[0,3]])
check(S/-o, [[-2,0],[0,-3]])
self.assertRaises(NotImplementedError, lambda:o/S)
check(old_div(S,o), [[2,0],[0,3]])
check(old_div(S,-o), [[-2,0],[0,-3]])
self.assertRaises(NotImplementedError, lambda:old_div(o,S))
check(S + o, [[3,0],[0,4]])
check(o + S, [[3,0],[0,4]])
@@ -114,10 +121,10 @@ class Tests(unittest.TestCase):
assert np.all(1+n == o+n)
assert np.all(n-1 == n-o)
assert np.all(1-n == o-n)
assert np.all(n/1 == n/o)
assert np.all(n/-1 == n/-o)
assert np.all(1/n == o/n)
assert np.all(-1/n == -o/n)
assert np.all(old_div(n,1) == old_div(n,o))
assert np.all(old_div(n,-1) == old_div(n,-o))
assert np.all(old_div(1,n) == old_div(o,n))
assert np.all(old_div(-1,n) == old_div(-o,n))
assert np.all(n*1 == n*o)
assert np.all(n*-1 == n*-o)
assert np.all(1*n == o*n)
tests/utils/test_coordutils.py
+14 -7
View File
@@ -1,3 +1,10 @@
from __future__ import division
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
from past.utils import old_div
import unittest, os
import numpy as np
from SimPEG import Utils
@@ -9,11 +16,11 @@ class coorUtilsTest(unittest.TestCase):
def test_rotationMatrixFromNormals(self):
np.random.seed(0)
v0 = np.random.rand(3)
v0 *= 1./np.linalg.norm(v0)
v0 *= old_div(1.,np.linalg.norm(v0))
np.random.seed(5)
v1 = np.random.rand(3)
v1 *= 1./np.linalg.norm(v1)
v1 *= old_div(1.,np.linalg.norm(v1))
Rf = Utils.coordutils.rotationMatrixFromNormals(v0,v1)
Ri = Utils.coordutils.rotationMatrixFromNormals(v1,v0)
@@ -24,11 +31,11 @@ class coorUtilsTest(unittest.TestCase):
def test_rotatePointsFromNormals(self):
np.random.seed(10)
v0 = np.random.rand(3)
v0*= 1./np.linalg.norm(v0)
v0*= old_div(1.,np.linalg.norm(v0))
np.random.seed(15)
v1 = np.random.rand(3)
v1*= 1./np.linalg.norm(v1)
v1*= old_div(1.,np.linalg.norm(v1))
v2 = Utils.mkvc(Utils.coordutils.rotatePointsFromNormals(Utils.mkvc(v0,2).T,v0,v1))
@@ -37,11 +44,11 @@ class coorUtilsTest(unittest.TestCase):
def test_rotateMatrixFromNormals(self):
np.random.seed(20)
n0 = np.random.rand(3)
n0 *= 1./np.linalg.norm(n0)
n0 *= old_div(1.,np.linalg.norm(n0))
np.random.seed(25)
n1 = np.random.rand(3)
n1 *= 1./np.linalg.norm(n1)
n1 *= old_div(1.,np.linalg.norm(n1))
np.random.seed(30)
scale = np.random.rand(100,1)
@@ -49,7 +56,7 @@ class coorUtilsTest(unittest.TestCase):
XYZ1 = scale * n1
XYZ2 = Utils.coordutils.rotatePointsFromNormals(XYZ0,n0,n1)
self.assertTrue(np.linalg.norm(Utils.mkvc(XYZ1) - Utils.mkvc(XYZ2))/np.linalg.norm(Utils.mkvc(XYZ1)) < tol)
self.assertTrue(old_div(np.linalg.norm(Utils.mkvc(XYZ1) - Utils.mkvc(XYZ2)),np.linalg.norm(Utils.mkvc(XYZ1))) < tol)
if __name__ == '__main__':
unittest.main()
tests/utils/test_utils.py
+10 -1
View File
@@ -1,3 +1,12 @@
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from builtins import int
from future import standard_library
standard_library.install_aliases()
from builtins import range
from builtins import object
import unittest
from SimPEG.Utils import *
from SimPEG import Mesh, np, sp
@@ -220,7 +229,7 @@ class TestSequenceFunctions(unittest.TestCase):
def test_isScalar(self):
self.assertTrue(isScalar(1.))
self.assertTrue(isScalar(1))
self.assertTrue(isScalar(long(1)))
self.assertTrue(isScalar(int(1)))
self.assertTrue(isScalar(np.r_[1.]))
self.assertTrue(isScalar(np.r_[1]))