Mercurial > hg > octave-avbm
changeset 4307:fd034cd46aea
[project @ 2003-01-24 19:20:50 by jwe]
author | jwe |
---|---|
date | Fri, 24 Jan 2003 19:20:50 +0000 |
parents | 6d3df3900252 |
children | b738d1a02adb |
files | liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/DLD-FUNCTIONS/rand.cc |
diffstat | 4 files changed, 29 insertions(+), 178 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2003-01-24 John W. Eaton <jwe@bevo.che.wisc.edu> + + * oct-rand.h, oct-rand.cc: New files. + * Makefile.in: Add them to the appropriate lists. + 2003-01-23 John W. Eaton <jwe@bevo.che.wisc.edu> * Array2-idx.h (Array2<T>::index): Fix off-by-one error.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -61,7 +61,7 @@ glob-match.h idx-vector.h lo-ieee.h lo-mappers.h \ lo-specfun.h lo-sstream.h lo-sysdep.h lo-utils.h \ mach-info.h oct-alloc.h oct-cmplx.h oct-env.h oct-fftw.h \ - oct-getopt.h oct-group.h oct-kpse.h oct-passwd.h \ + oct-getopt.h oct-group.h oct-kpse.h oct-passwd.h oct-rand.h \ oct-rl-edit.h oct-rl-hist.h oct-shlib.h oct-syscalls.h \ oct-time.h pathlen.h pathsearch.h prog-args.h statdefs.h \ str-vec.h sun-utils.h sysdir.h systime.h syswait.h \ @@ -102,7 +102,7 @@ file-ops.cc file-stat.cc glob-match.cc idx-vector.cc \ lo-ieee.cc lo-mappers.cc lo-specfun.cc lo-sysdep.cc \ lo-utils.cc mach-info.cc oct-alloc.cc oct-env.cc \ - oct-fftw.cc oct-group.cc oct-passwd.cc oct-shlib.cc \ + oct-fftw.cc oct-group.cc oct-passwd.cc oct-rand.cc oct-shlib.cc \ oct-syscalls.cc oct-time.cc prog-args.cc str-vec.cc \ $(TEMPLATE_SRC) \ $(TI_SRC) \
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-01-24 John W. Eaton <jwe@bevo.che.wisc.edu> + + * DLD-FUNCTIONS/rand.cc: Rewrite to use new octave_rand functions. + 2003-01-23 John W. Eaton <jwe@bevo.che.wisc.edu> * oct-stream.cc (octave_base_stream::do_printf): Handle values
--- a/src/DLD-FUNCTIONS/rand.cc +++ b/src/DLD-FUNCTIONS/rand.cc @@ -30,6 +30,7 @@ #include "f77-fcn.h" #include "lo-mappers.h" +#include "oct-rand.h" #include "quit.h" #include "defun-dld.h" @@ -39,130 +40,10 @@ #include "unwind-prot.h" #include "utils.h" -// Possible distributions of random numbers. This was handled with an -// enum, but unwind_protecting that doesn't work so well. -#define uniform_dist 1 -#define normal_dist 2 - -// Current distribution of random numbers. -static int current_distribution = uniform_dist; - -// Has the seed been set yet? -static int initialized = 0; - -extern "C" -{ - int F77_FUNC (dgennor, DGENNOR) (const double&, const double&, - double&); - - int F77_FUNC (dgenunf, DGENUNF) (const double&, const double&, - double&); - - int F77_FUNC (setall, SETALL) (const int&, const int&); - - int F77_FUNC (getsd, GETSD) (int&, int&); - - int F77_FUNC (setsd, SETSD) (const int&, const int&); - - int F77_FUNC (setcgn, SETCGN) (const int&); -} - -static double -curr_rand_seed (void) -{ - union d2i { double d; int i[2]; }; - union d2i u; - F77_FUNC (getsd, GETSD) (u.i[0], u.i[1]); - return u.d; -} - -static int -force_to_fit_range (int i, int lo, int hi) -{ - assert (hi > lo && lo >= 0 && hi > lo); - - i = i > 0 ? i : -i; - - if (i < lo) - i = lo; - else if (i > hi) - i = i % hi; - - return i; -} - -static void -set_rand_seed (double val) -{ - union d2i { double d; int i[2]; }; - union d2i u; - u.d = val; - int i0 = force_to_fit_range (u.i[0], 1, 2147483563); - int i1 = force_to_fit_range (u.i[1], 1, 2147483399); - F77_FUNC (setsd, SETSD) (i0, i1); -} - -static const char * -curr_rand_dist (void) -{ - if (current_distribution == uniform_dist) - return "uniform"; - else if (current_distribution == normal_dist) - return "normal"; - else - { - panic_impossible (); - return 0; - } -} - -// Make the random number generator give us a different sequence every -// time we start octave unless we specifically set the seed. The -// technique used below will cycle monthly, but it it does seem to -// work ok to give fairly different seeds each time Octave starts. - -static void -do_initialization (void) -{ - time_t now; - struct tm *tm; - - time (&now); - tm = localtime (&now); - - int hour = tm->tm_hour + 1; - int minute = tm->tm_min + 1; - int second = tm->tm_sec + 1; - - int s0 = tm->tm_mday * hour * minute * second; - int s1 = hour * minute * second; - - s0 = force_to_fit_range (s0, 1, 2147483563); - s1 = force_to_fit_range (s1, 1, 2147483399); - - F77_FUNC (setall, SETALL) (s0, s1); - - initialized = 1; -} - -#define MAKE_RAND_MAT(mat, nr, nc, f, F) \ - do \ - { \ - double val; \ - for (volatile int j = 0; j < nc; j++) \ - for (volatile int i = 0; i < nr; i++) \ - { \ - OCTAVE_QUIT; \ - F77_FUNC (f, F) (0.0, 1.0, val); \ - mat(i,j) = val; \ - } \ - } \ - while (0) - -static octave_value_list +static octave_value do_rand (const octave_value_list& args, int nargin) { - octave_value_list retval; + octave_value retval; volatile int n = 0; volatile int m = 0; @@ -184,23 +65,19 @@ if (s_arg == "dist") { - retval(0) = curr_rand_dist (); + retval = octave_rand::distribution (); } else if (s_arg == "seed") { - retval(0) = curr_rand_seed (); + retval = octave_rand::seed (); } else if (s_arg == "uniform") { - current_distribution = uniform_dist; - - F77_FUNC (setcgn, SETCGN) (uniform_dist); + octave_rand::uniform_distribution (); } else if (s_arg == "normal") { - current_distribution = normal_dist; - - F77_FUNC (setcgn, SETCGN) (normal_dist); + octave_rand::normal_distribution (); } else error ("rand: unrecognized string argument"); @@ -271,7 +148,7 @@ double d = args(1).double_value (); if (! error_state) - set_rand_seed (d); + octave_rand::seed (d); } else error ("rand: unrecognized string argument"); @@ -303,36 +180,7 @@ gen_matrix: - if (n == 0 || m == 0) - { - Matrix m; - retval.resize (1, m); - } - else if (n > 0 && m > 0) - { - Matrix rand_mat (n, m); - - switch (current_distribution) - { - case uniform_dist: - MAKE_RAND_MAT (rand_mat, n, m, dgenunf, DGENUNF); - break; - - case normal_dist: - MAKE_RAND_MAT (rand_mat, n, m, dgennor, DGENNOR); - break; - - default: - panic_impossible (); - break; - } - - retval(0) = rand_mat; - } - else - error ("rand: invalid negative argument"); - - return retval; + return octave_rand::matrix (n, m); } DEFUN_DLD (rand, args, nargout, @@ -361,27 +209,24 @@ @code{rand} returns the current value of the seed.\n\ @end deftypefn") { - octave_value_list retval; + octave_value retval; int nargin = args.length (); if (nargin > 2 || nargout > 1) print_usage ("rand"); else - { - if (! initialized) - do_initialization (); - - retval = do_rand (args, nargin); - } + retval = do_rand (args, nargin); return retval; } +static std::string current_distribution = octave_rand::distribution (); + static void reset_rand_generator (void *) { - F77_FUNC (setcgn, SETCGN) (current_distribution); + octave_rand::distribution (current_distribution); } DEFUN_DLD (randn, args, nargout, @@ -409,7 +254,7 @@ @code{randn} returns the current value of the seed.\n\ @end deftypefn") { - octave_value_list retval; + octave_value retval; int nargin = args.length (); @@ -417,9 +262,6 @@ print_usage ("randn"); else { - if (! initialized) - do_initialization (); - unwind_protect::begin_frame ("randn"); // This relies on the fact that elements are popped from the @@ -428,11 +270,11 @@ // reset_rand_generator()). unwind_protect::add (reset_rand_generator, 0); - unwind_protect_int (current_distribution); + unwind_protect_str (current_distribution); - current_distribution = normal_dist; + current_distribution = "normal"; - F77_FUNC (setcgn, SETCGN) (normal_dist); + octave_rand::distribution (current_distribution); retval = do_rand (args, nargin);