fix java initialization bug with subpop

verbal-autopsy-software · Apr 19, 2023 · 9a2eb17 · 9a2eb17
1 parent 4c6efb9
commit 9a2eb17
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/InSilicoVA/inst/java/Insilico.jar b/InSilicoVA/inst/java/Insilico.jar
diff --git a/Insilico/out/artifacts/Insilico_jar/Insilico.jar b/Insilico/out/artifacts/Insilico_jar/Insilico.jar
diff --git a/Insilico/src/sampler/InsilicoSampler2.java b/Insilico/src/sampler/InsilicoSampler2.java
@@ -699,22 +699,22 @@ public static double[] Fit(int[] dimensions,
         if(!isAdded){
             // initialize values
             for(int sub  = 0; sub < N_sub; sub++){
-                mu_now[sub] = mu;
+                for(int c = 0; c < C; c++) mu_now[sub][c] = mu[c];
                 sigma2_now[sub] = sigma2;
                 theta_now[sub][0] = 1;
                 double expsum = Math.exp(1.0);
                 for(int c = 1; c < C; c++){
                     theta_now[sub][c] = Math.log(rand.nextDouble() * 100.0);
                     expsum += Math.exp(theta_now[sub][c]);
                 }
-                for(int c = 0; c < C; c++){
+                for(int c = 0; c < C; c++) {
                     p_now[sub][c] = Math.exp(theta_now[sub][c]) / expsum;
                 }
             }
         }else{
             // if the chain is to continue from a previous one, initialize with the _now values imported
             for(int sub  = 0; sub < N_sub; sub++){
-                mu_now[sub] = mu_continue[sub];
+                for(int c = 0; c < C; c++) mu_now[sub][c] = mu_continue[sub][c];
                 sigma2_now[sub] = sigma2_continue[sub];
                 theta_now[sub] = theta_continue[sub];
                 // recalculate p from theta
@@ -843,7 +843,7 @@ public static double[] Fit(int[] dimensions,
                     mu_now[sub][c] = mu_mean;
                 }
 
-                // sample sigma2
+                 // sample sigma2
                 double shape = (C-remove_causes[sub]-1.0)/2;
                 double rate2 = 0;
                 for(int c = 0 ; c < C; c++) rate2 += Math.pow(theta_now[sub][c] - mu_now[sub][c] *