From 9f7ae751a0d6f7d27ad5f19d4fc697e722286b39 Mon Sep 17 00:00:00 2001 From: Bertrand Date: Sat, 13 Feb 2016 17:45:17 +0000 Subject: Ajout de update dans la fonction draw --- stratified_sampling.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'stratified_sampling.hpp') diff --git a/stratified_sampling.hpp b/stratified_sampling.hpp index e7b3978..81080fc 100644 --- a/stratified_sampling.hpp +++ b/stratified_sampling.hpp @@ -49,14 +49,14 @@ template struct stratified_sampling { stratified_sampling(vector p, vector X) :p(p), X(X), mean(p.size(), 0), sigma2(p.size(), 0), I(p.size()){}; - void update(int N); - void draw(); + void draw(int N); vector get_mean() const; vector get_var() const; void print_mean() const; void print_sigma() const; pair estimator() const; private: + void update(int N); vector p; vector X; vector M; @@ -111,7 +111,8 @@ void stratified_sampling::update(int Nk) { } template -void stratified_sampling::draw() { +void stratified_sampling::draw(int N) { + update(N); double m, s, oldmean; for(int i=0;i