Changeset 442

Timestamp:

07/29/09 08:49:20 (15 years ago)

Author:

vbarta

Message:

distinguishing nbins from nsamples

Location:

library/tests

Files:

• egiw.cfg (modified) (1 diff)
• epdf_harness.cpp (modified) (2 diffs)
• epdf_harness.h (modified) (2 diffs)

library/tests/egiw.cfg

@@ -16 +16 @@
   variance = [ 0.002, 8e-05 ];
   support = ( "matrix", 2, 2, [ -2.0, 4.0, 0.01, 2.0 ] );
-  nsamples = 200;
+  nbins = [ 100, 200 ];
   integral = 1.0;
 },

library/tests/epdf_harness.cpp

@@ -49 +49 @@
     }
 
+    if (set.exists("nbins")) {
+        UI::get(nbins, set, "nbins");
+    }
+
     if (set.exists("nsamples")) {
         UI::get(nsamples, set, "nsamples");
@@ -70 +74 @@
         vec xb = support.get_row(0);
         vec yb = support.get_row(1);
-        CHECK_CLOSE(mean, num_mean2(hepdf.get(), xb, yb, nsamples, nsamples), 0.1);
-        CHECK_CLOSE(integral, normcoef(hepdf.get(), xb, yb, nsamples, nsamples), 0.1);
+
+        int old_size = nbins.size();
+        if (old_size < 2) {
+            vec new_nbins("100 100");
+            for (int i = 0; i < old_size; ++i) {
+                new_nbins(i) = nbins(i);
+            }
+
+            nbins = new_nbins;
+        }
+
+        CHECK_CLOSE(mean, num_mean2(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
+        CHECK_CLOSE(integral, normcoef(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
     }
 
     if (R.rows() > 0) {
-        mat Smp = hepdf->sample_m(10000);
-        int N = Smp.cols();
-        vec Emu = Smp*ones(N) /N ;
-        mat Er = (Smp*Smp.transpose())/N - outer_product(Emu,Emu);
+        mat smp = hepdf->sample_m(nsamples);
+        int N = smp.cols();
+        vec Emu = smp*ones(N) /N ;
+        mat Er = (smp*smp.transpose())/N - outer_product(Emu,Emu);
         CHECK_CLOSE(mean, Emu, 0.1);
         CHECK_CLOSE(R, Er, 0.1);

library/tests/epdf_harness.h

@@ -32 +32 @@
     vec variance;
     mat support;
+    vec nbins;
     int nsamples;
     double integral;
@@ -37 +38 @@
 
 public:
-    epdf_harness():nsamples(100), integral(0) { }
+    epdf_harness():nsamples(1000), integral(0) { }
 
     virtual void test();