diff --git a/src/beast/evolution/speciation/BirthDeathSkylineModel.java b/src/beast/evolution/speciation/BirthDeathSkylineModel.java index 8e83f6a..52c46e6 100644 --- a/src/beast/evolution/speciation/BirthDeathSkylineModel.java +++ b/src/beast/evolution/speciation/BirthDeathSkylineModel.java @@ -101,18 +101,14 @@ public class BirthDeathSkylineModel extends SpeciesTreeDistribution { new Input("contemp", "Only contemporaneous sampling (i.e. all tips are from same sampling time, default false)", false); public Input R0 = - new Input("R0", "The basic reproduction number", Input.Validate.XOR, birthRate); + new Input("R0", "The basic reproduction number"); public Input becomeUninfectiousRate = - new Input("becomeUninfectiousRate", "Rate at which individuals become uninfectious (throuch recovery or sampling)", Input.Validate.XOR, deathRate); + new Input("becomeUninfectiousRate", "Rate at which individuals become uninfectious (throuch recovery or sampling)"); public Input samplingProportion = - new Input("samplingProportion", "The samplingProportion = samplingRate / becomeUninfectiousRate", Input.Validate.XOR, samplingRate); - - public Input netDiversification = - new Input("netDiversification", "Net diversification rate", Input.Validate.XOR, birthRate); - public Input turnOver = - new Input("turnOver", "Turn over rate", Input.Validate.XOR, deathRate); - // public Input samplingProportion = - // new Input("samplingProportion", "Sampling proportion", Input.Validate.XOR, samplingRate); + new Input("samplingProportion", "The samplingProportion = samplingRate / becomeUninfectiousRate"); + + public Input netDiversification = new Input("netDiversification", "Net diversification rate"); + public Input turnOver = new Input("turnOver", "Turn over rate"); public Input forceRateChange = new Input("forceRateChange", "If there is more than one interval and we estimate the time of rate change, do we enforce it to be within the tree interval? Default true", true);