Changeset 449

Timestamp:

07/29/09 15:33:44 (15 years ago)

Author:

vbarta

Message:

control iteration with integers, not doubles (overrides memory when it rounds off)

Files:

• library/tests/test_util.cpp (modified) (3 diffs)

library/tests/test_util.cpp

@@ -86 +86 @@
     double ystep = (yb(1) - yb(0)) / yn;
 
-    int i = 0;
-    for (double x = xb(0); x <= xb(1); x += xstep, i++) {
+    double x = xb(0);
+    for (int i = 0; i <= xn; x += xstep, i++) {
         rgr(0) = x;
-        int j = 0;
-        for (double y = yb(0); y <= yb(1); y += ystep, j++) {
+        double y = yb(0);
+        for (int j = 0; j <= yn; y += ystep, j++) {
             rgr(1) = y;
             Pdf(i, j) = exp(ep->evallog(rgr));
@@ -110 +110 @@
     vec Si(yn + 1);
 
-    int i = 0;
-    for (double x = xb(0); x <= xb(1); x += xstep, i++) {
+    double x = xb(0);
+    for (int i = 0; i <= xn; x += xstep, i++) {
         Mu(i) = x;
         rgr(0) = x;
-        int j = 0;
-        for (double y = yb(0); y <= yb(1); y += ystep, j++) {
+        double y = yb(0);
+        for (int j = 0; j <= yn; y += ystep, j++) {
             Si(j) = y;
             rgr(1) = y;
@@ -123 +123 @@
 
     vec fm = sum(Pdf, 2);
+    double sfm = sum(fm);
     vec fs = sum(Pdf, 1);
-    return vec_2(Mu * fm / sum(fm), Si * fs / sum(fs));
+    double sfs = sum(fs);
+    double vi0 = Mu * fm / sfm;
+    double vi1 = Si * fs / sfs;
+    return vec_2(vi0, vi1);
 }