move varkeys property to constraintset

convexengineering · Dec 1, 2020 · 4665c99 · 4665c99
1 parent 513fdb6
commit 4665c99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/gpkit/constraints/model.py b/gpkit/constraints/model.py
@@ -133,17 +133,7 @@ def verify_docstring(self):  # pylint:disable=too-many-locals,too-many-branches,
 ---------------
 %s
 """ % (direction.title(), ", ".join(set(k.name for k in mb)))
-            raise ValueError(err + boundstrs + "\n\n" + docstring)
-
-    @property
-    def varkeys(self):
-        "The NomialData's varkeys, created when necessary for a substitution."
-        if self.substitutions.varkeys:
-            self._varkeys = self.substitutions.varkeys
-        if self._varkeys is None:
-            self._varkeys = KeySet(self.vks)
-            self.substitutions.varkeys = self._varkeys
-        return self._varkeys
+            raise ValueError(err + boundstrs + "\n\n" + docstring)    
 
     def sweep(self, sweeps, **solveargs):
         "Sweeps {var: values} pairs in sweeps. Returns swept solutions."

diff --git a/gpkit/constraints/set.py b/gpkit/constraints/set.py
@@ -150,6 +150,16 @@ def variables_byname(self, key):
         return sorted([Variable(k) for k in self.varkeys[key]],
                       key=_sort_by_name_and_idx)
 
+    @property
+    def varkeys(self):
+        "The NomialData's varkeys, created when necessary for a substitution."
+        if self.substitutions.varkeys:
+            self._varkeys = self.substitutions.varkeys
+        if self._varkeys is None:
+            self._varkeys = KeySet(self.vks)
+            self.substitutions.varkeys = self._varkeys
+        return self._varkeys
+
     def constrained_varkeys(self):
         "Return all varkeys in non-ConstraintSet constraints"
         return self.vks - self.unique_varkeys