sync beast2

BEAST2-Dev · Mar 14, 2018 · 8976244 · 8976244
1 parent 658db7a
commit 8976244
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/beast/continuous/AbstractMultivariateTraitLikelihood.java b/src/beast/continuous/AbstractMultivariateTraitLikelihood.java
@@ -542,7 +542,7 @@ public void init(PrintStream out) {
     }
 
     @Override
-    public void log(int nSample, PrintStream out) {
+    public void log(long nSample, PrintStream out) {
     	out.print(logP + "\t" + getLogDataLikelihood() + "\t");
     }
 

diff --git a/src/beast/evolution/alignment/AlignmentFromTrait.java b/src/beast/evolution/alignment/AlignmentFromTrait.java
@@ -10,7 +10,7 @@
 import beast.evolution.alignment.Alignment;
 import beast.evolution.datatype.DataType;
 import beast.evolution.tree.TraitSet;
-import beast.util.AddOnManager;
+import beast.util.PackageManager;
 
 
 
@@ -40,7 +40,7 @@ public void initAndValidate() {
 	                throw new IllegalArgumentException("data type + '" + dataTypeInput.get() + "' cannot be found. " +
 	                        "Choose one of " + Arrays.toString(types.toArray(new String[0])));
 	            }
-	            List<String> sDataTypes = AddOnManager.find(beast.evolution.datatype.DataType.class, IMPLEMENTATION_DIR);
+	            List<String> sDataTypes = PackageManager.find(beast.evolution.datatype.DataType.class, IMPLEMENTATION_DIR);
 	            for (String sDataType : sDataTypes) {
 	                DataType dataType = null;
 					try {