Skip to content

Commit dc6057f

Browse files
committed
Migrate to beast3 spec types
- AscertainedForParsimonyUninformativeFilteredAlignment now extends beast.base.spec.evolution.alignment.FilteredAlignment (the legacy parent is @deprecated). All inherited ascertainment members come through the unchanged Alignment base, so no other code changes needed. - fxtemplates/morph-models.xml: switch RandomTree and FilteredAlignment spec= refs to their beast.base.spec.* equivalents; replace the legacy parameter.RealParameter popSize declaration with RealScalarParam + domain="PositiveReal".
1 parent db64781 commit dc6057f

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/main/java/morphmodels/evolution/alignment/AscertainedForParsimonyUninformativeFilteredAlignment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package morphmodels.evolution.alignment;
22

33
import beast.base.core.Input;
4-
import beast.base.evolution.alignment.FilteredAlignment;
4+
import beast.base.spec.evolution.alignment.FilteredAlignment;
55

66
import java.util.HashSet;
77
import java.util.Set;

src/main/resources/morph.models/fxtemplates/morph-models.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<taxonset id='TaxonSet.$(n)' spec='beast.base.evolution.alignment.TaxonSet' alignment='@$(n)' />
1717
<plugin spec='beast.base.evolution.tree.Tree' id='Tree.t:$(n)' taxonset='@TaxonSet.$(n)'/>
1818
19-
<plugin spec='beast.base.evolution.tree.coalescent.RandomTree' id='RandomTree.t:$(n)' estimate='false' initial='@Tree.t:$(n)'>
19+
<plugin spec='beast.base.spec.evolution.tree.coalescent.RandomTree' id='RandomTree.t:$(n)' estimate='false' initial='@Tree.t:$(n)'>
2020
<taxa idref='data'/>
2121
<populationModel id='ConstantPopulation0.t:$(n)' spec='ConstantPopulation'>
22-
<popSize id='randomPopSize.t:$(n)' spec='parameter.RealParameter' value='1'/>
22+
<popSize id='randomPopSize.t:$(n)' spec='beast.base.spec.inference.parameter.RealScalarParam' domain="PositiveReal" value='1'/>
2323
</populationModel>
2424
</plugin>
2525
@@ -30,7 +30,7 @@
3030
</logger>
3131
3232
<distribution id="morphTreeLikelihood.$(n)" spec='beast.base.spec.evolution.likelihood.TreeLikelihood' tree='@Tree.t:$(n)'>
33-
<data spec="beast.base.evolution.alignment.FilteredAlignment" id='$(n)' filter="0-end">
33+
<data spec="beast.base.spec.evolution.alignment.FilteredAlignment" id='$(n)' filter="0-end">
3434
<userDataType spec='beast.base.evolution.datatype.StandardData' id='morphDataType.$(n)' />
3535
</data>
3636
<siteModel spec='beast.base.spec.evolution.sitemodel.SiteModel' id="SiteModel.s:$(n)" gammaCategoryCount='0'>

0 commit comments

Comments
 (0)