field_test 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913c2ad9eaefe134cdabd915eec17f4f48fa9062c9066e37aa638989f0c05072
-  data.tar.gz: bfe73138f6b18fbf8b72e144d2f3c6e727a1d398e6c0f09860981aade30b9d45
+  metadata.gz: 0b7676acb9075e7701de0019e3c7ca18a0242db8c87348d024006ff787c42d13
+  data.tar.gz: 92849469d6ca65422ef3f2a1b77f08c7695d79fa336b463cedf3991770be15cd
 SHA512:
-  metadata.gz: e35ca617ba6e37ad7650f14ef46fd225ce3469faac29cb91909cc682f42b160b0af6af522906cfb53015a381e8c0ddb27ebda2e1a219c186147716e38d7d9396
-  data.tar.gz: 3464e1e26a219ddb43a8a766d965608c60ef014a158ac2df923403d915a684c58fdef6f6ab75b9ccf60d1201f658c84638cb9c2e5025ac48a69b45f721121290
+  metadata.gz: 9f21fa35a6f44d085bbbfbd15e8174e7dd7f8a0d411e3a584097d59793776a0c0bd783cb4a3d7fee7f07402190a1a61487e1be554492208536f375b3e1981c7f
+  data.tar.gz: aeb943baab224022931a634fa190bbb3837856b3f0ee956c919f1233c6c6796a5251216a65334cd34878487e5902a251e695722a8982a19ffca6711e1d6113cf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.1 (2021-09-22)
+
+- Improved performance of Bayesian calculations
+
 ## 0.5.0 (2021-09-21)
 
 - Significantly improved performance of Bayesian calculations

data/ext/field_test/bayesian_ab.hpp

@@ -26,14 +26,11 @@ double prob_c_beats_a_and_b(int alpha_a, int beta_a, int alpha_b, int beta_b, in
 
   double logbeta_ac_bc = logbeta(alpha_c, beta_c);
 
-  std::vector<double> log_bb_j;
-  log_bb_j.reserve(alpha_b);
-  std::vector<double> logbeta_j_bb;
-  logbeta_j_bb.reserve(alpha_b);
+  std::vector<double> log_bb_j_logbeta_j_bb;
+  log_bb_j_logbeta_j_bb.reserve(alpha_b);
 
   for (auto j = 0; j < alpha_b; j++) {
-    log_bb_j.push_back(log(beta_b + j));
-    logbeta_j_bb.push_back(logbeta(1 + j, beta_b));
+    log_bb_j_logbeta_j_bb.push_back(log(beta_b + j) + logbeta(1 + j, beta_b));
   }
 
   double abc = beta_a + beta_b + beta_c;
@@ -48,7 +45,7 @@ double prob_c_beats_a_and_b(int alpha_a, int beta_a, int alpha_b, int beta_b, in
     double sum_i = -log(beta_a + i) - logbeta(1 + i, beta_a) - logbeta_ac_bc;
 
     for (auto j = 0; j < alpha_b; j++) {
-      total += exp(sum_i + logbeta_ac_i_j[i + j] - log_bb_j[j] - logbeta_j_bb[j]);
+      total += exp(sum_i + logbeta_ac_i_j[i + j] - log_bb_j_logbeta_j_bb[j]);
     }
   }
 
@@ -61,24 +58,18 @@ double prob_d_beats_a_and_b_and_c(int alpha_a, int beta_a, int alpha_b, int beta
 
   double logbeta_ad_bd = logbeta(alpha_d, beta_d);
 
-  std::vector<double> log_bb_j;
-  log_bb_j.reserve(alpha_b);
-  std::vector<double> logbeta_j_bb;
-  logbeta_j_bb.reserve(alpha_b);
+  std::vector<double> log_bb_j_logbeta_j_bb;
+  log_bb_j_logbeta_j_bb.reserve(alpha_b);
 
   for (auto j = 0; j < alpha_b; j++) {
-    log_bb_j.push_back(log(beta_b + j));
-    logbeta_j_bb.push_back(logbeta(1 + j, beta_b));
+    log_bb_j_logbeta_j_bb.push_back(log(beta_b + j) + logbeta(1 + j, beta_b));
   }
 
-  std::vector<double> log_bc_k;
-  log_bc_k.reserve(alpha_c);
-  std::vector<double> logbeta_k_bc;
-  logbeta_k_bc.reserve(alpha_c);
+  std::vector<double> log_bc_k_logbeta_k_bc;
+  log_bc_k_logbeta_k_bc.reserve(alpha_c);
 
   for (auto k = 0; k < alpha_c; k++) {
-    log_bc_k.push_back(log(beta_c + k));
-    logbeta_k_bc.push_back(logbeta(1 + k, beta_c));
+    log_bc_k_logbeta_k_bc.push_back(log(beta_c + k) + logbeta(1 + k, beta_c));
   }
 
   double abcd = beta_a + beta_b + beta_c + beta_d;
@@ -89,22 +80,14 @@ double prob_d_beats_a_and_b_and_c(int alpha_a, int beta_a, int alpha_b, int beta
     logbeta_bd_i_j_k.push_back(logbeta(alpha_d + i, abcd));
   }
 
-  std::vector<double> sum_i_j;
-  sum_i_j.reserve(alpha_a * alpha_b);
   for (auto i = 0; i < alpha_a; i++) {
     double sum_i = -log(beta_a + i) - logbeta(1 + i, beta_a) - logbeta_ad_bd;
 
     for (auto j = 0; j < alpha_b; j++) {
-      sum_i_j.push_back(sum_i - log_bb_j[j] - logbeta_j_bb[j]);
-    }
-  }
-
-  for (auto i = 0; i < alpha_a; i++) {
-    for (auto j = 0; j < alpha_b; j++) {
-      double sum_j = sum_i_j[i * alpha_b + j];
+      double sum_j = sum_i - log_bb_j_logbeta_j_bb[j];
 
       for (auto k = 0; k < alpha_c; k++) {
-        total += exp(sum_j + logbeta_bd_i_j_k[i + j + k] - log_bc_k[k] - logbeta_k_bc[k]);
+        total += exp(sum_j + logbeta_bd_i_j_k[i + j + k] - log_bc_k_logbeta_k_bc[k]);
       }
     }
   }

data/lib/field_test/version.rb

@@ -1,3 +1,3 @@
 module FieldTest
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: field_test
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties