Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
bqpd committed Oct 9, 2019
1 parent 609e04b commit 12cdea6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions gpkit/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ def load_settings(path=None, firstattempt=True):
except IOError:
settings_ = {"installed_solvers": [""]}
if (settings_["installed_solvers"] == [""]
or ("mosek" in settings_["installed_solvers"]
and "mosek_version" not in settings_)):
or ("mosek" in settings_["installed_solvers"]
and "mosek_version" not in settings_)):
if firstattempt:
print("Found no installed solvers, beginning a build.")
build()
Expand Down
5 changes: 3 additions & 2 deletions gpkit/nomials/math.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ def mono_approximation(self, x0):
class ScalarSingleEquationConstraint(SingleEquationConstraint):
"A SingleEquationConstraint with scalar left and right sides."
nomials = []
sgp_parent = None

def __init__(self, left, oper, right):
lr = [left, right]
Expand Down Expand Up @@ -416,7 +417,6 @@ class PosynomialInequality(ScalarSingleEquationConstraint):
"""

feastol = 1e-3
sgp_parent = None
relax_sensitivity = None
# NOTE: follows .check_result's max default, but 1e-3 seems a bit lax...

Expand Down Expand Up @@ -607,7 +607,8 @@ def sens_from_dual(self, la, nu, result):
if self.sgp_parent:
self.sgp_parent.relax_sensitivity = self.relax_sensitivity
if getattr(self.sgp_parent, "sgp_parent", None):
self.sgp_parent.sgp_parent.relax_sensitivity = self.relax_sensitivity
self.sgp_parent.sgp_parent.relax_sensitivity = \
self.relax_sensitivity
var_senss = {}
for var in self.varkeys:
for i, m in enumerate(self.unsubbed):
Expand Down

0 comments on commit 12cdea6

Please sign in to comment.