X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/3d17926f6a9051fd4b3a2c19b756849103592bd9..e7f3590c9ffe5b309c11048f12888e18b3b82529:/pypol/coordinates.py diff --git a/pypol/coordinates.py b/pypol/coordinates.py index eb8e78c..69d498e 100644 --- a/pypol/coordinates.py +++ b/pypol/coordinates.py @@ -133,30 +133,9 @@ class Vector(Coordinates): self._coordinates = terminal._map2(initial, operator.sub) return self - @property - def symbols(self): - return tuple(self._coordinates) - - @property - def dimension(self): - return len(self.symbols) - - def coordinates(self): - yield from self._coordinates.items() - - def coordinate(self, symbol): - if not isinstance(symbol, Symbol): - raise TypeError('symbol must be a Symbol instance') - return self._coordinates[symbol] - - __getitem__ = coordinate - def isnull(self): return not bool(self) - def __bool__(self): - return any(self._coordinates.values()) - def __add__(self, other): if isinstance(other, (Point, Vector)): coordinates = self._map2(other, operator.add) @@ -171,7 +150,7 @@ class Vector(Coordinates): """ if not isinstance(other, Vector): raise TypeError('argument must be a Vector instance') - cosinus = self.dot(other) / (self.norm() * other.norm()) + cosinus = self.dot(other) / (self.norm()*other.norm()) return math.acos(cosinus) def cross(self, other): @@ -248,8 +227,3 @@ class Vector(Coordinates): coordinates = self._map2(other, operator.sub) return other.__class__(coordinates) return NotImplemented - - def __repr__(self): - string = ', '.join(['{!r}: {!r}'.format(symbol, coordinate) - for symbol, coordinate in self.coordinates()]) - return '{}({{{}}})'.format(self.__class__.__name__, string)