beauti template ner operators + beauti 2.7 fig update

jordandouglas · Jul 28, 2022 · 315c9bf · 315c9bf
1 parent 2435a3c
commit 315c9bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/figs/fig1.png b/figs/fig1.png
diff --git a/figs/fig2.png b/figs/fig2.png
diff --git a/fxtemplates/OptimisedRelaxedClock.xml b/fxtemplates/OptimisedRelaxedClock.xml
@@ -138,9 +138,23 @@
 			<connect srcID='ORCAdaptableOperatorSampler_rates_internal.c:$(n)' targetID='mcmc' inputName='operator'
                      if='inlikelihood(ORCRates.c:$(n)) and ORCRates.c:$(n)/estimate=true'> Adaptive weight operator for the internal nodes and branch rates of partition c:$(n)
             </connect>
+
+
+
+			<connect srcID='ORCNER_null.c:$(n)' targetID='mcmc' inputName='operator'
+                     if='inlikelihood(Tree.t:$(n)) and Tree.t:$(n)/estimate=true and inlikelihood(ORCRates.c:$(n)) and ORCRates.c:$(n)/estimate=true'> Adaptive weight operator for the tree of partition c:$(n) (Narrow Exchange)
+            </connect>
+
+            <connect srcID='ORCNER_dAE_dBE_dCE.c:$(n)' targetID='mcmc' inputName='operator'
+                     if='inlikelihood(Tree.t:$(n)) and Tree.t:$(n)/estimate=true and inlikelihood(ORCRates.c:$(n)) and ORCRates.c:$(n)/estimate=true'> Adaptive weight operator for the tree of partition c:$(n) (Narrow Exchange Rates)
+            </connect>
+
+
+				<!--
 			<connect srcID='ORCAdaptableOperatorSampler_NER.c:$(n)' targetID='mcmc' inputName='operator'
                      if='inlikelihood(Tree.t:$(n)) and Tree.t:$(n)/estimate=true and inlikelihood(ORCRates.c:$(n)) and ORCRates.c:$(n)/estimate=true'> Adaptive weight operator for the tree of partition c:$(n) (Narrow Exchange Rates)
             </connect>
+			-->
 
 			<!-- Destroy the standard narrow exchange operator -->
 			<connect method="orc.operators.MetaNEROperator.customConnector"/>