Mercurial > octave-nkf
view liboctave/oct-rand.h @ 13983:7dd7cccf0757
clean up memory allocated for singletons before exit
* singleton-cleanup.h, singleton-cleanup.cc: New files.
* liboctave/Makefile.am (INCS, LIBOCTAVE_CXX_SOURCES):
Add them to the lists.
* toplev.cc (clean_up_and_exit): Call singleton_cleanup_list::cleanup.
* debug.h, debug.cc (bp_table::instance_ok): Move definition to
debug.cc.
* coment-list.h (octave_comment_buffer::~octave_comment_buffer):
Define destructor for class.
* ov-typeinfo.h (octave_value_typeinfo::~octave_value_typeinfo):
Likewise.
* cmd-edit.h (command_editor::cleanup_instance): New function.
* cmd-hist.h (command_history::cleanup_instance): New function.
* file-ops.h (file_ops::cleanup_instance): New function.
* mach-info.h (oct_mach_info::cleanup_instance): New function.
* oct-env.h (octave_env::cleanup_instance): New function.
* oct-fftw.h (octave_fftw_planner::cleanup_instance): New function.
* oct-rand.h (octave_rand::cleanup_instance): New function.
* oct-spparms.h (octave_sparse_params::cleanup_instance):
New function.
* pathsearch.h (static_members::cleanup_instance): New function.
* comment-list.h (octave_comment_buffer::cleanup_instance):
New function.
* debug.h (bp_table::cleanup_instance): New function.
* display.h (display_info::cleanup_instance): New function.
* dynamic-ld.cc (octave_shlib_list::cleanup_instance,
octave_mex_file_list::cleanup_instance): New functions.
* dynamic-ld.h (octave_dynamic_loader::cleanup_instance):
New function.
* load-path.h (load_path::cleanup_instance): New function.
* oct-stream.h (octave_stream_list::cleanup_instance): New function.
* ov-typeinfo.h (octave_value_typeinfo::cleanup_instance):
New function.
* pager.h, pager.cc (octave_pager_stream::instance_ok,
octave_pager_stream::cleanup_instance): New functions.
(octave_diary_stream::instance_ok,
octave_diary_stream::cleanup_instance): New functions.
* sighandlers.h (octave_child_list::cleanup_instance): New function.
* toplev.h (octave_call_stack
* pager.cc (octave_pager_stream::stream, octave_diary_stream::stream):
Use instance_ok to create instance.
* toplev.h (octave_call_stack::cleanup_instance): New function.
* cmd-edit.cc (command_editor::instance_ok):
Register cleanup function.
* cmd-hist.cc (command_history::instance_ok): Likewise.
* file-ops.cc (file_ops::instance_ok): Likewise.
* mach-info.cc (oct_mach_info::instance_ok): Likewise.
* oct-env.cc (octave_env::instance_ok): Likewise.
* oct-fftw.cc (octave_fftw_planner::instance_ok): Likewise.
* oct-rand.cc (octave_rand::instance_ok): Likewise.
* oct-spparms.cc (octave_sparse_params::instance_ok): Likewise.
* pathsearch.cc (dir_path::static_members::instance_ok): Likewise.
* comment-list.cc (comment_list::instance_ok): Likewise.
* debug.cc (bp_table::instance_ok): Likewise.
* display.cc (display_info::instance_ok): Likewise.
* dynamic-ld.cc (octave_shlib_list::instance_ok,
octave_mex_file_list::instance_ok, octave_dynamic_loader): Likewise.
* load-path.cc (load_path::instance_ok): Likewise.
* oct-stream.cc (octave_stream_list::instance_ok): Likewise.
* ov-typeinfo.cc (octave_value_typeinfo::instance_ok): Likewise.
* sighandlers.cc (octave_child_list::instance_ok): Likewise.
* symtab.h, symtab.cc (symbol_table::scope_id::create_instance):
New function.
* symtab.h (symbol_table::scope_id::instance_ok): Call create_instance.
* toplev.h, toplev.cc (octave_call_stack::create_instance):
New function.
* toplev.cc (octave_call_stack::instance_ok): Call create_instance.
* pager.h, pager.cc (octave_pager_stream::set_diary_skip,
octave_pager_stream::flush_current_contents_to_diary): Now static.
octave_pager_stream::do_set_diary_skip,
octave_pager_stream::do_flush_current_contents_to_diary):
New functions.
(octave_pager_stream::stream): Return std::ostream&, not
octave_pager_stream&. If instance creation fails, return std::cout.
(octave_diary_stream::stream): Return std::ostream&, not
octave_diary_stream&. If instance creation fails, return std::cout.
(octave_pager_stream::do_reset, octave_diary_stream::do_reset):
Use instance_ok to create instance.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 03 Dec 2011 04:34:17 -0500 |
parents | 12df7854fa7c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2003-2011 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_rand_h) #define octave_rand_h 1 #include <map> #include <string> #include "dColVector.h" #include "dMatrix.h" #include "dNDArray.h" #include "lo-ieee.h" class OCTAVE_API octave_rand { protected: octave_rand (void); public: ~octave_rand (void) { } static bool instance_ok (void); // Return the current seed. static double seed (void) { return instance_ok () ? instance->do_seed () : octave_NaN; } // Set the seed. static void seed (double s) { if (instance_ok ()) instance->do_seed (s); } // Reset the seed. static void reset (void) { if (instance_ok ()) instance->do_reset (); } // Return the current state. static ColumnVector state (const std::string& d = std::string ()) { return instance_ok () ? instance->do_state (d) : ColumnVector (); } // Set the current state/ static void state (const ColumnVector &s, const std::string& d = std::string ()) { if (instance_ok ()) instance->do_state (s, d); } // Reset the current state/ static void reset (const std::string& d) { if (instance_ok ()) instance->do_reset (d); } // Return the current distribution. static std::string distribution (void) { return instance_ok () ? instance->do_distribution () : std::string (); } // Set the current distribution. May be either "uniform" (the // default), "normal", "exponential", "poisson", or "gamma". static void distribution (const std::string& d) { if (instance_ok ()) instance->do_distribution (d); } static void uniform_distribution (void) { if (instance_ok ()) instance->do_uniform_distribution (); } static void normal_distribution (void) { if (instance_ok ()) instance->do_normal_distribution (); } static void exponential_distribution (void) { if (instance_ok ()) instance->do_exponential_distribution (); } static void poisson_distribution (void) { if (instance_ok ()) instance->do_poisson_distribution (); } static void gamma_distribution (void) { if (instance_ok ()) instance->do_gamma_distribution (); } // Return the next number from the sequence. static double scalar (double a = 1.0) { return instance_ok () ? instance->do_scalar (a) : octave_NaN; } // Return a matrix of numbers from the sequence, filled in column // major order. static Matrix matrix (octave_idx_type r, octave_idx_type c, double a = 1.0) { return instance_ok () ? instance->do_matrix (r, c, a) : Matrix (); } // Return an N-dimensional array of numbers from the sequence, // filled in column major order. static NDArray nd_array (const dim_vector& dims, double a = 1.0) { return instance_ok () ? instance->do_nd_array (dims, a) : NDArray (); } // Return an array of numbers from the sequence. static Array<double> vector (octave_idx_type n, double a = 1.0) { return instance_ok () ? instance->do_vector (n, a) : Array<double> (); } private: static octave_rand *instance; static void cleanup_instance (void) { delete instance; instance = 0; } enum { unknown_dist, uniform_dist, normal_dist, expon_dist, poisson_dist, gamma_dist }; // Current distribution of random numbers. int current_distribution; // If TRUE, use old RANLIB generators. Otherwise, use Mersenne // Twister generator. bool use_old_generators; // Saved MT states. std::map<int, ColumnVector> rand_states; // Return the current seed. double do_seed (void); // Set the seed. void do_seed (double s); // Reset the seed. void do_reset (); // Return the current state. ColumnVector do_state (const std::string& d); // Set the current state/ void do_state (const ColumnVector &s, const std::string& d); // Reset the current state/ void do_reset (const std::string& d); // Return the current distribution. std::string do_distribution (void); // Set the current distribution. May be either "uniform" (the // default), "normal", "exponential", "poisson", or "gamma". void do_distribution (const std::string& d); void do_uniform_distribution (void); void do_normal_distribution (void); void do_exponential_distribution (void); void do_poisson_distribution (void); void do_gamma_distribution (void); // Return the next number from the sequence. double do_scalar (double a = 1.); // Return a matrix of numbers from the sequence, filled in column // major order. Matrix do_matrix (octave_idx_type r, octave_idx_type c, double a = 1.); // Return an N-dimensional array of numbers from the sequence, // filled in column major order. NDArray do_nd_array (const dim_vector& dims, double a = 1.); // Return an array of numbers from the sequence. Array<double> do_vector (octave_idx_type n, double a = 1.); // Some helper functions. void initialize_ranlib_generators (void); void initialize_mersenne_twister (void); ColumnVector get_internal_state (void); void save_state (void); int get_dist_id (const std::string& d); void set_internal_state (const ColumnVector& s); void switch_to_generator (int dist); void fill (octave_idx_type len, double *v, double a); }; #endif