rho condition check regardless r is initialized or not

BEAST2-Dev · Mar 2, 2015 · 422b2b2 · 422b2b2
1 parent 1e9383a
commit 422b2b2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/beast/evolution/speciation/BirthDeathSkylineModel.java b/src/beast/evolution/speciation/BirthDeathSkylineModel.java
@@ -225,7 +225,6 @@ public void initAndValidate() throws Exception {
             birth = birthRate.get().getValues();
             if (SAModel) r = removalProbability.get().getValues();
 
-
         } else if (R0.get() != null && becomeUninfectiousRate.get() != null && samplingProportion.get() != null) {
 
             transform = true;
@@ -315,8 +314,8 @@ public void initAndValidate() throws Exception {
     private boolean rhoSamplingConditionHolds() {
 
         if (SAModel) {
-            for (int i=0; i<r.length; i++) {
-                if (r[i] != 0.0) {
+            for (int i=0; i<removalProbability.get().getDimension(); i++) {
+                if (removalProbability.get().getValue(i) != 0.0) {
                     return false;
                 }
             }