Fix pyfaust.LazyLinearOp.concatenate resulting shape and complete the corresponding unit test.

wrapper/python/pyfaust/lazylinop.py

@@ -423,10 +423,12 @@ class LazyLinearOp:
             axis: axis of concatenation (0 for rows, 1 for columns).
         """
         from pyfaust import concatenate as cat
+        new_shape = (self.shape[0] + op.shape[0] if axis == 0 else self.shape[0],
+                     self.shape[1] + op.shape[1] if axis == 1 else self.shape[1])
         new_op = self.__class__(init_lambda=lambda:
                                 cat((self._lambda_stack(),
                                      LazyLinearOp._eval_if_lazy(op)), axis=axis),
-                                shape=(tuple(self.shape)),
+                                shape=(new_shape),
                                 root_obj=self._root_obj)
         return new_op
 

wrapper/python/pyfaust/tests/TestLazyLinearOp.py

@@ -140,10 +140,19 @@ class TestLazyLinearOpFaust(unittest.TestCase):
         self.assertAlmostEqual(LA.norm(lcat.toarray() - np.vstack((self.lopA,
                                                                    self.lop2A))),
                                0)
+        self.assertEqual(lcat.shape[0], self.lop.shape[0] + self.lop2.shape[0])
         lcat = self.lop.concatenate(self.lop2, axis=1)
         self.assertAlmostEqual(LA.norm(lcat.toarray() - np.hstack((self.lopA,
                                                                    self.lop2A))),
                                0)
+        self.assertEqual(lcat.shape[1], self.lop.shape[1] + self.lop2.shape[1])
+        # auto concat
+        lcat = self.lop.concatenate(self.lop, axis=0)
+        self.assertAlmostEqual(LA.norm(lcat.toarray() - np.vstack((self.lopA,
+                                                                   self.lopA))),
+                               0)
+        self.assertEqual(lcat.shape[0], self.lop.shape[0] + self.lop.shape[0])
+
 
     def test_chain_ops(self):
         lchain = self.lop + self.lop2