Mercurial > octave

comparison libinterp/corefcn/quad.cc @ 20229: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 4f45eaf83908
children 7ac907da9fba
comparison
equal deleted inserted replaced
20228:00cf2847355d 20229:5dfaaaae784f
310 tol = FloatColumnVector (args(3).float_vector_value ()); 310 tol = FloatColumnVector (args(3).float_vector_value ());
311 311
312 if (error_state) 312 if (error_state)
313 QUAD_ABORT1 ("expecting vector of tolerances as fifth argument"); 313 QUAD_ABORT1 ("expecting vector of tolerances as fifth argument");
314 314
315 switch (tol.capacity ()) 315 switch (tol.numel ())
316 { 316 {
317 case 2: 317 case 2:
318 quad_opts.set_single_precision_relative_tolerance (tol (1)); 318 quad_opts.set_single_precision_relative_tolerance (tol (1));
319 319
320 case 1: 320 case 1:
419 tol = ColumnVector (args(3).vector_value ()); 419 tol = ColumnVector (args(3).vector_value ());
420 420
421 if (error_state) 421 if (error_state)
422 QUAD_ABORT1 ("expecting vector of tolerances as fifth argument"); 422 QUAD_ABORT1 ("expecting vector of tolerances as fifth argument");
423 423
424 switch (tol.capacity ()) 424 switch (tol.numel ())
425 { 425 {
426 case 2: 426 case 2:
427 quad_opts.set_relative_tolerance (tol (1)); 427 quad_opts.set_relative_tolerance (tol (1));
428 428
429 case 1: 429 case 1: