Beast 2.4 update for new parameterization

CompEvol · Mar 7, 2016 · 7fcec03 · 7fcec03
1 parent a7cec62
commit 7fcec03
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/beast/evolution/speciation/DiversificationTurnoverParameterization.java b/src/beast/evolution/speciation/DiversificationTurnoverParameterization.java
@@ -49,5 +49,5 @@ public double s() {
     }
 
     @Override
-    public void initAndValidate() throws Exception {}
+    public void initAndValidate() {}
 }
diff --git a/src/beast/evolution/speciation/DiversificationTurnoverPsiExpectedNParameterization.java b/src/beast/evolution/speciation/DiversificationTurnoverPsiExpectedNParameterization.java
@@ -45,5 +45,5 @@ public double d() {
     }
 
     @Override
-    public void initAndValidate() throws Exception {}
+    public void initAndValidate() {}
 }
diff --git a/src/beast/evolution/speciation/ParameterizedSABirthDeathModel.java b/src/beast/evolution/speciation/ParameterizedSABirthDeathModel.java
@@ -53,13 +53,13 @@ public class ParameterizedSABirthDeathModel extends SpeciesTreeDistribution {
 
     private boolean lambdaExceedsMu = false;
 
-    public void initAndValidate() throws Exception {
+    public void initAndValidate() {
 
         updateParameters();
 
         double rootHeight = treeInput.get().getRoot().getHeight();
         if (origin < rootHeight){
-            throw new RuntimeException("Initial value of origin (" + origin + ") should be greater than initial root height (" +rootHeight + ")");
+            throw new IllegalArgumentException("Initial value of origin (" + origin + ") should be greater than initial root height (" +rootHeight + ")");
         }
     }
 

diff --git a/src/beast/evolution/speciation/RateParameterization.java b/src/beast/evolution/speciation/RateParameterization.java
@@ -35,5 +35,5 @@ public double origin() {
     }
 
     @Override
-    public void initAndValidate() throws Exception {}
+    public void initAndValidate() {}
 }