Changeset 3465

Timestamp:

Feb 10, 2016, 1:29:59 AM (6 years ago)

Author:

Peter

Message:

closes #856

Location:

trunk

Files:

• test/rnd.cc (modified) (2 diffs)
• yat/random/random.cc (modified) (2 diffs)
• yat/random/random.h (modified) (3 diffs)

trunk/test/rnd.cc

@@ -7 +7 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2012, 2015 Peter Johansson
+  Copyright (C) 2012, 2015, 2016 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -66 +66 @@
   geo();
   geo(0.1);
+  HyperGeometric hg;
+  hg(10, 100, 4);
+  HyperGeometric hg2(10, 100, 4);
+  hg2();
+  hg2(11, 100, 4);
 
   return suite.return_value();

trunk/yat/random/random.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009, 2011, 2012, 2013, 2015 Peter Johansson
+  Copyright (C) 2009, 2011, 2012, 2013, 2015, 2016 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -325 +325 @@
 
 
+  HyperGeometric::HyperGeometric(void)
+  {}
+
+
+  HyperGeometric::HyperGeometric(unsigned int n1, unsigned int n2,
+                                 unsigned int t)
+    : n1_(n1), n2_(n2), t_(t)
+  {}
+
+
+  unsigned long int HyperGeometric::operator()(void) const
+  {
+    return (*this)(n1_, n2_, t_);
+  }
+
+
+  unsigned long int HyperGeometric::operator()(unsigned int n1,
+                                               unsigned int n2,
+                                               unsigned int t) const
+  {
+    return gsl_ran_hypergeometric(rng_->rng(), n1, n2, t);
+  }
+
+
   Poisson::Poisson(const double m)
     : m_(m)

trunk/yat/random/random.h

@@ -6 +6 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Peter Johansson
+  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -314 +314 @@
      \since New in yat 0.10
    */
-  class Binomial : Discrete
+  class Binomial : public Discrete
   {
   public:
@@ -483 +483 @@
 
   /**
+     If we have \a n1 samples of type 1 and \a n2 samples of type 2
+     and draw \a t samples with replacement, number of drawn samples
+     of type 1 will follow the hyper geometric distribution.
+
+     \since New in yat 0.14
+   */
+  class HyperGeometric : public Discrete
+  {
+  public:
+    /**
+       \brief Defaul constructor
+     */
+    HyperGeometric(void);
+
+    /**
+       \brief Constructor
+       \param n1 number of samples of type 1
+       \param n2 number of samples of type 2
+       \param t number of samples to draw
+     */
+    HyperGeometric(unsigned int n1, unsigned int n2, unsigned int t);
+
+    /**
+       \return random number from hypergeometric distribution using
+       parameters set in constructor.
+     */
+    unsigned long int operator()(void) const;
+
+    /**
+       \return random number from hypergeometric distribution using
+       parameters passed.
+     */
+    unsigned long int operator()(unsigned int n1, unsigned int n2,
+                                 unsigned int t) const;
+  private:
+    unsigned int n1_;
+    unsigned int n2_;
+    unsigned int t_;
+  };
+
+  /**
      @brief Poisson Distribution