checkpoint

convexengineering · Apr 17, 2021 · 7309c34 · 7309c34
1 parent ec2871b
commit 7309c34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/gpkit/repr_conventions.py b/gpkit/repr_conventions.py
@@ -20,6 +20,7 @@
 
 def lineagestr(lineage, modelnums=True):
     "Returns properly formatted lineage string"
+    return ""
     if not isinstance(lineage, tuple):
         lineage = getattr(lineage, "lineage", None)
     return ".".join(["%s%i" % (name, num) if (num and modelnums) else name

diff --git a/gpkit/small_classes.py b/gpkit/small_classes.py
@@ -11,7 +11,7 @@
 class FixedScalarMeta(type):
     "Metaclass to implement instance checking for fixed scalars"
     def __instancecheck__(cls, obj):
-        return hasattr(obj, "hmap") and len(obj.hmap) == 1 and not obj.vks
+        return getattr(obj, "hmap", None) and len(obj.hmap) == 1 and not obj.vks
 
 
 class FixedScalar(metaclass=FixedScalarMeta):  # pylint: disable=no-init

diff --git a/gpkit/solution_array.py b/gpkit/solution_array.py
@@ -634,7 +634,7 @@ def subinto(self, posy):
             return NomialArray([self.atindex(i).subinto(posy)
                                 for i in range(len(self))])
 
-        return posy.sub(self["variables"])
+        return posy.sub(self["variables"], require_positive=False)
 
     def _parse_showvars(self, showvars):
         showvars_out = set()