X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/48ede349025246bb3a3294f677b633991b69abad..d585b06ccf67b2837519f4b48c6800dcdb924d9d:/linpy/geometry.py diff --git a/linpy/geometry.py b/linpy/geometry.py index cc19a72..80f7771 100644 --- a/linpy/geometry.py +++ b/linpy/geometry.py @@ -19,8 +19,8 @@ import math import numbers import operator -from abc import ABC, abstractproperty, abstractmethod -from collections import OrderedDict, Mapping +from abc import ABC, abstractmethod, abstractproperty +from collections import Mapping, OrderedDict from .linexprs import Symbol @@ -79,8 +79,8 @@ class Coordinates: def __new__(cls, coordinates): """ - Create a coordinate system from a dictionary or a sequence that maps the - symbols to their coordinates. Coordinates must be rational numbers. + Create a coordinate system from a dictionary or a sequence that maps + the symbols to their coordinates. Coordinates must be rational numbers. """ if isinstance(coordinates, Mapping): coordinates = coordinates.items() @@ -142,12 +142,20 @@ class Coordinates: """ return any(self._coordinates.values()) + def __eq__(self, other): + """ + Return True if two coordinate systems are equal. + """ + if isinstance(other, self.__class__): + return self._coordinates == other._coordinates + return NotImplemented + def __hash__(self): return hash(tuple(self.coordinates())) def __repr__(self): string = ', '.join(['{!r}: {!r}'.format(symbol, coordinate) - for symbol, coordinate in self.coordinates()]) + for symbol, coordinate in self.coordinates()]) return '{}({{{}}})'.format(self.__class__.__name__, string) def _map(self, func): @@ -194,8 +202,8 @@ class Point(Coordinates, GeometricObject): def __sub__(self, other): """ If other is a point, substract it from self and return the resulting - vector. If other is a vector, translate the point by the opposite vector - and returns the resulting point. + vector. If other is a vector, translate the point by the opposite + vector and returns the resulting point. """ coordinates = [] if isinstance(other, Point): @@ -206,14 +214,6 @@ class Point(Coordinates, GeometricObject): return Point(coordinates) return NotImplemented - def __eq__(self, other): - """ - Test whether two points are equal. - """ - if isinstance(other, Point): - return self._coordinates == other._coordinates - return NotImplemented - def aspolyhedron(self): from .polyhedra import Polyhedron equalities = [] @@ -231,8 +231,8 @@ class Vector(Coordinates): def __new__(cls, initial, terminal=None): """ - Create a vector from a dictionary or a sequence that maps the symbols to - their coordinates, or as the displacement between two points. + Create a vector from a dictionary or a sequence that maps the symbols + to their coordinates, or as the displacement between two points. """ if not isinstance(initial, Point): initial = Point(initial) @@ -301,14 +301,6 @@ class Vector(Coordinates): return Vector(coordinates) return NotImplemented - def __eq__(self, other): - """ - Test whether two vectors are equal. - """ - if isinstance(other, Vector): - return self._coordinates == other._coordinates - return NotImplemented - def angle(self, other): """ Retrieve the angle required to rotate the vector into the vector passed @@ -349,9 +341,6 @@ class Vector(Coordinates): result += coordinate1 * coordinate2 return result - def __hash__(self): - return super().__hash__() - def norm(self): """ Return the norm of the vector. @@ -369,7 +358,7 @@ class Vector(Coordinates): def asunit(self): """ - Return the normalized vector, i.e. the vector of same direction but with - norm 1. + Return the normalized vector, i.e. the vector of same direction but + with norm 1. """ return self / self.norm()