From 9f7ae751a0d6f7d27ad5f19d4fc697e722286b39 Mon Sep 17 00:00:00 2001
From: Bertrand <bertrand.horel@gmail.com>
Date: Sat, 13 Feb 2016 17:45:17 +0000
Subject: Ajout de update dans la fonction draw

---
 main.cpp                    |  12 ++++++------
 qmc                         |   2 +-
 stratified_sampling.hpp     |   7 ++++---
 stratified_sampling.hpp.gch | Bin 0 -> 42958160 bytes
 4 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 stratified_sampling.hpp.gch

diff --git a/main.cpp b/main.cpp
index 0728976..af495ca 100644
--- a/main.cpp
+++ b/main.cpp
@@ -29,18 +29,18 @@ int main()
         rvar.push_back(gaussian_truncated(q[i-1], q[i],0,1,i));
     }
     stratified_sampling<gaussian_truncated> S(p,rvar);
-    S.update(100);
-    S.draw();
+    //S.update(100);
+    S.draw(100);
     double x = 1.64*S.estimator().second;
 		cout<<"l'estimateur de la moyenne est :"<<S.estimator().first<<endl;
 		cout<<"Son intervalle de confiance à 95% est :"<<"["<<S.estimator().first-(x/10)<<" ,"<<S.estimator().first+(x/10)<<"]"<<endl;
-    S.update(1000);
-    S.draw();
+    //S.update(1000);
+    S.draw(1000);
 		x = 1,64*S.estimator().second;
 		cout<<"l'estimateur de la moyenne est :"<<S.estimator().first<<endl;
 		cout<<"Son intervalle de confiance à 95% est :"<<"["<<S.estimator().first-(x/sqrt(1100))<<" ,"<<S.estimator().first+(x/sqrt(1100))<<"]"<<endl;
-		S.update(10000);
-		S.draw();
+		//S.update(10000);
+		S.draw(10000);
 		x = 1,64*S.estimator().second;
 		cout<<"l'estimateur de la moyenne est :"<<S.estimator().first<<endl;
 		cout<<"Son intervalle de confiance à 95% est :"<<"["<<S.estimator().first-(x/sqrt(11100))<<" ,"<<S.estimator().first+(x/sqrt(11100))<<"]"<<endl;
diff --git a/qmc b/qmc
index 0b1bd7f..3723be5 160000
--- a/qmc
+++ b/qmc
@@ -1 +1 @@
-Subproject commit 0b1bd7f4c4184cb3cf52aa227698fed5d3cb5ee5
+Subproject commit 3723be5c65f44ae0d9ea25a9e563163e3e1b044a
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 <typename L>
 struct stratified_sampling {
     stratified_sampling(vector<double> p, vector<L> 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<double> get_mean() const;
     vector<double> get_var() const;
     void print_mean() const;
     void print_sigma() const;
     pair<double,double> estimator() const;
 private:
+		void update(int N);
     vector<double> p;
     vector<L> X;
     vector<int> M;
@@ -111,7 +111,8 @@ void stratified_sampling<L>::update(int Nk) {
 }
 
 template <typename L>
-void stratified_sampling<L>::draw() {
+void stratified_sampling<L>::draw(int N) {
+		update(N);
     double m, s, oldmean;
     for(int i=0;i<I;i++){
         m=0;
diff --git a/stratified_sampling.hpp.gch b/stratified_sampling.hpp.gch
new file mode 100644
index 0000000..3d6986e
Binary files /dev/null and b/stratified_sampling.hpp.gch differ
-- 
cgit v1.2.3-70-g09d2