Futurize 1, futurize 2, pasteurize.

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
+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()