Skip to content

Commit 0162914

Browse files
committed
version v1.0.0
1 parent 75ef5ca commit 0162914

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<property name="srcBeast2" location="${beast2path}/src" />
1919
<property name="beast2classpath" location="${beast2path}/build" />
2020
<property name="Add_on_dir" value="${release_dir}/add-on" />
21-
<property name="version" value="0.1.0" />
21+
<property name="version" value="1.0.0" />
2222

2323
<property name="buildMODEL_SELECTION" location="../model-selection/build"/>
2424
<property name="buildBEAST_LABS" location="../BEASTLabs/build"/>
@@ -31,6 +31,7 @@
3131

3232
<path id="classpath">
3333
<pathelement path="${buildNS}"/>
34+
<fileset dir="${libBeast2}" includes="antlr-runtime-4.7.jar"/>
3435
<fileset dir="${libBeast2}" includes="junit-4.8.2.jar"/>
3536
<fileset dir="${libBeast2}" includes="beagle.jar"/>
3637
<fileset dir="${libBeast2}" includes="jam.jar"/>

src/beast/core/NSLogger.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import beast.core.Logger;
1111
import beast.util.XMLProducer;
1212

13+
@Description("Trace logger that logs NSLikelihood as second column (used by NSLogAnalyser to prodoce posterior sample)")
1314
public class NSLogger extends Logger {
1415

1516
@Override

src/beast/gss/NS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*/
4848

4949
@Description("Nested sampling for phylogenetics")
50-
@Citation("Patricio Maturana, Brendon J. Brewer, Steffen Klaere, Remco Bouckaert. Model selection and parameter inference in phylogenetics using Nested Sampling. arXiv:1703.05471v3")
50+
@Citation("Patricio Maturana, Brendon J. Brewer, Steffen Klaere, Remco Bouckaert. Model selection and parameter inference in phylogenetics using Nested Sampling. Systematic Biology, In Press 2018")
5151
public class NS extends MCMC {
5252
final static int SAMPLE_COUNT = 100;
5353

src/beast/gss/NSThread.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11

22
package beast.gss;
33

4+
45
import java.io.IOException;
56
import java.util.Map;
67
import java.util.concurrent.CountDownLatch;
78

9+
import beast.core.Description;
810
import beast.core.Distribution;
911
import beast.util.Randomizer;
1012

11-
/** class for performing a one-threaded NS as part of MultiThreadedNS */
13+
@Description("class for performing a one-threaded NS as part of MultiThreadedNS")
1214
public class NSThread extends NS {
1315
CountDownLatch countDown;
1416
Map<String, Double> particlePool;

version.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<package name='NS' version='0.1.0'>
1+
<package name='NS' version='1.0.0'>
22
<depends on='beast2' atleast='2.5.0'/>
3+
<depends on='BEASTLabs' atleast='1.8.0'/>
4+
<depends on='MODEL_SELECTION' atleast='1.4.1'/>
35

46
<packageapp description="Nested Sampling Log Analyser"
57
class="beast.util.NSLogAnalyser"

0 commit comments

Comments
 (0)