Skip to content

Fix norm() and __neg__() in VectorFieldOutput class #10

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

Open
michael3er wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix norm() and __neg__() in VectorFieldOutput class #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fcdd22
Fixed formula for VectorFieldOutput.norm()
Aug 3, 2020
0807f40
Fixed VectorFieldOutput.__neg__(self)
Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions abapy/postproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2009,7 +2009,7 @@ def norm(self):

:rtype: FieldOutput instance
'''
return (( self * self )**.5).sum()
return (self * self).sum() ** .5

def get_coord(self,number):
'''
Expand Down Expand Up @@ -2225,13 +2225,10 @@ def dot(self, other): # dot (scalar) product
if (type(other) in [int, float, long] or isinstance(other, FieldOutput) or isinstance(other, VectorFieldOutput)) == False:
return NotImplemented
return (self * other).sum()

def __neg__(self):
if (type(other) in [int, float, long] or isinstance(other, FieldOutput) or isinstance(other, VectorFieldOutput)) == False:
return NotImplemented
other = 1.
s1, s2, s3 = self.get_coord(1), self.get_coord(2), self.get_coord(3)
return VectorFieldOutput(data1 = -s1, data2 = -s2, data3 = -s3)
return VectorFieldOutput(data1=-s1, data2=-s2, data3=-s3)

def __sub__(self, other):
if type(other) in [int, float, long] or isinstance(other, FieldOutput) or isinstance(other, VectorFieldOutput) == False:
Expand Down