[Rmol-svn-commit] SF.net SVN: rmol:[157] trunk/rmol/rmol/bom/EmsrUtils.cpp

[<qua...@us...>]

Revision: 157
          http://rmol.svn.sourceforge.net/rmol/?rev=157&view=rev
Author:   quannaus
Date:     2008-08-25 12:08:51 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
Made some changes to make EMSR methods more consistent.

Modified Paths:
--------------
    trunk/rmol/rmol/bom/EmsrUtils.cpp

Modified: trunk/rmol/rmol/bom/EmsrUtils.cpp
===================================================================
--- trunk/rmol/rmol/bom/EmsrUtils.cpp	2008-07-23 07:12:04 UTC (rev 156)
+++ trunk/rmol/rmol/bom/EmsrUtils.cpp	2008-08-25 12:08:51 UTC (rev 157)
@@ -5,6 +5,7 @@
 #include <gsl/gsl_cdf.h>
 // C
 #include <math.h>
+#include <assert.h>
 // RMOL
 #include <rmol/bom/EmsrUtils.hpp>
 #include <rmol/bom/Bucket.hpp>
@@ -27,9 +28,11 @@
     const double lNewMean = lAggregatedMean + lCurrentMean;
     const double lNewSD =
       sqrt(lAggregatedSD*lAggregatedSD + lCurrentSD*lCurrentSD);
-    const double lNewAverageYield = (lAggregatedAverageYield*lAggregatedMean +
-                                     lCurrentAverageYield*lCurrentMean)/lNewMean;
-
+    double lNewAverageYield = lCurrentAverageYield;
+    if (lNewMean > 0) {
+      lNewAverageYield = (lAggregatedAverageYield*lAggregatedMean +
+                          lCurrentAverageYield*lCurrentMean)/lNewMean;
+    } 
     // Set the new yield range for the new aggregated class/bucket.
     ioAggregatedBucket.setYieldRange(lNewAverageYield);
 
@@ -47,11 +50,12 @@
     const double lSD = ioAggregatedBucket.getStandardDeviation();
     const double lAggreatedYield = ioAggregatedBucket.getAverageYield();
     const double lNextYield = ioNextBucket.getAverageYield();
+    assert (lAggreatedYield != 0);
     
     // Compute the protection for the aggregated class/bucket
     const double lProtection = 
       lMean + gsl_cdf_gaussian_Qinv (lNextYield/lAggreatedYield, lSD);
-
+    
     return lProtection;
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.