Mercurial > hg > octave-max

changeset 6024:500d884ae373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-03 14:27:33 by jwe]
author jwe
date Tue, 03 Oct 2006 14:27:34 +0000
parents 75a828280d68
children bb0c9f97fe4f
files ChangeLog Makeconf.in configure.in doc/ChangeLog doc/interpreter/mkoctfile.1 scripts/ChangeLog scripts/audio/loadaudio.m scripts/control/base/nyquist.m scripts/control/system/__zp2ssg2__.m scripts/linear-algebra/cross.m scripts/linear-algebra/krylov.m scripts/statistics/base/center.m scripts/statistics/base/median.m scripts/statistics/base/std.m scripts/statistics/base/var.m scripts/testfun/test.m src/ChangeLog src/Makefile.in
diffstat 18 files changed, 55 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-03  John W. Eaton  <jwe@octave.org>
+
+	* configure.in: Include CAMD_LIBS, AMD_LIBS, and REGEX_LIBS in the
+	summary.
+
+2006-10-03  David Bateman  <dbateman@free.fr>
+
+	* configure.in: Check for libcamd.
+	* Makeconf.in (CAMD_LIBS): New variable.
+
 2006-09-27  John W. Eaton  <jwe@octave.org>
 
 	* mkoctfile.in [--mex]: Include -I. in incflags.
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -197,6 +197,7 @@
 FFTW_LIBS = @FFTW_LIBS@
 GLPK_LIBS = @GLPK_LIBS@
 AMD_LIBS = @AMD_LIBS@
+CAMD_LIBS = @CAMD_LIBS@
 UMFPACK_LIBS = @UMFPACK_LIBS@
 COLAMD_LIBS = @COLAMD_LIBS@
 CCOLAMD_LIBS = @CCOLAMD_LIBS@
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.521 $)
+AC_REVISION($Revision: 1.522 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -713,6 +713,11 @@
 AC_SUBST(AMD_LIBS)
 AC_CHECK_LIB(amd, amd_postorder, [AMD_LIBS="-lamd"; with_amd=yes],[with_amd=no])
 
+# Check for CAMD library
+CAMD_LIBS=
+AC_SUBST(CAMD_LIBS)
+AC_CHECK_LIB(camd, camd_postorder, [CAMD_LIBS="-lcamd"; with_camd=yes],[with_camd=no])
+
 # Check for UMFPACK library.
 
 UMFPACK_LIBS=
@@ -1783,11 +1788,14 @@
   FFTW libraries:       $FFTW_LIBS
   GLPK libraries:       $GLPK_LIBS
   UMFPACK libraries:    $UMFPACK_LIBS
+  AMD libraries:        $AMD_LIBS
+  CAMD libraries:       $CAMD_LIBS
   COLAMD libraries:     $COLAMD_LIBS
   CCOLAMD libraries:    $CCOLAMD_LIBS
   CHOLMOD libraries:    $CHOLMOD_LIBS
   CXSPARSE libraries:   $CXSPARSE_LIBS
   HDF5 libraries:       $HDF5_LIBS
+  REGEX libraries:      $REGEX_LIBS
   LIBS:                 $LIBS
   Default pager:        $DEFAULT_PAGER
   gnuplot:              $GNUPLOT_BINARY
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-03  Rafael Laboissiere <rafael@debian.org>
+
+	* interpreter/mkoctfile.1: Fix indentation for --mex description.
+
 2006-09-26  John W. Eaton  <jwe@octave.org>
 
 	* interpreter/Makefile.in (stamp-images): Delete.
--- a/doc/interpreter/mkoctfile.1
+++ b/doc/interpreter/mkoctfile.1
@@ -66,6 +66,7 @@
 .TP 8
 .B \-\-link-stand-alone
 Link a stand-alone executable file.
+.TP 8
 .B \-\-mex
 Assume we are creating a MEX file.  Set the default output extension
 to .mex.
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-03  Bill Denney  <denney@seas.upenn.edu>
+
+ 	* audio/loadaudio.m, control/base/nyquist.m,
+ 	control/system/__zp2ssg2__.m, linear-algebra/cross.m,
+ 	linear-algebra/krylov.m, statistics/base/center.m,
+ 	statistics/base/median.m, statistics/base/std.m,
+ 	statistics/base/var.m, testfun/test.m: 	Use the new find syntax to
+	find first or last element matching a condition.
+
 2006-10-02  Bill Denney  <denney@seas.upenn.edu>
 
 	* strings/deblank.m, strings/upper.m, strings/lower.m,
--- a/scripts/audio/loadaudio.m
+++ b/scripts/audio/loadaudio.m
@@ -67,7 +67,7 @@
 	  || strcmp (ext, "snd") || strcmp(ext, "ul"))
     [Y, c] = fread (num, inf, "uchar");
     ## remove file header
-    m = max (find (Y(1:64) == 0));
+    m = find (Y(1:64) == 0, 1, "last");
     if (! isempty (m))
       Y(1:m) = [];
     endif
--- a/scripts/control/base/nyquist.m
+++ b/scripts/control/base/nyquist.m
@@ -166,7 +166,7 @@
 
         ## check for asymptotes
         fmax = max(abs(f));
-        fi = max(find(abs(f) == fmax));
+        fi = find(abs(f) == fmax, 1, "last");
 
         ## compute angles from point to point
         df = diff(f);
--- a/scripts/control/system/__zp2ssg2__.m
+++ b/scripts/control/system/__zp2ssg2__.m
@@ -40,7 +40,7 @@
     ## roundoff)
     err = abs(rvals(cidx) - r1');
     minerr = min(err);
-    c2i = min(find(err == minerr));
+    c2i = find(err == minerr, 1);
     r2i = cidx(c2i);
     r2 = rvals(r2i);
     cidx = complement(r2i,cidx);
--- a/scripts/linear-algebra/cross.m
+++ b/scripts/linear-algebra/cross.m
@@ -59,7 +59,7 @@
   endif
 
   if (nargin == 2)
-     dim = min (find (size (x) == 3));
+     dim = find (size (x) == 3, 1);
      if (isempty (dim)) 
        error ("cross: must have at least one dimension with 3 elements");
      endif
--- a/scripts/linear-algebra/krylov.m
+++ b/scripts/linear-algebra/krylov.m
@@ -133,12 +133,12 @@
           ## locate max magnitude element in short_q
           asq = abs (short_q);
           maxv = max (asq);
-          maxidx = find (asq == maxv);
-          pivot_idx = short_pv(maxidx(1));
+          maxidx = find (asq == maxv, 1);
+          pivot_idx = short_pv(maxidx);
 
 	  ## see if need to change the pivot list
           if (pivot_idx != pivot_vec(nu))
-            swapidx = maxidx(1) + (nu-1);
+            swapidx = maxidx + (nu-1);
             [pivot_vec(nu), pivot_vec(swapidx)] = ...
 		swap (pivot_vec(nu), pivot_vec(swapidx));
           endif
--- a/scripts/statistics/base/center.m
+++ b/scripts/statistics/base/center.m
@@ -39,7 +39,7 @@
     retval = x - mean (x, varargin{:});
   elseif (ismatrix (x))
     if nargin < 2
-      dim = min (find (size (x) > 1));
+      dim = find (size (x) > 1, 1);
       if isempty (dim), 
 	dim=1; 
       endif;
--- a/scripts/statistics/base/median.m
+++ b/scripts/statistics/base/median.m
@@ -53,7 +53,7 @@
     usage ("median (a, dim)");
   endif
   if (nargin < 2)
-    dim = min (find (size (a) > 1));
+    dim = find (size (a) > 1, 1);
     if (isempty (dim))
       dim = 1;
     endif
--- a/scripts/statistics/base/std.m
+++ b/scripts/statistics/base/std.m
@@ -66,7 +66,7 @@
     usage ("std (a, opt, dim)");
   endif
   if nargin < 3
-    dim = min(find(size(a)>1));
+    dim = find (size (a) > 1, 1);
     if isempty(dim), dim=1; endif;
   endif
   if ((nargin < 2) || isempty(opt))
--- a/scripts/statistics/base/var.m
+++ b/scripts/statistics/base/var.m
@@ -47,7 +47,7 @@
     usage ("var (x, opt, sim)");
   endif
   if (nargin < 3)
-    dim = min (find (size (x) > 1));
+    dim = find (size (x) > 1, 1);
     if (isempty (dim))
       dim = 1;
     endif
--- a/scripts/testfun/test.m
+++ b/scripts/testfun/test.m
@@ -479,12 +479,12 @@
   pos = [];
 
   ## Find the end of the name
-  right = min(find(def=='('));
+  right = find(def=='(', 1);
   if isempty(right), return; endif
-  right = max(find(def(1:right-1) != ' '));
+  right = find(def(1:right-1) != ' ', 1, "last");
 
   ## Find the beginning of the name
-  left = max([find(def(1:right)==' '),find(def(1:right)=='=')]);
+  left = max([find(def(1:right)==' ', 1, "last"),find(def(1:right)=='=', 1, "last")]);
   if isempty(left), return; endif
   left++;
 
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-03  David Bateman  <dbateman@free.fr>
+
+	* Makefile.in (OCT_LINK_DEPS) Include $(CAMD_LIBS) in the list.
+	(octave$(EXEEXT)): Include $(CAMD_LIBS) in link command.
+
 2006-10-02  John W. Eaton  <jwe@octave.org>
 
 	* version.h (OCTAVE_VERSION): Now 2.9.9.
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -247,7 +247,7 @@
 OCT_LINK_DEPS = \
   -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \
   -L. $(LIBOCTINTERP) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \
-   $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
+   $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
    $(FFTW_LIBS) $(LIBS) $(FLIBS)
 
 DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \
@@ -311,7 +311,7 @@
 	main.o $(DLD_STATIC_OBJ) \
 	$(OCTAVE_LFLAGS) \
 	$(OCTAVE_LIBS) \
-	$(LEXLIB) $(UMFPACK_LIBS) $(AMD_LIBS) $(COLAMD_LIBS) \
+	$(LEXLIB) $(UMFPACK_LIBS) $(AMD_LIBS) $(CAMD_LIBS) $(COLAMD_LIBS) \
 	$(CHOLMOD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
 	$(FFTW_LIBS) $(LIBS) $(FLIBS)