Mercurial > octave-nkf
view test/bug-31371.tst @ 20264:5dfaaaae784f
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 | 6fe6ac8bbfdb |
children |
line wrap: on
line source
%!test %! % Work around MATLAB bug where f(x)(y) is invalid syntax %! % (This bug does not apply to Octave) %! %! C = @(fcn,x) fcn(x); %! C2 = @(fcn,x,y) fcn(x,y); %! %! % Church Booleans %! T = @(t,f) t; %! F = @(t,f) f; %! %! % Church Numerals %! Zero = @(fcn,x) x; %! One = @(fcn,x) fcn(x); %! Two = @(fcn,x) fcn(fcn(x)); %! Three = @(fcn,x) fcn(fcn(fcn(x))); %! Four = @(fcn,x) fcn(fcn(fcn(fcn(x)))); %! %! % Arithmetic Operations %! Inc = @(a) @(f,x) f(a(f,x)); % Increment %! Add = @(a,b) @(f,x) a(f,b(f,x)); %! Mult = @(a,b) @(f,x) a(@(x) b(f,x),x); %! Dec = @(a) @(f,x) C(a(@(g) @(h) h(g(f)), @(u) x), @(u) u); % Decrement %! Sub = @(a,b) b(Dec, a); %! %! % Renderer - Convert church numeral to "real" number %! Render = @(n) n(@(n) n+1,0); %! %! % Predicates %! Iszero = @(n) n(@(x) F, T); %! %! % Y combinator implements recursion %! Ycomb = @(f) C(@(g) f(@(x) C(g(g), x)), ... %! @(g) f(@(x) C(g(g), x))); %! %! Factorial = Ycomb(@(f) @(n) C(C2(Iszero(n), ... %! @(d) One, @(d) Mult(n, f(Dec(n)))),0)); %! %! assert (Render (Factorial (Two)), 2) %! assert (Render (Factorial (Three)), 6) %! assert (Render (Factorial (Four)), 24)