Mercurial > repos > public > sbplib

changeset 606:c14875cf7ae6 feature/grids

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make blockMatrix.toMatrix faster for large matrices.
author Martin Almquist <malmquist@stanford.edu>
date Sat, 14 Oct 2017 22:24:19 -0700
parents 082c7bf3192e
children 0546de4b31a2 b079c437174c
files +blockmatrix/toMatrix.m
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/+blockmatrix/toMatrix.m	Wed Oct 04 13:41:58 2017 +0200
+++ b/+blockmatrix/toMatrix.m	Sat Oct 14 22:24:19 2017 -0700
@@ -17,11 +17,10 @@
 
     for i = 1:size(bm,1)
         for j = 1:size(bm,2)
-            if isempty(bm{i,j})
-                continue
+            if(isempty(bm{i,j}))
+                bm{i,j} = sparse(n(i),m(j));
             end
-            % TODO: If this ever fails for large matrices. Try cell2mat instead.
-            A(n_ind(i)+1:n_ind(i+1),m_ind(j)+1:m_ind(j+1)) = bm{i,j};
         end
     end
+    A = cell2mat(bm);
 end