Skip to content

Commit

Permalink
another try to solve conflict about the new parameterization
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangchicool committed Jul 6, 2016
1 parent 30f2582 commit 8ee4cd5
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions src/beast/evolution/speciation/BirthDeathSkylineModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,10 @@ public class BirthDeathSkylineModel extends SpeciesTreeDistribution {
public Input<RealParameter> becomeUninfectiousRate =
new Input<RealParameter>("becomeUninfectiousRate", "Rate at which individuals become uninfectious (throuch recovery or sampling)");
public Input<RealParameter> samplingProportion =
new Input<RealParameter>("samplingProportion", "The samplingProportion = samplingRate / becomeUninfectiousRate", Input.Validate.XOR, samplingRate);

public Input<RealParameter> netDiversification =
new Input<RealParameter>("netDiversification", "Net diversification rate", Input.Validate.XOR, birthRate);
public Input<RealParameter> turnOver =
new Input<RealParameter>("turnOver", "Turn over rate", Input.Validate.XOR, deathRate);
// public Input<RealParameter> samplingProportion =
// new Input<RealParameter>("samplingProportion", "Sampling proportion", Input.Validate.XOR, samplingRate);
new Input<RealParameter>("samplingProportion", "The samplingProportion = samplingRate / becomeUninfectiousRate");

public Input<RealParameter> netDiversification = new Input<RealParameter>("netDiversification", "Net diversification rate");
public Input<RealParameter> turnOver = new Input<RealParameter>("turnOver", "Turn over rate");

public Input<Boolean> forceRateChange =
new Input<Boolean>("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);
Expand Down

0 comments on commit 8ee4cd5

Please sign in to comment.