Changeset 2913 in Sophya for trunk/SophyaLib/SysTools/rpneval.cc

Timestamp:

Feb 9, 2006, 7:30:59 PM (20 years ago)

Author:

ansari

Message:

correction bug dans calcul sigma de rpneval - Reza 9/02/2006

File:

• trunk/SophyaLib/SysTools/rpneval.cc (modified) (1 diff)

trunk/SophyaLib/SysTools/rpneval.cc

@@ -250 +250 @@
         if (nn == 0) return 1;
         double fnn = nn;
-        if ((args[k] == "sigma") || (args[k] == "sigmean")) 
-          rpnstack_.push(sqrt(sx2/fnn-(x*x/(fnn*fnn))));
-        else if ((args[k] == "mean") || (args[k] == "sigmean"))  rpnstack_.push(sx/fnn);
-        else rpnstack_.push(sx2/fnn-(x*x/(fnn*fnn)));
+        double mean = sx/fnn;
+        if (args[k] == "sigma2")  rpnstack_.push(sx2/fnn-mean*mean);
+        else {
+          if ((args[k] == "sigma") || (args[k] == "sigmean")) 
+            rpnstack_.push(sqrt(sx2/fnn-mean*mean));
+          if ((args[k] == "mean") || (args[k] == "sigmean"))  rpnstack_.push(mean);
+        }
       }
     }