Skip to content

Commit

Permalink
Minor changes to LineageSampler, updated version.
Browse files Browse the repository at this point in the history
  • Loading branch information
tgvaughan committed Jun 18, 2014
1 parent 9a6c6fa commit 219c36a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/master/postprocessors/LineageSampler.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class LineageSampler extends BEASTObject implements InheritancePostProces
new ArrayList<PopulationSize>());

public Input<Double> samplingTimeInput = new Input<Double>("samplingTime",
"Time at which sampling is to take place", -1.0);
"Time at which sampling is to take place");

public Input<String> markAnnotationInput = new Input<String>("markAnnotation",
"Mark using this annotation rather than pruning.");
Expand Down Expand Up @@ -71,8 +71,8 @@ public void initAndValidate() {
* by this method.
*
* @param itraj Inheritance trajectory object
* @param samplingTime Time at which sampling will occur (negative implies no specific time)
* @param nSamples Number of lineages to sample
* @param samplingTime Time at which sampling will occur (-1 implies no specific time)
* @param nSamples Number of lineages to sample (or -1 if not used)
* @param pSample Proportion of lineages to sample (or -1 if not used)
* @param populationSizes Lineages to sample from individual populations
* @param markAnnotation
Expand Down Expand Up @@ -417,7 +417,7 @@ private static void cleanSubGraph(Node node, boolean reverseTime, String markAnn
@Override
public void process(InheritanceTrajectory itraj) {
LineageSampler.process(itraj,
samplingTimeInput.get(),
samplingTimeInput.get() == null ? -1 : samplingTimeInput.get(),
nSamplesInput.get() == null ? -1 : nSamplesInput.get(),
sampleProbabilityInput.get() == null ? -1.0 : sampleProbabilityInput.get(),
populationSizes,
Expand Down
2 changes: 1 addition & 1 deletion version.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<addon name="MASTER" version="1.9.0">
<addon name="MASTER" version="1.10.0">
<depends on="beast2" atleast="2.1.0"/>
</addon>

0 comments on commit 219c36a

Please sign in to comment.