Merge pull request #162 from rchristie/utilsfix

opencmiss.maths fixes

setup.py

@@ -19,8 +19,9 @@ def readfile(filename, split=False):
 # into the 'requirements.txt' file.
 requires = [
     # minimal requirements listing
+    "opencmiss.maths",
     "opencmiss.utils >= 0.3",
-    "opencmiss.zinc",  # not yet on pypi - need manual install from opencmiss.org
+    "opencmiss.zinc >= 3.5",
     "scipy",
     "numpy",
 ]

src/scaffoldmaker/meshtypes/meshtype_1d_bifurcationtree1.py

@@ -4,7 +4,7 @@
 
 from __future__ import division
 from math import cos, radians, sin, sqrt
-from opencmiss.utils.maths.vectorops import add, cross, magnitude, mult, normalize, sub
+from opencmiss.maths.vectorops import add, cross, magnitude, mult, normalize, sub
 from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates, findOrCreateFieldFiniteElement
 from opencmiss.zinc.element import Element, Elementbasis
 from opencmiss.utils.zinc.general import ChangeManager

src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcation1.py

@@ -4,7 +4,7 @@
 
 from __future__ import division
 import math
-from opencmiss.utils.maths.vectorops import cross, mult, normalize, sub
+from opencmiss.maths.vectorops import cross, mult, normalize, sub
 from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates
 from opencmiss.zinc.field import Field
 from opencmiss.zinc.node import Node

src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcationtree1.py

@@ -4,7 +4,7 @@
 
 from __future__ import division
 import math
-from opencmiss.utils.maths.vectorops import cross, mult, normalize, sub
+from opencmiss.maths.vectorops import cross, mult, normalize, sub
 from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates
 from opencmiss.zinc.field import Field
 from opencmiss.zinc.node import Node

src/scaffoldmaker/meshtypes/meshtype_3d_heartarterialvalve1.py

@@ -6,7 +6,7 @@
 
 from __future__ import division
 import math
-from opencmiss.utils.maths.vectorops import eulerToRotationMatrix3
+from opencmiss.maths.vectorops import eulerToRotationMatrix3
 from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates
 from opencmiss.utils.zinc.finiteelement import getMaximumElementIdentifier, getMaximumNodeIdentifier
 from opencmiss.utils.zinc.general import ChangeManager

src/scaffoldmaker/scaffoldpackage.py

@@ -7,7 +7,7 @@
 import math
 from opencmiss.utils.zinc.field import createFieldEulerAnglesRotationMatrix
 from opencmiss.utils.zinc.general import ChangeManager
-from opencmiss.utils.maths.vectorops import euler_to_rotation_matrix
+from opencmiss.maths.vectorops import euler_to_rotation_matrix
 from scaffoldmaker.annotation.annotationgroup import AnnotationGroup, findAnnotationGroupByName
 from scaffoldmaker.meshtypes.scaffold_base import Scaffold_base
 

src/scaffoldmaker/utils/bifurcation.py

@@ -3,7 +3,7 @@
 """
 
 from __future__ import division
-from opencmiss.utils.maths.vectorops import add, cross, dot, magnitude, mult, normalize, sub
+from opencmiss.maths.vectorops import add, cross, dot, magnitude, mult, normalize, sub
 from opencmiss.zinc.element import Element, Elementbasis
 from opencmiss.zinc.field import Field
 from opencmiss.zinc.node import Node

src/scaffoldmaker/utils/derivativemoothing.py

@@ -3,7 +3,7 @@
 '''
 from __future__ import division
 import math
-from opencmiss.utils.maths.vectorops import add, magnitude
+from opencmiss.maths.vectorops import add, magnitude
 from opencmiss.utils.zinc.field import findOrCreateFieldGroup
 from opencmiss.utils.zinc.general import ChangeManager
 from opencmiss.zinc.element import Element, Elementbasis

tests/test_general.py

@@ -1,5 +1,5 @@
 import unittest
-from opencmiss.utils.maths.vectorops import magnitude
+from opencmiss.maths.vectorops import magnitude
 from opencmiss.utils.zinc.finiteelement import evaluateFieldNodesetRange, findNodeWithName
 from opencmiss.zinc.context import Context
 from opencmiss.zinc.field import Field