bella-companion 0.0.28__tar.gz → 0.0.30__tar.gz

{bella_companion-0.0.28 → bella_companion-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bella-companion
-Version: 0.0.28
+Version: 0.0.30
 Summary: 
 Author: gabriele-marino
 Author-email: gabmarino.8601@gmail.com

bella_companion-0.0.30/bella_companion/eucovid/beast_configs/GLM.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<beast
+    namespace="
+        :beast.base.evolution
+        :beast.base.evolution.alignment
+        :beast.base.evolution.branchratemodel
+        :beast.base.evolution.likelihood
+        :beast.base.evolution.operator
+        :beast.base.evolution.operator.kernel
+        :beast.base.evolution.sitemodel
+        :beast.base.evolution.substitutionmodel
+        :beast.base.evolution.tree
+        :beast.base.evolution.tree.coalescent
+        :beast.base.inference
+        :beast.base.inference.parameter
+        :beast.base.inference.operator.kernel
+        :bdmmprime.distribution
+        :bdmmprime.mapping
+        :bdmmprime.trajectories
+        :bdmmprime.parameterization
+        :bdmmprime.util
+        :bdmmprime.util.operators
+        :bdmmprime.util.priors
+        :feast.fileio"
+    version="2.7"
+>
+    <map name="Uniform">beast.base.inference.distribution.Uniform</map>
+    <map name="Exponential">beast.base.inference.distribution.Exponential</map>
+    <map name="LogNormal">beast.base.inference.distribution.LogNormalDistributionModel</map>
+    <map name="Normal">beast.base.inference.distribution.Normal</map>
+    <map name="prior">beast.base.inference.distribution.Prior</map>
+    <map name="AlignmentFromFasta">feast.fileio.AlignmentFromFasta</map>
+    <map name="TaxonSet">beast.base.evolution.alignment.TaxonSet</map>
+    <map name="TraitSetFromTaxonSet">feast.fileio.TraitSetFromTaxonSet</map>
+    <map name="TypeSet">bdmmprime.parameterization.TypeSet</map>
+    <map name="TypeMappedTree">bdmmprime.mapping.TypeMappedTree</map>
+
+    <AlignmentFromFasta id="alignment" fileName="$(msa_file)"/>
+    <TaxonSet id="taxonSet" alignment="@alignment"/>
+    <TraitSetFromTaxonSet id="typeTraitSet" traitname="type" delimiter="|" takeGroup="1" taxa="@taxonSet"/>
+    <TypeSet id="typeSet" typeTraitSet="@typeTraitSet"/>
+    <TraitSetFromTaxonSet id="dateTrait" traitname="date" dateFormat="yyyy-M-dd" delimiter="|" everythingAfterLast="true" taxa="@taxonSet"/>
+    <TypeMappedTree id="typeMappedTree" bdmmDistrib="@BDMMPrime" startTypePriorProbs="@startTypePriorProbs" mapOnInit="false" remapOnLog="true" typeLabel="type" typeTraitSet="@typeTraitSet" untypedTree="@tree"/>
+
+    <run spec="MCMC" chainLength="10000000">
+        <state id="state" spec="State">
+            <stateNode id="tree" spec="RandomTree" taxa="@alignment" trait="@dateTrait">
+                <populationModel spec="ConstantPopulation" popSize="0.1"/>
+            </stateNode>
+            <stateNode id="Re" spec="RealParameter" value="1.0 1.1 1.2 1.3 1.4 1.01 1.1 1.2 1.3 1.4"/>
+            <stateNode id="samplingProportion" spec="RealParameter" value="1.11E-5 1.2E-5 1.3E-5 1.4E-5 1.5E-5 1.1E-5 1.2E-5 1.3E-5 1.4E-5 1.5E-5 0.0 0.0 0.0 0.0 0.0"/>
+            <stateNode id="migrationRateW" spec="RealParameter" value="0"/>
+            <stateNode id="migrationRateScaler" spec="RealParameter" value="0.1"/>
+            <stateNode id="processLength" spec="RealParameter" value="10.0"/>
+            <stateNode id="gammaShape" spec="RealParameter" value="1.0"/>
+            <stateNode id="kappa" spec="RealParameter" value="2.0"/>
+        </state>
+    
+        <distribution id="posterior" spec="CompoundDistribution">
+            <distribution id="likelihood" spec="CompoundDistribution" useThreads="true">
+                <distribution id="treeLikelihood" spec="ThreadedTreeLikelihood" data="@alignment" tree="@tree">
+                    <siteModel spec="SiteModel" gammaCategoryCount="4" shape="@gammaShape" mutationRate="1.0">
+                        <substModel spec="HKY" kappa="@kappa">
+                            <frequencies spec="Frequencies" data="@alignment"/>
+                        </substModel>
+                    </siteModel>
+                    <branchRateModel spec="StrictClockModel" clock.rate="8.0E-4"/>
+                </distribution>
+            </distribution>
+
+            <distribution id="prior" spec="CompoundDistribution">
+                <distribution id="BDMMPrime" spec="BirthDeathMigrationDistribution" tree="@tree" conditionOnSurvival="true" typeTraitSet="@typeTraitSet">
+                    <parameterization id="EpiBDMMPrimeParameterization" spec="EpiParameterization" processLength="@processLength" typeSet="@typeSet">
+                        <Re id="ReSP" spec="SkylineVectorParameter" skylineValues="@Re" changeTimes="0.123" timesAreAges="true" processLength="@processLength" typeSet="@typeSet"/>
+                        <samplingProportion id="samplingProportionSP" spec="SkylineVectorParameter" skylineValues="@samplingProportion" changeTimes="0.123 0.205" timesAreAges="true" processLength="@processLength" typeSet="@typeSet"/>
+                        <becomeUninfectiousRate spec="SkylineVectorParameter" skylineValues="36.5" typeSet="@typeSet"/>
+                        <migrationRate id="migrationRateSP" spec="SkylineMatrixParameter" timesAreAges="true" processLength="@processLength" typeSet="@typeSet">
+                            <skylineValues spec="glmprior.util.GLMLogLinear" coefficients="@migrationRateW" scaleFactor="@migrationRateScaler" transform="false">
+                                <plate var="predictorFile" range="$(predictorFiles)">
+                                    <predictor spec="RealParameterFromXSV" fileName="$(predictorFile)"/>
+                                </plate>
+                                <indicators spec="BooleanParameter" value="1"/>
+                            </skylineValues>
+                            <changeTimes spec="RealParameterFromXSV" fileName="$(changeTimesFile)"/>
+                        </migrationRate> 
+                        <removalProb spec="SkylineVectorParameter" skylineValues="1.0" typeSet="@typeSet"/>
+                    </parameterization>
+                    <startTypePriorProbs id="startTypePriorProbs" spec="RealParameter" value="1.0 0.0 0.0 0.0 0.0"/>
+                </distribution>
+
+                <prior name="distribution" x="@processLength">
+                    <LogNormal name="distr" M="-1.0" S="0.2"/>
+                </prior>
+                <distribution spec="SmartZeroExcludingPrior" x="@Re">
+                    <LogNormal name="distr" M="0.8" S="0.5"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.2E-5 1.3E-5 1.4E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.15"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.3E-5 1.4E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.093"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.2E-5 1.4E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.10"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.2E-5 1.3E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.005"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.2E-5 1.3E-5 1.4E-5">
+                    <Uniform name="distr" lower="0" upper="0.057"/>
+                </distribution>
+                <prior name="distribution" x="@migrationRateW">
+                    <Normal name="distr" mean="0.0" sigma="1.0"/>
+                </prior>
+                <prior name="distribution" x="@migrationRateScaler">
+                    <LogNormal name="distr" M="0.0" S="0.8"/>
+                </prior>
+                <prior name="distribution" x="@gammaShape">
+                    <Exponential name="distr" mean="0.5"/>
+                </prior>
+                <prior id="KappaPrior" name="distribution" x="@kappa">
+                    <LogNormal name="distr" M="1.0" S="1.25"/>
+                </prior>
+            </distribution>
+        </distribution>
+
+        <operator spec="BactrianScaleOperator" tree="@tree" rootOnly="true" scaleFactor="0.25"  weight="5.0"/>
+        <operator spec="BactrianNodeOperator" tree="@tree" weight="30.0"/>
+        <operator spec="BactrianSubtreeSlide" tree="@tree" weight="15.0"/>
+        <operator spec="Exchange" tree="@tree" weight="15.0"/>
+        <operator spec="Exchange" tree="@tree" isNarrow="false" weight="3.0"/>
+        <operator spec="WilsonBalding" tree="@tree" weight="3.0"/>
+        <operator spec="EpochFlexOperator" tree="@tree" scaleFactor="0.1" weight="2.0"/>
+        <operator spec="EpochFlexOperator" tree="@tree" fromOldestTipOnly="false" scaleFactor="0.1" weight="2.0"/>
+        <operator spec="TreeStretchOperator" tree="@tree" scaleFactor="0.01" weight="2.0"/>
+        <operator spec="BactrianScaleOperator" parameter="@processLength" scaleFactor="0.25" weight="3.0"/>
+        <operator spec="SmartScaleOperator" parameter="@Re" scaleFactor="0.25" weight="10.0"/>
+        <operator spec="SmartScaleOperator" parameter="@samplingProportion" weight="3.0"/>
+        <operator spec="BactrianRandomWalkOperator" parameter="@migrationRateW" weight="5.0" scaleFactor="0.1"/>
+        <operator spec="AdaptableVarianceMultivariateNormalOperator" weight="5.0" coefficient="1.0" scaleFactor="0.5" beta="0.05" initial="800" burnin="400" every="1"> 
+            <transformations spec="Transform$NoTransform" f="@migrationRateW"/>
+        </operator>
+        <operator spec="BactrianScaleOperator" parameter="@gammaShape" weight="1.0"/>
+        <operator spec="BactrianScaleOperator" parameter="@kappa" weight="1.0"/>
+
+        <logger spec="Logger" fileName="MCMC.log" logEvery="1000" model="@posterior" sanitiseHeaders="true" sort="smart">
+            <log idref="posterior"/>
+            <log idref="likelihood"/>
+            <log idref="prior"/>
+            <log idref="BDMMPrime"/>
+            <log idref="gammaShape"/>
+            <log idref="kappa"/>
+            <log idref="processLength"/>
+            <log idref="ReSP"/>
+            <log idref="samplingProportionSP"/>
+            <log idref="migrationRateSP"/>
+            <log idref="migrationRateW"/>
+            <log idref="migrationRateScaler"/>
+        </logger>
+        <logger spec="Logger" fileName="typedTrees.trees" logEvery="10000" mode="tree">
+            <log idref="typeMappedTree"/>
+        </logger>
+        <logger spec="Logger" fileName="TypedNodeTrees.trees" logEvery="10000" mode="tree">
+            <log spec="TypedNodeTreeLogger" typedTree="@typeMappedTree"/>
+        </logger>
+        <logger spec="Logger" fileName="trajectories.csv" logEvery="10000">
+            <log spec="SampledTrajectory" bdmmDistrib="@BDMMPrime" startTypePriorProbs="@startTypePriorProbs" typeMappedTree="@typeMappedTree" useTauLeaping="true"/>
+        </logger>
+    </run>
+</beast>

bella_companion-0.0.30/bella_companion/eucovid/beast_configs/MLP.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<beast
+    namespace="
+        :beast.base.evolution
+        :beast.base.evolution.alignment
+        :beast.base.evolution.branchratemodel
+        :beast.base.evolution.likelihood
+        :beast.base.evolution.operator
+        :beast.base.evolution.operator.kernel
+        :beast.base.evolution.sitemodel
+        :beast.base.evolution.substitutionmodel
+        :beast.base.evolution.tree
+        :beast.base.evolution.tree.coalescent
+        :beast.base.inference
+        :beast.base.inference.parameter
+        :beast.base.inference.operator.kernel
+        :bdmmprime.distribution
+        :bdmmprime.mapping
+        :bdmmprime.trajectories
+        :bdmmprime.parameterization
+        :bdmmprime.util
+        :bdmmprime.util.operators
+        :bdmmprime.util.priors
+        :feast.fileio"
+    version="2.7"
+>
+    <map name="Uniform">beast.base.inference.distribution.Uniform</map>
+    <map name="Exponential">beast.base.inference.distribution.Exponential</map>
+    <map name="LogNormal">beast.base.inference.distribution.LogNormalDistributionModel</map>
+    <map name="Normal">beast.base.inference.distribution.Normal</map>
+    <map name="prior">beast.base.inference.distribution.Prior</map>
+    <map name="AlignmentFromFasta">feast.fileio.AlignmentFromFasta</map>
+    <map name="TaxonSet">beast.base.evolution.alignment.TaxonSet</map>
+    <map name="TraitSetFromTaxonSet">feast.fileio.TraitSetFromTaxonSet</map>
+    <map name="TypeSet">bdmmprime.parameterization.TypeSet</map>
+    <map name="TypeMappedTree">bdmmprime.mapping.TypeMappedTree</map>
+
+    <AlignmentFromFasta id="alignment" fileName="$(msa_file)"/>
+    <TaxonSet id="taxonSet" alignment="@alignment"/>
+    <TraitSetFromTaxonSet id="typeTraitSet" traitname="type" delimiter="|" takeGroup="1" taxa="@taxonSet"/>
+    <TypeSet id="typeSet" typeTraitSet="@typeTraitSet"/>
+    <TraitSetFromTaxonSet id="dateTrait" traitname="date" dateFormat="yyyy-M-dd" delimiter="|" everythingAfterLast="true" taxa="@taxonSet"/>
+    <TypeMappedTree id="typeMappedTree" bdmmDistrib="@BDMMPrime" startTypePriorProbs="@startTypePriorProbs" mapOnInit="false" remapOnLog="true" typeLabel="type" typeTraitSet="@typeTraitSet" untypedTree="@tree"/>
+
+    <run spec="MCMC" chainLength="10000000">
+        <state id="state" spec="State">
+            <stateNode id="tree" spec="RandomTree" taxa="@alignment" trait="@dateTrait">
+                <populationModel spec="ConstantPopulation" popSize="0.1"/>
+            </stateNode>
+            <stateNode id="Re" spec="RealParameter" value="1.0 1.1 1.2 1.3 1.4 1.01 1.1 1.2 1.3 1.4"/>
+            <stateNode id="samplingProportion" spec="RealParameter" value="1.11E-5 1.2E-5 1.3E-5 1.4E-5 1.5E-5 1.1E-5 1.2E-5 1.3E-5 1.4E-5 1.5E-5 0.0 0.0 0.0 0.0 0.0"/>
+            <plate var="n" range="$(layersRange)">
+                <stateNode spec="RealParameter" id="migrationRateW$(n)" value="0"/>
+            </plate>
+            <stateNode id="processLength" spec="RealParameter" value="10.0"/>
+            <stateNode id="gammaShape" spec="RealParameter" value="1.0"/>
+            <stateNode id="kappa" spec="RealParameter" value="2.0"/>
+        </state>
+    
+        <distribution id="posterior" spec="CompoundDistribution">
+            <distribution id="likelihood" spec="CompoundDistribution" useThreads="true">
+                <distribution id="treeLikelihood" spec="ThreadedTreeLikelihood" data="@alignment" tree="@tree">
+                    <siteModel spec="SiteModel" gammaCategoryCount="4" shape="@gammaShape" mutationRate="1.0">
+                        <substModel spec="HKY" kappa="@kappa">
+                            <frequencies spec="Frequencies" data="@alignment"/>
+                        </substModel>
+                    </siteModel>
+                    <branchRateModel spec="StrictClockModel" clock.rate="8.0E-4"/>
+                </distribution>
+            </distribution>
+
+            <distribution id="prior" spec="CompoundDistribution">
+                <distribution id="BDMMPrime" spec="BirthDeathMigrationDistribution" tree="@tree" conditionOnSurvival="true" typeTraitSet="@typeTraitSet">
+                    <parameterization id="EpiBDMMPrimeParameterization" spec="EpiParameterization" processLength="@processLength" typeSet="@typeSet">
+                        <Re id="ReSP" spec="SkylineVectorParameter" skylineValues="@Re" changeTimes="0.123" timesAreAges="true" processLength="@processLength" typeSet="@typeSet" />
+                        <samplingProportion id="samplingProportionSP" spec="SkylineVectorParameter" skylineValues="@samplingProportion" changeTimes="0.123 0.205" timesAreAges="true" processLength="@processLength" typeSet="@typeSet"/>
+                        <becomeUninfectiousRate spec="SkylineVectorParameter" skylineValues="36.5" typeSet="@typeSet"/>
+                        <migrationRate id="migrationRateSP" spec="SkylineMatrixParameter" timesAreAges="true" processLength="@processLength" typeSet="@typeSet">
+                            <skylineValues id="migrationRate" spec="bella.BayesMLP" nodes="$(nodes)">
+                                <plate var="predictorFile" range="$(predictorFiles)">
+                                    <predictor spec="RealParameterFromXSV" fileName="$(predictorFile)"/>
+                                </plate>
+                                <plate var="n" range="$(layersRange)">
+                                    <weights idref="migrationRateW$(n)"/>
+                                </plate>
+                            </skylineValues>
+                            <changeTimes spec="RealParameterFromXSV" fileName="$(changeTimesFile)"/>
+                        </migrationRate> 
+                        <removalProb spec="SkylineVectorParameter" skylineValues="1.0" typeSet="@typeSet"/>
+                    </parameterization>
+                    <startTypePriorProbs id="startTypePriorProbs" spec="RealParameter" value="1.0 0.0 0.0 0.0 0.0"/>
+                </distribution>
+
+                <prior name="distribution" x="@processLength">
+                    <LogNormal name="distr" M="-1.0" S="0.2"/>
+                </prior>
+                <distribution spec="SmartZeroExcludingPrior" x="@Re">
+                    <LogNormal name="distr" M="0.8" S="0.5"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.2E-5 1.3E-5 1.4E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.15"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.3E-5 1.4E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.093"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.2E-5 1.4E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.10"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.2E-5 1.3E-5 1.5E-5">
+                    <Uniform name="distr" lower="0" upper="0.005"/>
+                </distribution>
+                <distribution spec="SmartZeroExcludingPrior" x="@samplingProportion" classesToExclude="1.1E-5 1.2E-5 1.3E-5 1.4E-5">
+                    <Uniform name="distr" lower="0" upper="0.057"/>
+                </distribution>
+                <plate var="n" range="$(layersRange)">
+                    <prior name="distribution" x="@migrationRateW$(n)">
+                        <Normal name="distr" mean="0.0" sigma="1.0"/>
+                    </prior>
+                </plate>
+                <prior name="distribution" x="@gammaShape">
+                    <Exponential name="distr" mean="0.5"/>
+                </prior>
+                <prior id="KappaPrior" name="distribution" x="@kappa">
+                    <LogNormal name="distr" M="1.0" S="1.25"/>
+                </prior>
+            </distribution>
+        </distribution>
+
+        <operator spec="BactrianScaleOperator" tree="@tree" rootOnly="true" scaleFactor="0.25"  weight="5.0"/>
+        <operator spec="BactrianNodeOperator" tree="@tree" weight="30.0"/>
+        <operator spec="BactrianSubtreeSlide" tree="@tree" weight="15.0"/>
+        <operator spec="Exchange" tree="@tree" weight="15.0"/>
+        <operator spec="Exchange" tree="@tree" isNarrow="false" weight="3.0"/>
+        <operator spec="WilsonBalding" tree="@tree" weight="3.0"/>
+        <operator spec="EpochFlexOperator" tree="@tree" scaleFactor="0.1" weight="2.0"/>
+        <operator spec="EpochFlexOperator" tree="@tree" fromOldestTipOnly="false" scaleFactor="0.1" weight="2.0"/>
+        <operator spec="TreeStretchOperator" tree="@tree" scaleFactor="0.01" weight="2.0"/>
+        <operator spec="BactrianScaleOperator" parameter="@processLength" scaleFactor="0.25" weight="3.0"/>
+        <operator spec="SmartScaleOperator" parameter="@Re" scaleFactor="0.25" weight="10.0"/>
+        <operator spec="SmartScaleOperator" parameter="@samplingProportion" weight="3.0"/>
+        <plate var="n" range="$(layersRange)">
+            <operator spec="BactrianRandomWalkOperator" parameter="@migrationRateW$(n)" weight="5.0"/>
+        </plate>
+        <operator spec="BactrianScaleOperator" parameter="@gammaShape" weight="1.0"/>
+        <operator spec="BactrianScaleOperator" parameter="@kappa" weight="1.0"/>
+
+        <logger spec="Logger" fileName="MCMC.log" logEvery="1000" model="@posterior" sanitiseHeaders="true" sort="smart">
+            <log idref="posterior"/>
+            <log idref="likelihood"/>
+            <log idref="prior"/>
+            <log idref="BDMMPrime"/>
+            <log idref="gammaShape"/>
+            <log idref="kappa"/>
+            <log idref="processLength"/>
+            <log idref="ReSP"/>
+            <log idref="samplingProportionSP"/>
+            <log idref="migrationRateSP"/>
+            <log idref="migrationRate"/>
+        </logger>
+        <logger spec="Logger" fileName="typedTrees.trees" logEvery="100000" mode="tree">
+            <log idref="typeMappedTree"/>
+        </logger>
+        <logger spec="Logger" fileName="TypedNodeTrees.trees" logEvery="100000" mode="tree">
+            <log spec="TypedNodeTreeLogger" typedTree="@typeMappedTree"/>
+        </logger>
+        <logger spec="Logger" fileName="trajectories.csv" logEvery="100000">
+            <log spec="SampledTrajectory" bdmmDistrib="@BDMMPrime" startTypePriorProbs="@startTypePriorProbs" typeMappedTree="@typeMappedTree" useTauLeaping="true"/>
+        </logger>
+    </run>
+</beast>

{bella_companion-0.0.28 → bella_companion-0.0.30}/bella_companion/eucovid/run_beast.py

@@ -1,4 +1,3 @@
-import json
 import os
 from glob import glob
 from pathlib import Path
@@ -21,23 +20,21 @@ def run_beast():
     all_predictor_files = ",".join(glob(str(predictors_dir / "all" / "*.tsv")))
     all_predictors_data = " ".join(
         [
-            f"-D aligned_fasta={msa_file}",
-            f"-D GLMpredictor_changetimes={predictors_dir / 'changetimes_all_7e.tsv'}",
-            f"-D GLMpredictor_files={all_predictor_files}",
+            f"-D msa_file={msa_file}",
+            f"-D changeTimesFile={predictors_dir / 'changetimes_all_7e.tsv'}",
+            f"-D predictorFiles={all_predictor_files}",
         ]
     )
     flight_predictor_data = " ".join(
         [
-            f"-D aligned_fasta={msa_file}",
-            f"-D GLMpredictor_changetimes={predictors_dir / 'changetimes_flights_4e.tsv'}",
-            f"-D GLMpredictor_files={predictors_dir / 'flight_pop_x_4e_ls.tsv'}",
+            f"-D msa_file={msa_file}",
+            f"-D changeTimesFile={predictors_dir / 'changetimes_flights_4e.tsv'}",
+            f"-D predictorFiles={predictors_dir / 'flight_pop_x_4e_ls.tsv'}",
         ]
     )
 
-    job_ids = {}
-
     os.makedirs(output_dir / "Nonparametric", exist_ok=True)
-    job_ids["Nonparametric"] = submit_job(
+    submit_job(
         " ".join(
             [
                 os.environ["BELLA_RUN_BEAST_CMD"],
@@ -52,7 +49,7 @@ def run_beast():
     )
 
     os.makedirs(output_dir / "all-predictors-GLM", exist_ok=True)
-    job_ids["all-predictors-GLM"] = submit_job(
+    submit_job(
         " ".join(
             [
                 os.environ["BELLA_RUN_BEAST_CMD"],
@@ -67,7 +64,7 @@ def run_beast():
     )
 
     os.makedirs(output_dir / "flights-GLM", exist_ok=True)
-    job_ids["flights-GLM"] = submit_job(
+    submit_job(
         " ".join(
             [
                 os.environ["BELLA_RUN_BEAST_CMD"],
@@ -82,7 +79,7 @@ def run_beast():
     )
 
     os.makedirs(output_dir / "all-predictors-MLP", exist_ok=True)
-    job_ids["all-predictors-MLP"] = submit_job(
+    submit_job(
         " ".join(
             [
                 os.environ["BELLA_RUN_BEAST_CMD"],
@@ -98,7 +95,7 @@ def run_beast():
     )
 
     os.makedirs(output_dir / "flights-MLP", exist_ok=True)
-    job_ids["flights-MLP"] = submit_job(
+    submit_job(
         " ".join(
             [
                 os.environ["BELLA_RUN_BEAST_CMD"],
@@ -112,6 +109,3 @@ def run_beast():
         cpus=128,
         mem_per_cpu=12000,
     )
-
-    with open(base_output_dir / "eucovid_job_ids.json", "w") as f:
-        json.dump(job_ids, f)

{bella_companion-0.0.28 → bella_companion-0.0.30}/bella_companion/platyrrhine/beast_config.xml

@@ -36,8 +36,8 @@
     <run spec="MCMC" chainLength="10000000">
         <state id="state">
             <plate var="n" range="$(layersRange)">
-                <stateNode spec="RealParameter" name="stateNode" id="birthRateW$(n)" value="0"/>
-                <stateNode spec="RealParameter" name="stateNode" id="deathRateW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="birthRateW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="deathRateW$(n)" value="0"/>
             </plate>
             <stateNode spec="RealParameter" id="samplingRate" value="$(samplingRateInit)"/>
             <stateNode spec="RealParameter" id="migrationRate" value="$(migrationRateInit)"/>

{bella_companion-0.0.28 → bella_companion-0.0.30}/bella_companion/platyrrhine/run_beast.py

@@ -1,4 +1,3 @@
-import json
 import os
 from pathlib import Path
 
@@ -33,8 +32,9 @@ def run_beast():
     time_predictor = " ".join(list(map(str, np.repeat(time_bins, len(types)))))
     log10BM_predictor = " ".join(types * T)
 
-    job_ids = {}
-    for i, tree in enumerate(tqdm(trees)):
+    for i, tree in enumerate(
+        tqdm(trees, desc="Submitting BEAST jobs for platyrrhine datasets")
+    ):
         process_length = max(get_node_depths(tree).values())
         command = " ".join(
             [
@@ -62,11 +62,8 @@ def run_beast():
                 str(Path(__file__).parent / "beast_config.xml"),
             ]
         )
-        job_ids[i] = submit_job(
+        submit_job(
             command,
             Path(os.environ["BELLA_SBATCH_LOG_DIR"]) / "platyrrhine" / str(i),
             mem_per_cpu=12000,
         )
-
-    with open(base_output_dir / "platyrrhine_job_ids.json", "w") as f:
-        json.dump(job_ids, f)

{bella_companion-0.0.28 → bella_companion-0.0.30}/bella_companion/simulations/beast_configs/epi-multitype/MLP.xml

@@ -31,7 +31,7 @@
     <run spec="MCMC" chainLength="10000000">
         <state id="state">
             <plate var="n" range="$(layersRange)">
-                <stateNode spec="RealParameter" name="stateNode" id="migrationRateW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="migrationRateW$(n)" value="0"/>
             </plate>
         </state>
 

{bella_companion-0.0.28 → bella_companion-0.0.30}/bella_companion/simulations/beast_configs/epi-skyline/MLP.xml

@@ -25,7 +25,7 @@
     <run spec="MCMC" chainLength="10000000">
         <state id="state">
             <plate var="n" range="$(layersRange)">
-                <stateNode spec="RealParameter" name="stateNode" id="reproductionNumberW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="reproductionNumberW$(n)" value="0"/>
             </plate>
         </state>
 

{bella_companion-0.0.28 → bella_companion-0.0.30}/bella_companion/simulations/beast_configs/fbd-2traits/MLP.xml

@@ -29,8 +29,8 @@
     <run spec="MCMC" chainLength="10000000">
         <state id="state">
             <plate var="n" range="$(layersRange)">
-                <stateNode spec="RealParameter" name="stateNode" id="birthRateW$(n)" value="0"/>
-                <stateNode spec="RealParameter" name="stateNode" id="deathRateW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="birthRateW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="deathRateW$(n)" value="0"/>
             </plate>
         </state>
 

{bella_companion-0.0.28 → bella_companion-0.0.30}/bella_companion/simulations/beast_configs/fbd-no-traits/MLP.xml

@@ -23,8 +23,8 @@
     <run spec="MCMC" chainLength="10000000">
         <state id="state">
             <plate var="n" range="$(layersRange)">
-                <stateNode spec="RealParameter" name="stateNode" id="birthRateW$(n)" value="0"/>
-                <stateNode spec="RealParameter" name="stateNode" id="deathRateW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="birthRateW$(n)" value="0"/>
+                <stateNode spec="RealParameter" id="deathRateW$(n)" value="0"/>
             </plate>
         </state>
 

{bella_companion-0.0.28 → bella_companion-0.0.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bella-companion"
-version = "0.0.28"
+version = "0.0.30"
 description = ""
 authors = ["gabriele-marino <gabmarino.8601@gmail.com>"]