fixed bug with list input

manzo1991 · Feb 21, 2017 · 4b1f85f · 4b1f85f
1 parent 46d09a2
commit 4b1f85f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cvxpy/atoms/affine/hstack.py b/cvxpy/atoms/affine/hstack.py
@@ -21,6 +21,12 @@
 
 class hstack(AffAtom):
     """ Horizontal concatenation """
+    # Can take a single list as input.
+    def __init__(self, *args):
+        if len(args) == 1 and isinstance(args[0], list):
+            args = args[0]
+        super(hstack, self).__init__(*args)
+
     # Returns the hstack of the values.
     @AffAtom.numpy_numeric
     def numeric(self, values):

diff --git a/cvxpy/atoms/affine/vstack.py b/cvxpy/atoms/affine/vstack.py
@@ -21,8 +21,9 @@
 
 class vstack(AffAtom):
     """ Vertical concatenation """
+    # Can take a single list as input.
     def __init__(self, *args):
-        if len(args) == 1 and isinstance(args, list):
+        if len(args) == 1 and isinstance(args[0], list):
             args = args[0]
         super(vstack, self).__init__(*args)
 

diff --git a/cvxpy/atoms/atom.py b/cvxpy/atoms/atom.py
@@ -30,8 +30,6 @@ class Atom(Expression):
     # args are the expressions passed into the Atom constructor.
 
     def __init__(self, *args):
-        if len(args) == 1 and isinstance(args[0], list):
-            args = args[0]
         # Throws error if args is empty.
         if len(args) == 0:
             raise TypeError(