random_variable 1.0.1 → 1.1.0

data/lib/distros.rb

@@ -14,7 +14,7 @@
 ################################################################################
 
 module RandomVariable
-	class Bernoulli
+	class Bernoulli < Generic
 		# create a new <i>Bernoulli Random Variable</i> with 
 		# parameter +p+
 		def self.new(p)
@@ -22,7 +22,7 @@ module RandomVariable
 		end
 	end
 
-	class Beta
+	class Beta < Generic
 		# create a new <i>Beta Random Variable</i> with parameters 
 		# +alpha+ and +beta+
 		def self.new(alpha, beta)
@@ -30,7 +30,7 @@ module RandomVariable
 		end
 	end
 
-	class Binomial
+	class Binomial < Generic
 		# create a new <i>Binomial Random Variable</i> with parameters 
 		# +n+ and +p+
 		def self.new(n, p)
@@ -38,7 +38,7 @@ module RandomVariable
 		end
 	end
 
-	class ContinuousUniform
+	class ContinuousUniform < Generic
 		# create a new <i>Continuous Uniform Random Variable</i> with 
 		# parameters +a+ and +b+
 		def self.new(a, b)
@@ -46,7 +46,7 @@ module RandomVariable
 		end	
 	end
 
-	class DiscreteUniform
+	class DiscreteUniform < Generic
 		# create a new <i>Discrete Uniform Random Variable</i> with 
 		# parameters +a+ and +b+
 		def self.new(a, b)
@@ -54,7 +54,7 @@ module RandomVariable
 		end
 	end
 
-	class Exponential
+	class Exponential < Generic
 		# create a new <i>Exponential Random Variable</i> with a mean of
 		# +mean+
 		def self.new(mean)
@@ -62,7 +62,7 @@ module RandomVariable
 		end
 	end
 
-	class F
+	class F < Generic
 		# create a new <i>F Random Variable</i> with parameters 
 		# +d1+ and +d2+
 		def self.new(d1, d2)
@@ -70,7 +70,7 @@ module RandomVariable
 		end
 	end
 
-	class Normal
+	class Normal < Generic
 		# create a new <i>Normal Random Variable</i> with parameters
 		# +mu+ and +sigma+
 		def self.new(mu = 0.0, sigma = 1.0)
@@ -78,7 +78,7 @@ module RandomVariable
 		end
 	end
 
-	class Poisson
+	class Poisson < Generic
 		# create a new <i>Poisson Random Variable</i> with a mean of
 		# +mean+
 		def self.new(mean)
@@ -86,7 +86,7 @@ module RandomVariable
 		end
 	end
 
-	class Rayleigh	
+	class Rayleigh < Generic
 		# create a new <i>Rayleigh Random Variable</i> with parameter
 		# +sigma+
 		def self.new(sigma)

data/lib/ext/gen.c

@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+// File:     gen.c                                                            //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+// Author:   Jorge F.M. Rinaldi                                               //
+// Contact:  jorge.madronal.rinaldi@gmail.com                                 //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+// Date:     2012/12/01                                                       //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+
+#include <ruby.h>
+
+extern VALUE rb_cRandom;
+
+/* the random number generator */
+static VALUE rb_RandGen = Qnil;
+
+#define GET_RB_RANF	rb_funcall(rb_RandGen, rb_intern("rand"), 0)
+double ranf(void)
+{
+	return NUM2DBL(GET_RB_RANF);
+}
+
+VALUE rb_ranf(void)
+{
+	return GET_RB_RANF;
+}
+#undef GET_RB_RANF
+
+VALUE rv_gen_get_seed(void)
+{
+	return rb_funcall(rb_RandGen, rb_intern("seed"), 0);
+}
+
+void rv_gen_set_seed(VALUE rb_seed)
+{
+	rb_RandGen = rb_funcall(rb_cRandom, rb_intern("new"), 1, rb_seed);
+}
+
+/* Must be called before any kind ranf() call */
+void rv_init_gen(void)
+{
+	rb_RandGen = rb_funcall(rb_cRandom, rb_intern("new"), 0);
+
+	/* tell the GC not to collect the random generator */
+	rb_gc_register_address(&rb_RandGen);
+}

data/lib/ext/gen.h

@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+// File:     gen.h                                                            //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+// Author:   Jorge F.M. Rinaldi                                               //
+// Contact:  jorge.madronal.rinaldi@gmail.com                                 //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+// Date:     2012/12/01                                                       //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef __GEN_H__
+#define __GEN_H__
+
+#include <ruby.h>
+
+void rv_init_gen(void);
+double ranf(void);
+void rv_gen_set_seed(VALUE);
+VALUE rv_gen_get_seed(void);
+
+#endif /* __GEN_H__ */

data/lib/ext/randlib.c

@@ -1,4 +1,5 @@
 #include "randlib.h"
+#include "gen.h"
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
@@ -1597,6 +1598,7 @@ extern long lennob(char *str);
 #endif
 }
 
+#if 0
 double ranf(void)
 /*
 **********************************************************************
@@ -1622,6 +1624,7 @@ static double ranf;
     ranf = ignlgi()*4.65661305739177E-10;
     return ranf;
 }
+#endif 
 
 void setgmn(double *meanv,double *covm,long p,double *parm)
 /*

data/lib/ext/random_variable.c

@@ -1,21 +1,17 @@
 ////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 // File:     random_variable.c                                                //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 // Author:   Jorge F.M. Rinaldi                                               //
 // Contact:  jorge.madronal.rinaldi@gmail.com                                 //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 // Date:     2012/10/11                                                       //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
 
 /*******************************************************************************
     random_variable gem for the creation or random variables in Ruby
@@ -59,6 +55,7 @@
 #error "No limits.h header found"
 #endif /* HAVE_LIMITS_H */
 
+#include "gen.h"
 #include "randlib.h"
 #include "xrandlib.h"
 
@@ -206,6 +203,7 @@ CREATE_RANDVAR_RB_OUTCOME(rayleigh, DBL2NUM)
 /******************************************************************************/
 /* class and module objects */
 static VALUE rb_mRandomVariable;
+static VALUE rb_mGenerator;
 static VALUE rb_cRandomVariables[NR_RANDOM_VARIABLES];
 /******************************************************************************/
 
@@ -579,6 +577,17 @@ VALUE rb_outcomes(VALUE rb_obj, VALUE rb_nr_times)
 }
 #undef GET_DATA
 
+static VALUE rb_seed_get(VALUE self)
+{
+	return rv_gen_get_seed();
+}
+
+static VALUE rb_seed_set(VALUE self, VALUE rb_seed)
+{
+	rv_gen_set_seed(rb_seed);
+	return rb_seed;
+}
+
 /******************************************************************************/
 /* macros for the extension entry point */
 /******************************************************************************/
@@ -614,10 +623,17 @@ void Init_random_variable(void)
 {
 	/* the RandomVariable module */
 	rb_mRandomVariable = rb_define_module("RandomVariable");
+
+	/* Generator */
+	rb_mGenerator = rb_define_module_under(rb_mRandomVariable, "Generator");
+	rb_define_singleton_method(rb_mGenerator, "seed", rb_seed_get, 0);
+	rb_define_singleton_method(rb_mGenerator, "seed=", rb_seed_set, 1);
+
 	/* Generic */
 	rb_cRandomVariables[rv_type_generic] = 
 		rb_define_class_under(rb_mRandomVariable, 
 						"Generic", rb_cObject);
+	/* random distributions */
 	CREATE_RANDOM_VARIABLE_CLASS("Bernoulli", bernoulli);
 	CREATE_RANDOM_VARIABLE_CLASS("Beta", beta);
 	CREATE_RANDOM_VARIABLE_CLASS("Binomial", binomial);
@@ -628,6 +644,9 @@ void Init_random_variable(void)
 	CREATE_RANDOM_VARIABLE_CLASS("Normal", normal);
 	CREATE_RANDOM_VARIABLE_CLASS("Poisson", poisson);
 	CREATE_RANDOM_VARIABLE_CLASS("Rayleigh", rayleigh);
+
+	/* initialize the random number generator */
+	rv_init_gen();
 }
 #undef CREATE_RANDOM_VARIABLE_CLASS
 

data/lib/ext/xrandlib.c

@@ -50,7 +50,7 @@ int gen_bernoulli(double p)
 /* Rayleigh */
 double gen_rayleigh(double sigma)
 {
-	return sqrt( -2 * sigma * sigma * log(1.0 - ranf()) );
+	return sigma * sqrt(-2 * log(1.0 - ranf()));
 }
 
 /* Arcsine */

data/lib/random_variable.rb

@@ -34,6 +34,24 @@
 require_relative 'ext/random_variable'
 
 module RandomVariable 
+	# obtain the current seed in use
+	#
+	# @return [Numeric] the current seed
+	def self.seed
+		Generator::seed
+	end
+
+	# set and reset the seed to a new seed
+	#
+	# @param [Numeric] new_seed new seed
+	# @return [Numeric] the new just set seed
+	def self.seed=(new_seed)
+		Generator::seed = new_seed
+	end
+	
+	# obtain a list of the different available random variable class
+	# objects
+	# @return [Array] list of random variable class objects
 	def self.list
 		distros = []
 		self.constants.each do |c|
@@ -46,46 +64,44 @@ module RandomVariable
 	end
 	
 	class Generic	
-	klass = self
+		klass = self
 
-	def initialize(&blk)
-		@blk = blk
-	end
+		def initialize(&blk)
+			@blk = blk
+		end
 
 
-	operators = %w(+ - * / % **)
+		operators = %w(+ - * / % **)
 
-	operators.each do |operator|
-		define_method(operator) do |arg|
-			if arg.is_a? klass then
-				return klass.new {
-					self.outcome.send(operator, arg.outcome) 
-				}
+		operators.each do |op|
+			define_method(op) do |arg|
+				if arg.is_a? klass then
+					return klass.new {
+						self.outcome.send(op,
+								arg.outcome) 
+						}
+				end
+				klass.new { self.outcome.send(op, arg) }
 			end
-			klass.new { 
-				self.outcome.send(operator, arg) 
-			}
 		end
-	end
 
-	# obtain a single outcome from the random variable
-	def outcome
-		@blk.call
-	end
-	alias :sample :outcome
+		# obtain a single outcome from the random variable
+		def outcome
+			@blk.call
+		end
+		alias :sample :outcome
 
-	# obtain +number+ outcomes from the random variable
-	def outcomes(number)
-		ary = []
-		number.times do
-			ary << @blk.call
+		# obtain +number+ outcomes from the random variable
+		def outcomes(number)
+			ary = []
+			number.times do
+				ary << @blk.call
+			end
+			ary	
 		end
-		ary	
-	end
-	alias :samples :outcomes
+		alias :samples :outcomes
 	
-
-end
+	end
 end
 
 require_relative 'distros.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: random_variable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies: []
 description: Create and operate with random variables in Ruby
 email: jorge.madronal.rinaldi@gmail.com
@@ -24,6 +24,8 @@ files:
 - LICENSE
 - COPYING
 - lib/ext/random_variable.c
+- lib/ext/gen.c
+- lib/ext/gen.h
 - lib/ext/randlib.c
 - lib/ext/randlib.h
 - lib/ext/xrandlib.c