Changeset b791e9d in tol

Timestamp:

Jun 24, 2011, 8:41:42 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

9417624

Parents:

b50906a

Message:

Fixes #1264

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3657 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bmath/bprdist/prd.cpp (modified) (4 diffs)

tol/bmath/bprdist/prd.cpp

@@ -774 +774 @@
     fA_  = NonTruncated().Dens( A_); 
     FA_  = NonTruncated().Dist( A_); 
-    F1A_ = NonTruncated().Dist(-A_); 
+    F1A_ = 1.0-NonTruncated().Dist(A_); 
   }   
   if(B_>=NonTruncated().Max()) 
@@ -787 +787 @@
     fB_  = NonTruncated().Dens( B_); 
     FB_  = NonTruncated().Dist( B_); 
-    F1B_ = NonTruncated().Dist(-B_); 
+    F1B_ = 1.0-NonTruncated().Dist(B_); 
   }   
-  useLeft_ = (A_<=NonTruncated().Average())!=0;
-  if(A_<=0)
+  useLeft_ = fB_ <= fA_;
+  if(useLeft_)
   {
     FAB_ = FB_-FA_;
@@ -813 +813 @@
   else if(x>B_) { return(1); }
   else if(!FAB_) { return((x-A_)/(B_-A_)); }
-  else { return(NonTruncated().Dist(x)/FAB_); } 
+  else 
+  { 
+    BDat Fx = NonTruncated().Dist(x);
+    return((Fx-FA_)/FAB_); 
+  } 
+//else if(useLeft_) { return((NonTruncated().Dist(x)-FA_)/FAB_); } 
+//else              { return(1.0-(FB_-NonTruncated().Dist(x))/FAB_); } 
 }
 
@@ -846 +852 @@
     }
   }
-  if(useLeft_) { return( NonTruncated().Inverse( FA_+prob*FAB_)); }
-  else         { return(-NonTruncated().Inverse(F1A_-prob*FAB_)); }
+  if(useLeft_) { return(NonTruncated().Inverse(FA_+     prob *FAB_)); }
+  else         { return(NonTruncated().Inverse(FB_-(1.0-prob)*FAB_)); }
 }