Mercurial > octave-nkf

comparison libinterp/corefcn/dasrt.cc @ 20264:5dfaaaae784f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). * liboctave/array/Array.h (Array::capacity): deprecate for ::numel(). * liboctave/array/Sparse.h (Sparse::capacity): deprecate for ::nzmax(). Also move comments into doxygen docs. * libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/quad.cc, libinterp/corefcn/variables.cc, libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.h, libinterp/octave-value/ov.h, liboctave/array/Sparse.cc, liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc, liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc, liboctave/numeric/Quad.cc, liboctave/numeric/base-de.h, liboctave/numeric/base-min.h, liboctave/numeric/oct-rand.cc: replace use of capacity by numel() or nzmax() as appropriate.
author Carnë Draug <carandraug@octave.org>
date Sun, 24 May 2015 04:47:20 +0100
parents 4197fc428c7d
children a9574e3c6e9e
comparison
equal deleted inserted replaced
20263:00cf2847355d 20264:5dfaaaae784f
61 dasrt_user_f (const ColumnVector& x, const ColumnVector& xdot, 61 dasrt_user_f (const ColumnVector& x, const ColumnVector& xdot,
62 double t, octave_idx_type&) 62 double t, octave_idx_type&)
63 { 63 {
64 ColumnVector retval; 64 ColumnVector retval;
65 65
66 assert (x.capacity () == xdot.capacity ()); 66 assert (x.numel () == xdot.numel ());
67 67
68 octave_value_list args; 68 octave_value_list args;
69 69
70 args(2) = t; 70 args(2) = t;
71 args(1) = xdot; 71 args(1) = xdot;
145 dasrt_user_j (const ColumnVector& x, const ColumnVector& xdot, 145 dasrt_user_j (const ColumnVector& x, const ColumnVector& xdot,
146 double t, double cj) 146 double t, double cj)
147 { 147 {
148 Matrix retval; 148 Matrix retval;
149 149
150 assert (x.capacity () == xdot.capacity ()); 150 assert (x.numel () == xdot.numel ());
151 151
152 octave_value_list args; 152 octave_value_list args;
153 153
154 args(3) = cj; 154 args(3) = cj;
155 args(2) = t; 155 args(2) = t;