omic/propka
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clean up line endings for vector_algebra.py

Browse Source 
See https://github.com/jensengroup/propka-3.1/issues/43
This commit is contained in:
Nathan Baker
2020-05-25 20:30:58 -07:00
parent d965d95fba
commit c2f362a101
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
propka/vector_algebra.py
View File

@@ -48,9 +48,12 @@ class Vector:
return self.x * other.x + self.y * other.y + self.z * other.z return self.x * other.x + self.y * other.y + self.z * other.z
elif isinstance(other, Matrix4x4): elif isinstance(other, Matrix4x4):
return Vector( return Vector(
xi=other.a11*self.x + other.a12*self.y + other.a13*self.z + other.a14*1.0, xi=other.a11*self.x + other.a12*self.y + other.a13*self.z
yi=other.a21*self.x + other.a22*self.y + other.a23*self.z + other.a24*1.0, + other.a14*1.0,
zi=other.a31*self.x + other.a32*self.y + other.a33*self.z + other.a34*1.0 yi=other.a21*self.x + other.a22*self.y + other.a23*self.z
+ other.a24*1.0,
zi=other.a31*self.x + other.a32*self.y + other.a33*self.z
+ other.a34*1.0
) )
elif type(other) in [int, float]: elif type(other) in [int, float]:
return Vector(self.x * other, self.y * other, self.z * other) return Vector(self.x * other, self.y * other, self.z * other)
@@ -405,8 +408,7 @@ def rotate_multi_vector_around_an_axis(theta, axis, vec):
raise 'Incompatible keys in rotate MultiVector' raise 'Incompatible keys in rotate MultiVector'
res = MultiVector() res = MultiVector()
for i, key in enumerate(vec.keys): for i, key in enumerate(vec.keys):
res.vectors.append(rotate_vector_around_an_axis(theta, res.vectors.append(rotate_vector_around_an_axis(
axis.vectors[i], theta, axis.vectors[i], vec.vectors[i]))
vec.vectors[i]))
res.keys.append(key) res.keys.append(key)
return res return res