Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistent matrix output versus tuple output FIXED #20606

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Consistent matrix output versus tuple output FIXED #20606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 22 additions & 5 deletions sympy/vector/coordsysrect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,14 +472,14 @@ def lame_coefficients(self):
return self._lame_coefficients

def transformation_to_parent(self):
return self._transformation_lambda(*self.base_scalars())
return tuple_to_matrix(self._transformation_lambda(*self.base_scalars()))

def transformation_from_parent(self):
if self._parent is None:
raise ValueError("no parent coordinate system, use "
"`transformation_from_parent_function()`")
return self._transformation_from_parent_lambda(
*self._parent.base_scalars())
return tuple_to_matrix(self._transformation_from_parent_lambda(
*self._parent.base_scalars()))

def transformation_from_parent_function(self):
return self._transformation_from_parent_lambda
Expand Down Expand Up @@ -1006,9 +1006,15 @@ def create_new(self, name, transformation, variable_names=None, vector_names=Non
>>> a = CoordSys3D('a')
>>> b = a.create_new('b', transformation='spherical')
>>> b.transformation_to_parent()
(b.r*sin(b.theta)*cos(b.phi), b.r*sin(b.phi)*sin(b.theta), b.r*cos(b.theta))
Matrix([
[b.r*sin(b.theta)*cos(b.phi)],
[b.r*sin(b.phi)*sin(b.theta)],
[ b.r*cos(b.theta)]])
>>> b.transformation_from_parent()
(sqrt(a.x**2 + a.y**2 + a.z**2), acos(a.z/sqrt(a.x**2 + a.y**2 + a.z**2)), atan2(a.y, a.x))
Matrix([
[ sqrt(a.x**2 + a.y**2 + a.z**2)],
[acos(a.z/sqrt(a.x**2 + a.y**2 + a.z**2))],
[ atan2(a.y, a.x)]])

"""
return CoordSys3D(name, parent=self, transformation=transformation,
Expand Down Expand Up @@ -1046,6 +1052,17 @@ def _check_strings(arg_name, arg):
if not isinstance(s, str):
raise TypeError(errorstr)

def tuple_to_matrix(tuple):
if (isinstance(tuple, Matrix)):
return tuple
index = 0
M = Matrix([[ ]])
for elt in tuple:
temp = Matrix([ [ elt ] ])
M = M.row_insert(index, temp)
index += 1
return M


# Delayed import to avoid cyclic import problems:
from sympy.vector.vector import BaseVector
54 changes: 32 additions & 22 deletions sympy/vector/tests/test_coordsysrect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ def test_create_new():
c = a.create_new('c', transformation='spherical')
assert c._parent == a
assert c.transformation_to_parent() == \
(c.r*sin(c.theta)*cos(c.phi), c.r*sin(c.theta)*sin(c.phi), c.r*cos(c.theta))
Matrix([[c.r*sin(c.theta)*cos(c.phi)], [c.r*sin(c.theta)*sin(c.phi)], [c.r*cos(c.theta)]])
assert c.transformation_from_parent() == \
(sqrt(a.x**2 + a.y**2 + a.z**2), acos(a.z/sqrt(a.x**2 + a.y**2 + a.z**2)), atan2(a.y, a.x))
Matrix([[sqrt(a.x**2 + a.y**2 + a.z**2)], [acos(a.z/sqrt(a.x**2 + a.y**2 + a.z**2))], [atan2(a.y, a.x)]])


def test_evalf():
Expand Down Expand Up @@ -335,11 +335,11 @@ def test_transformation_equations():
raises(AttributeError, lambda: a.y)
raises(AttributeError, lambda: a.z)

assert a.transformation_to_parent() == (
r*sin(theta)*cos(phi),
r*sin(theta)*sin(phi),
r*cos(theta)
)
assert a.transformation_to_parent() == Matrix([
[r*sin(theta)*cos(phi)],
[r*sin(theta)*sin(phi)],
[r*cos(theta)]
])
assert a.lame_coefficients() == (1, r, r*sin(theta))
assert a.transformation_from_parent_function()(x, y, z) == (
sqrt(x ** 2 + y ** 2 + z ** 2),
Expand All @@ -349,17 +349,17 @@ def test_transformation_equations():
a = CoordSys3D('a', transformation='cylindrical',
variable_names=["r", "theta", "z"])
r, theta, z = a.base_scalars()
assert a.transformation_to_parent() == (
r*cos(theta),
r*sin(theta),
z
)
assert a.transformation_to_parent() == Matrix([
[r*cos(theta)],
[r*sin(theta)],
[z]
])
assert a.lame_coefficients() == (1, a.r, 1)
assert a.transformation_from_parent_function()(x, y, z) == (sqrt(x**2 + y**2),
atan2(y, x), z)

a = CoordSys3D('a', 'cartesian')
assert a.transformation_to_parent() == (a.x, a.y, a.z)
assert a.transformation_to_parent() == Matrix([[a.x], [a.y], [a.z]])
assert a.lame_coefficients() == (1, 1, 1)
assert a.transformation_from_parent_function()(x, y, z) == (x, y, z)

Expand All @@ -369,7 +369,7 @@ def test_transformation_equations():
x, y, z = symbols('x y z')
a = CoordSys3D('a', ((x, y, z), (x, y, z)))
a._calculate_inv_trans_equations()
assert a.transformation_to_parent() == (a.x1, a.x2, a.x3)
assert a.transformation_to_parent() == Matrix([[a.x1], [a.x2], [a.x3]])
assert a.lame_coefficients() == (1, 1, 1)
assert a.transformation_from_parent_function()(x, y, z) == (x, y, z)
r, theta, z = symbols("r theta z")
Expand All @@ -378,9 +378,9 @@ def test_transformation_equations():
a = CoordSys3D('a', [(r, theta, z), (r*cos(theta), r*sin(theta), z)],
variable_names=["r", "theta", "z"])
r, theta, z = a.base_scalars()
assert a.transformation_to_parent() == (
r*cos(theta), r*sin(theta), z
)
assert a.transformation_to_parent() == Matrix([
[r*cos(theta)], [r*sin(theta)], [z]
])
assert a.lame_coefficients() == (
sqrt(sin(theta)**2 + cos(theta)**2),
sqrt(r**2*sin(theta)**2 + r**2*cos(theta)**2),
Expand All @@ -391,7 +391,7 @@ def test_transformation_equations():

# Cartesian with `lambda`
a = CoordSys3D('a', lambda x, y, z: (x, y, z))
assert a.transformation_to_parent() == (a.x1, a.x2, a.x3)
assert a.transformation_to_parent() == Matrix([[a.x1], [a.x2], [a.x3]])
assert a.lame_coefficients() == (1, 1, 1)
a._calculate_inv_trans_equations()
assert a.transformation_from_parent_function()(x, y, z) == (x, y, z)
Expand All @@ -400,9 +400,9 @@ def test_transformation_equations():
a = CoordSys3D('a', lambda r, theta, phi: (r*sin(theta)*cos(phi), r*sin(theta)*sin(phi), r*cos(theta)),
variable_names=["r", "theta", "phi"])
r, theta, phi = a.base_scalars()
assert a.transformation_to_parent() == (
r*sin(theta)*cos(phi), r*sin(phi)*sin(theta), r*cos(theta)
)
assert a.transformation_to_parent() == Matrix([
[r*sin(theta)*cos(phi)], [r*sin(phi)*sin(theta)], [r*cos(theta)]
])
assert a.lame_coefficients() == (
sqrt(sin(phi)**2*sin(theta)**2 + sin(theta)**2*cos(phi)**2 + cos(theta)**2),
sqrt(r**2*sin(phi)**2*cos(theta)**2 + r**2*sin(theta)**2 + r**2*cos(phi)**2*cos(theta)**2),
Expand All @@ -415,7 +415,7 @@ def test_transformation_equations():
variable_names=["r", "theta", "z"]
)
r, theta, z = a.base_scalars()
assert a.transformation_to_parent() == (r*cos(theta), r*sin(theta), z)
assert a.transformation_to_parent() == Matrix([[r*cos(theta)], [r*sin(theta)], [z]])
assert a.lame_coefficients() == (
sqrt(sin(theta)**2 + cos(theta)**2),
sqrt(r**2*sin(theta)**2 + r**2*cos(theta)**2),
Expand Down Expand Up @@ -460,3 +460,13 @@ def test_rotation_trans_equations():
(-sin(q0) * c.y + cos(q0) * c.x, sin(q0) * c.x + cos(q0) * c.y, c.z)
assert c._rotation_trans_equations(c._inverse_rotation_matrix(), c.base_scalars()) == \
(sin(q0) * c.y + cos(q0) * c.x, -sin(q0) * c.x + cos(q0) * c.y, c.z)

def test_issue_19725():
N = CoordSys3D('N')
M = N.create_new("M", transformation="cylindrical")
a = symbols("a")
O = N.orient_new_axis("O", a, N.k)

assert M.transformation_to_parent() == Matrix([[M.r*cos(M.theta)], [M.r*sin(M.theta)], [M.z]])
assert M.transformation_from_parent() == Matrix([[sqrt(N.x**2 + N.y**2)], [atan2(N.y, N.x)], [N.z]])
assert isinstance(O.transformation_to_parent(), Matrix)