Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cvxpy/constraints/power.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def __init__(self, x, y, z, alpha, constr_id=None) -> None:
else:
arg_shapes = [self.x.shape, self.y.shape, self.z.shape, self.alpha.shape]
if any(arg_shapes[0] != s for s in arg_shapes[1:]):
msg = ("All arguments must have the same shapes. Provided arguments have"
msg = ("All arguments must have the same shapes. Provided arguments have "
"shapes %s" % str(arg_shapes))
raise ValueError(msg)
super(PowCone3D, self).__init__([self.x, self.y, self.z],
Expand Down
2 changes: 1 addition & 1 deletion cvxpy/reductions/solvers/conic_solvers/mosek_conif.py
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ def invert(self, solver_output, inverse_data):
raw_iis_sol = Solution(s.OPTIMAL, prob_val, prim_vars, dual_vars, attr)
iis_sol = Dualize.invert(raw_iis_sol, inverse_data)
# IIS is a map of constraint id to a value of
# dimension equal to the contraint dual variable.
# dimension equal to the constraint dual variable.
# That value has non-zero entries iff the constraint
# is in the IIS.
attr[s.EXTRA_STATS] = {"IIS": iis_sol.dual_vars}
Expand Down
2 changes: 1 addition & 1 deletion cvxpy/tests/test_atoms.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def setUp(self) -> None:
self.C = Variable((3, 2), name='C')

def test_add_expr_copy(self) -> None:
"""Test the copy function for AddExpresion class.
"""Test the copy function for AddExpression class.
"""
atom = self.x + self.y
copy = atom.copy()
Expand Down
2 changes: 0 additions & 2 deletions cvxpy/tests/test_complex.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,15 +564,13 @@ def test_validation(self) -> None:
cp.log, cp.log1p, cp.logistic]:
name = atom.__name__
with self.assertRaises(Exception) as cm:
print(name)
atom(x)
self.assertEqual(str(cm.exception), "Arguments to %s cannot be complex." % name)

x = Variable(2, complex=True)
for atom in [cp.maximum, cp.kl_div]:
name = atom.__name__
with self.assertRaises(Exception) as cm:
print(name)
atom(x, x)
self.assertEqual(str(cm.exception), "Arguments to %s cannot be complex." % name)

Expand Down
2 changes: 1 addition & 1 deletion cvxpy/tests/test_conic_solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def test_quad_obj_with_power(self) -> None:

# Check problem data.
data = prob.get_problem_data(solver=cp.SCS, solver_opts={"use_quad_obj": True})
# Quadratic objective and SOC contraints.
# Quadratic objective and SOC constraints.
assert "P" in data[0]
assert data[0]["dims"].soc

Expand Down
2 changes: 1 addition & 1 deletion cvxpy/tests/test_expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ def test_round_attr(self) -> None:
self.assertEqual(A.is_psd(), True)
self.assertEqual(A.is_nsd(), True)

# Test the AddExpresion class.
# Test the AddExpression class.
def test_add_expression(self) -> None:
# Vectors
c = Constant([2, 2])
Expand Down
Loading