Mercurial > octave

diff liboctave/boolSparse.cc @ 11570:57632dea2446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
attempt better backward compatibility for Array constructors
author John W. Eaton <jwe@octave.org>
date Wed, 19 Jan 2011 17:55:56 -0500
parents fd0a3ac60b0e
children 0e414f837c58
line wrap: on
line diff
--- a/liboctave/boolSparse.cc	Wed Jan 19 15:12:59 2011 -0500
+++ b/liboctave/boolSparse.cc	Wed Jan 19 17:55:56 2011 -0500
@@ -163,16 +163,16 @@
       if (nz > nr/4)
         {
           // We can use O(nr) memory.
-          Array<bool> tmp (nr, 1, false);
+          Array<bool> tmp (dim_vector (nr, 1), false);
           for (octave_idx_type i = 0; i < nz; i++)
             tmp.xelem(ridx(i)) = true;
           retval = tmp;
         }
       else
         {
-          Array<octave_idx_type> tmp (nz, 1);
+          Array<octave_idx_type> tmp (dim_vector (nz, 1));
           copy_or_memcpy (nz, ridx (), tmp.fortran_vec ());
-          retval = Sparse<bool> (Array<bool> (1, 1, true),
+          retval = Sparse<bool> (Array<bool> (dim_vector (1, 1), true),
                                  idx_vector (tmp),
                                  idx_vector (static_cast<octave_idx_type> (0)),
                                  nr, 1, false);
@@ -212,16 +212,16 @@
       if (nz > nr)
         {
           // We can use O(nr) memory.
-          Array<double> tmp (nr, 1, 0);
+          Array<double> tmp (dim_vector (nr, 1), 0);
           for (octave_idx_type i = 0; i < nz; i++)
             tmp.xelem(ridx(i)) += 1.0;
           retval = tmp;
         }
       else
         {
-          Array<octave_idx_type> tmp (nz, 1);
+          Array<octave_idx_type> tmp (dim_vector (nz, 1));
           copy_or_memcpy (nz, ridx (), tmp.fortran_vec ());
-          retval = Sparse<double> (Array<double> (1, 1, 1.0),
+          retval = Sparse<double> (Array<double> (dim_vector (1, 1), 1.0),
                                    idx_vector (tmp),
                                    idx_vector (static_cast<octave_idx_type> (0)),
                                    nr, 1);