From 7fcec03923577c0fc92a92a29b0ba2f1e8841609 Mon Sep 17 00:00:00 2001
From: Sasha <sasha.gavryushkina@auckland.ac.nz>
Date: Mon, 7 Mar 2016 14:25:02 +1300
Subject: [PATCH] Beast 2.4 update for new parameterization

---
 .../speciation/DiversificationTurnoverParameterization.java   | 2 +-
 .../DiversificationTurnoverPsiExpectedNParameterization.java  | 2 +-
 .../evolution/speciation/ParameterizedSABirthDeathModel.java  | 4 ++--
 src/beast/evolution/speciation/RateParameterization.java      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/beast/evolution/speciation/DiversificationTurnoverParameterization.java b/src/beast/evolution/speciation/DiversificationTurnoverParameterization.java
index 2cad4fa..f85922d 100644
--- 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
index 300f530..c553980 100644
--- 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
index 51acdcc..d8ef790 100644
--- 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
index bcf4b56..215fdcd 100644
--- 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() {}
 }