Skip to content

implement Vector operators __add__, __sub__, __mul__ #6

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

Merged
merged 2 commits into from
Dec 5, 2018
Merged

implement Vector operators __add__, __sub__, __mul__ #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3837f
implement Vector operators __add__, __sub__, __mul__, __truediv__
justbuchanan Nov 19, 2018
66ce2d9
implement Vector __abs__ and __neg__ operators
justbuchanan Nov 22, 2018
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
18 changes: 18 additions & 0 deletions cadquery/occ_impl/geom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,25 @@ def dot(self, v):
def sub(self, v):
return Vector(self.wrapped.Subtracted(v.wrapped))

def __sub__(self, v):
return self.sub(v)

def add(self, v):
return Vector(self.wrapped.Added(v.wrapped))

def __add__(self, v):
return self.add(v)

def multiply(self, scale):
"""Return a copy multiplied by the provided scalar"""
return Vector(self.wrapped.Multiplied(scale))

def __mul__(self, scale):
return self.multiply(scale)

def __truediv__(self, denom):
return self.multiply(1.0 / denom)

def normalized(self):
"""Return a normalized version of this vector"""
return Vector(self.wrapped.Normalized())
Expand Down Expand Up @@ -126,6 +138,12 @@ def __add__(self, v):
def __sub__(self, v):
return self.sub(v)

def __neg__(self):
return self * -1

def __abs__(self):
return self.Length

def __repr__(self):
return 'Vector: ' + str((self.x, self.y, self.z))

Expand Down
19 changes: 19 additions & 0 deletions tests/TestCadObjects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,25 @@ def testVectorAdd(self):
result = Vector(1, 2, 0) + Vector(0, 0, 3)
self.assertTupleAlmostEquals((1.0, 2.0, 3.0), result.toTuple(), 3)

def testVectorOperators(self):
result = Vector(1, 1, 1) + Vector(2, 2, 2)
self.assertEqual(Vector(3, 3, 3), result)

result = Vector(1, 2, 3) - Vector(3, 2, 1)
self.assertEqual(Vector(-2, 0, 2), result)

result = Vector(1, 2, 3) * 2
self.assertEqual(Vector(2, 4, 6), result)

result = Vector(2, 4, 6) / 2
self.assertEqual(Vector(1, 2, 3), result)

self.assertEqual(Vector(-1, -1, -1), -Vector(1, 1, 1))

self.assertEqual(0, abs(Vector(0, 0, 0)))
self.assertEqual(1, abs(Vector(1, 0, 0)))
self.assertEqual((1+4+9)**0.5, abs(Vector(1, 2, 3)))

def testVectorEquals(self):
a = Vector(1, 2, 3)
b = Vector(1, 2, 3)
Expand Down