Mercurial > fem-fenics-eugenio
changeset 70:602fe5295dea
Use std::size_t instead of octave_idx_type
| author | gedeone-octave <marco.vassallo@outlook.com> |
|---|---|
| date | Sun, 28 Jul 2013 10:00:02 +0200 |
| parents | 6dbe66dcf1c5 |
| children | 57540cb3b841 |
| files | inst/generate_rhs.m |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/inst/generate_rhs.m Sat Jul 27 18:49:25 2013 +0200 +++ b/inst/generate_rhs.m Sun Jul 28 10:00:02 2013 +0200 @@ -103,25 +103,25 @@ }\n\ }\n\ \n\ - octave_idx_type nr = A.size (0), nc = A.size (1);\n\ + std::size_t nr = A.size (0), nc = A.size (1);\n\ // nz shoud be estimated in a better way\n\ double alpha = 0.005;\n\ - octave_idx_type nz = ceil (alpha * nr * nc);\n\ - SparseMatrix sm (nr, nc, nz);\n\ + std::size_t nz = alpha * nr * nc;\n\ + SparseMatrix sm (nr, nc, ceil (nz));\n\ \n\ - octave_idx_type ii = 0;\n\ + std::size_t ii = 0;\n\ sm.cidx (0) = 0;\n\ - for (octave_idx_type j = 0; j < nc; ++j)\n\ + for (std::size_t j = 0; j < nc; ++j)\n\ {\n\ - for (octave_idx_type i = 0; i < nr; ++i)\n\ + for (std::size_t i = 0; i < nr; ++i)\n\ {\n\ double tmp = A(i, j);\n\ if (tmp != 0.)\n\ {\n\ if (ii == nz)\n\ {\n\ - nz = ceil ((nc * nr * ii) / (j * nr + 1));\n\ - sm.change_capacity (nz);\n\ + nz = 1.1 * ((nc * ii) / (j + 1));\n\ + sm.change_capacity (ceil (nz));\n\ }\n\ sm.data(ii) = tmp;\n\ sm.ridx(ii) = i;\n\