Mercurial > hg > octave-nkf
changeset 20086:12ecb7212b44
move some files without external dependencies from dldfcn to corefcn
* __dsearchn__.cc, __ichol__.cc, __ilu__.cc, tsearch.cc: Move from
dldfcn to corefcn directory. Use DEFUN instead of DEFUN_DLD.
* libinterp/corefcn/module.mk, libinterp/dldfcn/module-files: Update.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 27 Feb 2015 19:44:28 -0500 |
| parents | f799bf70350f |
| children | 7575048a555b |
| files | libinterp/corefcn/__dsearchn__.cc libinterp/corefcn/__ichol__.cc libinterp/corefcn/__ilu__.cc libinterp/corefcn/module.mk libinterp/corefcn/tsearch.cc libinterp/dldfcn/__dsearchn__.cc libinterp/dldfcn/__ichol__.cc libinterp/dldfcn/__ilu__.cc libinterp/dldfcn/module-files libinterp/dldfcn/tsearch.cc |
| diffstat | 6 files changed, 45 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
rename from libinterp/dldfcn/__dsearchn__.cc rename to libinterp/corefcn/__dsearchn__.cc --- a/libinterp/dldfcn/__dsearchn__.cc +++ b/libinterp/corefcn/__dsearchn__.cc @@ -30,13 +30,13 @@ #include "lo-math.h" -#include "defun-dld.h" +#include "defun.h" #include "error.h" #include "oct-obj.h" -DEFUN_DLD (__dsearchn__, args, , - "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {[@var{idx}, @var{d}] =} dsearch (@var{x}, @var{xi})\n\ +DEFUN (__dsearchn__, args, , + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {[@var{idx}, @var{d}] =} dsearch (@var{x}, @var{xi})\n\ Undocumented internal function.\n\ @end deftypefn") {
rename from libinterp/dldfcn/__ichol__.cc rename to libinterp/corefcn/__ichol__.cc --- a/libinterp/dldfcn/__ichol__.cc +++ b/libinterp/corefcn/__ichol__.cc @@ -27,7 +27,8 @@ #include "oct-locbuf.h" -#include "defun-dld.h" +#include "defun.h" +#include "error.h" #include "parse.h" // Secondary functions for complex and real case used in ichol algorithms. @@ -187,9 +188,10 @@ } } -DEFUN_DLD (__ichol0__, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {@var{L} =} __ichol0__ (@var{A})\n\ -@deftypefnx {Loadable Function} {@var{L} =} __ichol0__ (@var{A}, @var{michol})\n\ +DEFUN (__ichol0__, args, nargout, + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {@var{L} =} __ichol0__ (@var{A})\n\ +@deftypefnx {Built-in Function} {@var{L} =} __ichol0__ (@var{A}, @var{michol})\n\ Undocumented internal function.\n\ @end deftypefn") @@ -440,10 +442,11 @@ } } -DEFUN_DLD (__icholt__, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {@var{L} =} __icholt__ (@var{A})\n\ -@deftypefnx {Loadable Function} {@var{L} =} __icholt__ (@var{A}, @var{droptol})\n\ -@deftypefnx {Loadable Function} {@var{L} =} __icholt__ (@var{A}, @var{droptol}, @var{michol})\n\ +DEFUN (__icholt__, args, nargout, + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {@var{L} =} __icholt__ (@var{A})\n\ +@deftypefnx {Built-in Function} {@var{L} =} __icholt__ (@var{A}, @var{droptol})\n\ +@deftypefnx {Built-in Function} {@var{L} =} __icholt__ (@var{A}, @var{droptol}, @var{michol})\n\ Undocumented internal function.\n\ @end deftypefn") {
rename from libinterp/dldfcn/__ilu__.cc rename to libinterp/corefcn/__ilu__.cc --- a/libinterp/dldfcn/__ilu__.cc +++ b/libinterp/corefcn/__ilu__.cc @@ -27,7 +27,8 @@ #include "oct-locbuf.h" -#include "defun-dld.h" +#include "defun.h" +#include "error.h" #include "parse.h" // That function implements the IKJ and JKI variants of Gaussian elimination to @@ -125,10 +126,11 @@ sm = sm.transpose (); } -DEFUN_DLD (__ilu0__, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {[@var{L}, @var{U}] =} __ilu0__ (@var{A})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}] =} __ilu0__ (@var{A}, @var{milu})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}, @var{P}] =} __ilu0__ (@var{A}, @dots{})\n\ +DEFUN (__ilu0__, args, nargout, + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {[@var{L}, @var{U}] =} __ilu0__ (@var{A})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilu0__ (@var{A}, @var{milu})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} __ilu0__ (@var{A}, @dots{})\n\ Undocumented internal function.\n\ @end deftypefn") { @@ -467,11 +469,12 @@ } } -DEFUN_DLD (__iluc__, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}) \n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}, @var{milu})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}, @var{P}] =} __iluc__ (@var{A}, @dots{})\n\ +DEFUN (__iluc__, args, nargout, + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}) \n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}, @var{milu})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} __iluc__ (@var{A}, @dots{})\n\ Undocumented internal function.\n\ @end deftypefn") { @@ -948,13 +951,14 @@ } } -DEFUN_DLD (__ilutp__, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu}, @var{udiag})\n\ -@deftypefnx {Loadable Function} {[@var{L}, @var{U}, @var{P}] =} __ilutp__ (@var{A}, @dots{})\n\ +DEFUN (__ilutp__, args, nargout, + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu}, @var{udiag})\n\ +@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} __ilutp__ (@var{A}, @dots{})\n\ Undocumented internal function.\n\ @end deftypefn") {
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -138,6 +138,9 @@ corefcn/Cell.cc \ corefcn/__contourc__.cc \ corefcn/__dispatch__.cc \ + corefcn/__dsearchn__.cc \ + corefcn/__ichol__.cc \ + corefcn/__ilu__.cc \ corefcn/__lin_interpn__.cc \ corefcn/__pchip_deriv__.cc \ corefcn/__qp__.cc \ @@ -255,8 +258,9 @@ corefcn/time.cc \ corefcn/toplev.cc \ corefcn/tril.cc \ + corefcn/tsearch.cc \ + corefcn/txt-eng-ft.cc \ corefcn/txt-eng.cc \ - corefcn/txt-eng-ft.cc \ corefcn/typecast.cc \ corefcn/urlwrite.cc \ corefcn/utils.cc \
rename from libinterp/dldfcn/tsearch.cc rename to libinterp/corefcn/tsearch.cc --- a/libinterp/dldfcn/tsearch.cc +++ b/libinterp/corefcn/tsearch.cc @@ -26,17 +26,12 @@ #include <config.h> #endif -#include <iostream> -#include <fstream> -#include <string> - #include "lo-ieee.h" #include "lo-math.h" -#include "defun-dld.h" +#include "defun.h" #include "error.h" #include "oct-obj.h" -#include "parse.h" inline double max (double a, double b, double c) { @@ -64,9 +59,9 @@ // e.g., build up a neighbouring triangle structure and use a simplex-like // method to traverse it -DEFUN_DLD (tsearch, args, , - "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {@var{idx} =} tsearch (@var{x}, @var{y}, @var{t}, @var{xi}, @var{yi})\n\ +DEFUN (tsearch, args, , + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {@var{idx} =} tsearch (@var{x}, @var{y}, @var{t}, @var{xi}, @var{yi})\n\ Search for the enclosing Delaunay convex hull. For @code{@var{t} =\n\ delaunay (@var{x}, @var{y})}, finds the index in @var{t} containing the\n\ points @code{(@var{xi}, @var{yi})}. For points outside the convex hull,\n\
--- a/libinterp/dldfcn/module-files +++ b/libinterp/dldfcn/module-files @@ -1,11 +1,8 @@ # FILE|CPPFLAGS|LDFLAGS|LIBRARIES __delaunayn__.cc|$(QHULL_CPPFLAGS)|$(QHULL_LDFLAGS)|$(QHULL_LIBS) -__dsearchn__.cc __eigs__.cc|$(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS)|$(ARPACK_LDFLAGS) $(SPARSE_XLDFLAGS)|$(ARPACK_LIBS) $(SPARSE_XLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) __fltk_uigetfile__.cc|$(FLTK_CPPFLAGS) $(FT2_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) __glpk__.cc|$(GLPK_CPPFLAGS)|$(GLPK_LDFLAGS)|$(GLPK_LIBS) -__ichol__.cc -__ilu__.cc __init_fltk__.cc|$(FLTK_CPPFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) $(OPENGL_LIBS) __init_gnuplot__.cc|$(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|| __magick_read__.cc|$(MAGICK_CPPFLAGS)|$(MAGICK_LDFLAGS)|$(MAGICK_LIBS) @@ -21,6 +18,5 @@ qr.cc|$(QRUPDATE_CPPFLAGS) $(SPARSE_XCPPFLAGS)|$(QRUPDATE_LDFLAGS) $(SPARSE_XLDFLAGS)|$(QRUPDATE_LIBS) $(SPARSE_XLIBS) symbfact.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS) symrcm.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS) -tsearch.cc audioread.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS) audiodevinfo.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS)