Mercurial > repos > public > sbplib

annotate +blockmatrix/toMatrix.m @ 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 46aa0b6a10cd
children b079c437174c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
206
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
1 function A = toMatrix(bm)
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 if ~blockmatrix.isBlockmatrix(bm)
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3 error('blockmatrix:toMatrix:NotABlockmatrix', 'Input is not a blockmatrix');
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4 end
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 div = blockmatrix.getDivision(bm);
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 n = div{1};
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
8 m = div{2};
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
9
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
10 N = sum(n);
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
11 M = sum(m);
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
13 A = sparse(N,M);
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
14
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
15 n_ind = [0 cumsum(n)];
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
16 m_ind = [0 cumsum(m)];
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
17
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
18 for i = 1:size(bm,1)
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
19 for j = 1:size(bm,2)
606
c14875cf7ae6 Make blockMatrix.toMatrix faster for large matrices.
Martin Almquist <malmquist@stanford.edu>
parents: 342
diff changeset
20 if(isempty(bm{i,j}))
c14875cf7ae6 Make blockMatrix.toMatrix faster for large matrices.
Martin Almquist <malmquist@stanford.edu>
parents: 342
diff changeset
21 bm{i,j} = sparse(n(i),m(j));
206
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
22 end
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
23 end
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
24 end
606
c14875cf7ae6 Make blockMatrix.toMatrix faster for large matrices.
Martin Almquist <malmquist@stanford.edu>
parents: 342
diff changeset
25 A = cell2mat(bm);
206
50a323da7c7f blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
26 end