# HG changeset patch # User jwe # Date 1130560103 0 # Node ID a9bd6c31751fd818ad1bbeba3a83c0cc8e3b63b9 # Parent 947aa3464e1d140c6fab1c75ea3ea88b84a143eb [project @ 2005-10-29 04:26:38 by jwe] diff -r 947aa3464e1d -r a9bd6c31751f ChangeLog --- a/ChangeLog Fri Oct 28 14:21:11 2005 +0000 +++ b/ChangeLog Sat Oct 29 04:28:23 2005 +0000 @@ -1,3 +1,9 @@ +2005-10-28 John W. Eaton + + * configure.in (AC_ARG_WITH(cholmod, ...)): Fix typo. + From Quentin Spencer and + Andy Adler . + 2005-10-26 John W. Eaton * configure.in, aclocal.m4: Don't quote "yes". diff -r 947aa3464e1d -r a9bd6c31751f configure.in --- a/configure.in Fri Oct 28 14:21:11 2005 +0000 +++ b/configure.in Sat Oct 29 04:28:23 2005 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.491 $) +AC_REVISION($Revision: 1.492 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -836,14 +836,14 @@ with_cholmod=yes], [ AC_CHECK_LIB(cholmod_start, cholmod, [CHOLMOD_LIBS="-lcholmod -cblas -lmetis"; with_cholmod=yes], [], - AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis)], + $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis)], $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis) else AC_CHECK_LIB(cholmod, cholmod_start, [CHOLMOD_LIBS="-lcholmod"; with_cholmod=yes], [ AC_CHECK_LIB(cholmod_start, cholmod, [CHOLMOD_LIBS="-lcholmod -cblas"; with_cholmod=yes], [], - AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS)], + $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS)], $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS) fi diff -r 947aa3464e1d -r a9bd6c31751f liboctave/ChangeLog --- a/liboctave/ChangeLog Fri Oct 28 14:21:11 2005 +0000 +++ b/liboctave/ChangeLog Sat Oct 29 04:28:23 2005 +0000 @@ -1,3 +1,11 @@ +2005-10-28 John W. Eaton + + * oct-sparse.h: Fix typo in HAVE_UFSPARSE_UMFPACK_H. + From Quentin Spencer . + + * sparse-base-chol.cc: Use C++ true/false instead of + preprocessor defined TRUE/FALSE. Use 0 instead of NULL. + 2005-10-27 John W. Eaton * Array.cc (assignN): Reshape to final size instead of resizing. diff -r 947aa3464e1d -r a9bd6c31751f liboctave/oct-sparse.h --- a/liboctave/oct-sparse.h Fri Oct 28 14:21:11 2005 +0000 +++ b/liboctave/oct-sparse.h Sat Oct 29 04:28:23 2005 +0000 @@ -32,7 +32,7 @@ extern "C" { #endif -#if defined (HAVE_UFSPARSE_UMFPACK_h) +#if defined (HAVE_UFSPARSE_UMFPACK_H) #include #elif defined (HAVE_UMFPACK_UMFPACK_H) #include diff -r 947aa3464e1d -r a9bd6c31751f liboctave/sparse-base-chol.cc --- a/liboctave/sparse-base-chol.cc Fri Oct 28 14:21:11 2005 +0000 +++ b/liboctave/sparse-base-chol.cc Sat Oct 29 04:28:23 2005 +0000 @@ -44,7 +44,7 @@ chol_elt *Sx; octave_idx_type pdest, k, ncol, p, pend; - if (S == NULL) + if (! S) return; Sp = static_cast(S->p); @@ -97,13 +97,13 @@ // Setup initial parameters CHOLMOD_NAME(start) (cm); - cm->prefer_zomplex = FALSE; + cm->prefer_zomplex = false; double spu = Voctave_sparse_controls.get_key ("spumoni"); if (spu == 0.) { cm->print = -1; - cm->print_function = NULL; + cm->print_function = 0; } else { @@ -135,12 +135,12 @@ #endif #endif - cm->final_asis = FALSE; - cm->final_super = FALSE; - cm->final_ll = TRUE; - cm->final_pack = TRUE; - cm->final_monotonic = TRUE; - cm->final_resymbol = FALSE; + cm->final_asis = false; + cm->final_super = false; + cm->final_ll = true; + cm->final_pack = true; + cm->final_monotonic = true; + cm->final_resymbol = false; cholmod_sparse A; cholmod_sparse *ac = &A; @@ -151,9 +151,9 @@ ac->p = a.cidx(); ac->i = a.ridx(); ac->nzmax = a.nonzero(); - ac->packed = TRUE; - ac->sorted = TRUE; - ac->nz = NULL; + ac->packed = true; + ac->sorted = true; + ac->nz = 0; #ifdef IDX_TYPE_LONG ac->itype = CHOLMOD_LONG; #else @@ -177,7 +177,7 @@ { cm->nmethods = 1 ; cm->method [0].ordering = CHOLMOD_NATURAL ; - cm->postorder = FALSE ; + cm->postorder = false ; } cholmod_factor *Lfactor; diff -r 947aa3464e1d -r a9bd6c31751f scripts/ChangeLog --- a/scripts/ChangeLog Fri Oct 28 14:21:11 2005 +0000 +++ b/scripts/ChangeLog Sat Oct 29 04:28:23 2005 +0000 @@ -1,3 +1,10 @@ +2005-10-28 John W. Eaton + + * general/shiftdim.m: Compatibility fix for row vectors. + Correct check for non-scalar non-integer shift. For positive + N, shift is remainder of N and number of dims. Always return NS. + Simplify. + 2005-10-18 Keith Goodman * general/randperm.m: Improve compatibility by allowing input diff -r 947aa3464e1d -r a9bd6c31751f scripts/general/ind2sub.m --- a/scripts/general/ind2sub.m Fri Oct 28 14:21:11 2005 +0000 +++ b/scripts/general/ind2sub.m Sat Oct 29 04:28:23 2005 +0000 @@ -66,7 +66,7 @@ error ("ind2sub: expecting integer-valued index argument"); endif else - error ("sub2ind: expecting dims to be an integer vector"); + error ("ind2sub: expecting dims to be an integer vector"); endif else usage ("ind2sub (dims, ind)"); diff -r 947aa3464e1d -r a9bd6c31751f scripts/general/shiftdim.m --- a/scripts/general/shiftdim.m Fri Oct 28 14:21:11 2005 +0000 +++ b/scripts/general/shiftdim.m Sat Oct 29 04:28:23 2005 +0000 @@ -51,34 +51,38 @@ function [y, ns] = shiftdim (x, n) + if (nargin < 1 || nargin > 2) + usage ("shiftdim (x, n) or [b, ns] = shiftdim (x)"); + endif + + nd = ndims (x); + orig_dims = size (x); + if (nargin == 1) ## Find the first singleton dimension. - nd = ndims (x); - orig_dims = size (x); - ns = 1; - while (ns < nd + 1 && orig_dims(ns) == 1) - ns = ns + 1; + n = 0; + while (n < nd && orig_dims(n+1) == 1) + n++; endwhile - if (ns > nd) - ns = 1; - endif - y = reshape (x, orig_dims(ns:end)); - ns = ns - 1; - elseif (nargin == 2) - if (! isscalar (n) && floor (n) != n) - error ("shiftdim: n must be an scalar integer"); - endif - if (n < 0) - orig_dims = size (x); - singleton_dims = ones (1, -n); - y = reshape (x, [singleton_dims, orig_dims]); - elseif (n > 0) - ndims = length (size (x)); - y = permute (x, [n+1:ndims, 1:n]); - else - y = x; - endif + endif + + if (! isscalar (n) || floor (n) != n) + error ("shiftdim: n must be a scalar integer"); + endif + + if (n >= nd) + n = rem (n, nd); + endif + + if (n < 0) + singleton_dims = ones (1, -n); + y = reshape (x, [singleton_dims, orig_dims]); + elseif (n > 0) + y = reshape (x, [orig_dims(n+1:nd), orig_dims(1:n)]); else - usage ("shiftdim (x, n) or [b, ns] = shiftdim (x)"); + y = x; endif + + ns = n; + endfunction diff -r 947aa3464e1d -r a9bd6c31751f src/ChangeLog --- a/src/ChangeLog Fri Oct 28 14:21:11 2005 +0000 +++ b/src/ChangeLog Sat Oct 29 04:28:23 2005 +0000 @@ -1,3 +1,8 @@ +2005-10-27 James R. Van Zandt + + * mappers.cc: Doc fix for lgamma. + * DLD-FUNCTIONS/gammainc.cc (Fgammainc): Doc fix. + 2005-10-27 John W. Eaton * DLD-FUNCTIONS/__glpk__.cc (F__glpk__): Declare mrowsA volatile. diff -r 947aa3464e1d -r a9bd6c31751f src/mappers.cc --- a/src/mappers.cc Fri Oct 28 14:21:11 2005 +0000 +++ b/src/mappers.cc Sat Oct 29 04:28:23 2005 +0000 @@ -522,8 +522,8 @@ DEFUN_MAPPER (lgamma, 0, 0, 0, xlgamma, 0, 0, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ -@deftypefn {Mapping Function} {} lgamma (@var{a}, @var{x})\n\ -@deftypefnx {Mapping Function} {} gammaln (@var{a}, @var{x})\n\ +@deftypefn {Mapping Function} {} lgamma (@var{x})\n\ +@deftypefnx {Mapping Function} {} gammaln (@var{x})\n\ Return the natural logarithm of the gamma function.\n\ @end deftypefn\n\ @seealso{gamma and gammai}");