return '({})'.format(string)
def __repr__(self):
- string = '{}({{'.format(self.__class__.__name__)
- for i, (symbol, coefficient) in enumerate(self.coefficients()):
- if i != 0:
- string += ', '
- string += '{!r}: {!r}'.format(symbol, coefficient)
- string += '}}, {!r})'.format(self.constant)
- return string
+ return '{}({!r})'.format(self.__class__.__name__, str(self))
@_polymorphic_method
def __eq__(self, other):
constraints.append('{} == 0'.format(constraint))
for constraint in self.inequalities:
constraints.append('{} >= 0'.format(constraint))
- return '{{{}}}'.format(', '.join(constraints))
+ return '{}'.format(', '.join(constraints))
def __repr__(self):
if self.isempty():
elif self.isuniverse():
return 'Universe'
else:
- equalities = list(self.equalities)
- inequalities = list(self.inequalities)
- return '{}(equalities={!r}, inequalities={!r})' \
- ''.format(self.__class__.__name__, equalities, inequalities)
+ return '{}({!r})'.format(self.__class__.__name__, str(self))
@classmethod
def _fromsympy(cls, expr):
self.assertEqual(repr(self.x), "Symbol('x')")
self.assertEqual(repr(self.one), 'Constant(1)')
self.assertEqual(repr(self.pi), 'Constant(22, 7)')
- self.assertEqual(repr(self.expr), "Expression({'x': 1, 'y': -2}, 3)")
+ self.assertEqual(repr(self.x + self.one), "Expression('x + 1')")
+ self.assertEqual(repr(self.expr), "Expression('x - 2*y + 3')")
def test_fromstring(self):
self.assertEqual(Expression.fromstring('x'), self.x)
def test_dimension(self):
self.assertEqual(self.square.dimension, 2)
- def test_tostring(self):
+ def test_str(self):
self.assertEqual(str(self.square),
- '{x >= 0, -x + 1 >= 0, y >= 0, -y + 1 >= 0}')
+ 'x >= 0, -x + 1 >= 0, y >= 0, -y + 1 >= 0')
+
+ def test_repr(self):
+ self.assertEqual(repr(self.square),
+ "Polyhedron('x >= 0, -x + 1 >= 0, y >= 0, -y + 1 >= 0')")
def test_fromstring(self):
self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '
sp_x, sp_y = sympy.symbols('x y')
self.assertEqual(self.square.tosympy(),
sympy.And(-sp_x + 1 >= 0, -sp_y + 1 >= 0, sp_x >= 0, sp_y >= 0))
+
+
+class TestEmpty:
+
+ def test_repr(self):
+ self.assertEqual(repr(Empty), 'Empty')
+
+ def test_isempty(self):
+ self.assertTrue(Empty.isempty())
+
+ def test_isuniverse(self):
+ self.assertFalse(Empty.isuniverse())
+
+
+class TestUniverse:
+
+ def test_repr(self):
+ self.assertEqual(repr(Universe), 'Universe')
+
+ def test_isempty(self):
+ self.assertTrue(Universe.isempty())
+
+ def test_isuniverse(self):
+ self.assertTrue(Universe.isuniverse())