projects
/
linpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix docstrings of And(), Or(), Not()
[linpy.git]
/
linpy
/
domains.py
diff --git
a/linpy/domains.py
b/linpy/domains.py
index
4b3e982
..
799b99d
100644
(file)
--- a/
linpy/domains.py
+++ b/
linpy/domains.py
@@
-599,7
+599,7
@@
class Domain(GeometricObject):
elif self.dimension == 3:
return self._plot_3d(plot=plot, **kwargs)
else:
elif self.dimension == 3:
return self._plot_3d(plot=plot, **kwargs)
else:
- raise ValueError('
polyhedro
n must be 2 or 3-dimensional')
+ raise ValueError('
domai
n must be 2 or 3-dimensional')
def subs(self, symbol, expression=None):
"""
def subs(self, symbol, expression=None):
"""
@@
-737,7
+737,7
@@
class Domain(GeometricObject):
@classmethod
def fromsympy(cls, expr):
"""
@classmethod
def fromsympy(cls, expr):
"""
- Create a domain from a
symp
y expression.
+ Create a domain from a
SymP
y expression.
"""
import sympy
from .polyhedra import Lt, Le, Eq, Ne, Ge, Gt
"""
import sympy
from .polyhedra import Lt, Le, Eq, Ne, Ge, Gt
@@
-756,7
+756,7
@@
class Domain(GeometricObject):
def tosympy(self):
"""
def tosympy(self):
"""
- Convert the domain to a
symp
y expression.
+ Convert the domain to a
SymP
y expression.
"""
import sympy
polyhedra = [polyhedron.tosympy() for polyhedron in polyhedra]
"""
import sympy
polyhedra = [polyhedron.tosympy() for polyhedron in polyhedra]
@@
-772,7
+772,6
@@
def And(*domains):
return Universe
else:
return domains[0].intersection(*domains[1:])
return Universe
else:
return domains[0].intersection(*domains[1:])
-And.__doc__ = Domain.intersection.__doc__
def Or(*domains):
"""
def Or(*domains):
"""
@@
-783,11
+782,9
@@
def Or(*domains):
return Empty
else:
return domains[0].union(*domains[1:])
return Empty
else:
return domains[0].union(*domains[1:])
-Or.__doc__ = Domain.union.__doc__
def Not(domain):
"""
Create the complementary domain of the domain given in argument.
"""
return ~domain
def Not(domain):
"""
Create the complementary domain of the domain given in argument.
"""
return ~domain
-Not.__doc__ = Domain.complement.__doc__