SSE constraints changes

willgearty · Oct 26, 2023 · 0f4f63c · 0f4f63c
1 parent 41cb4c9
commit 0f4f63c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/core/datatypes/trees/Tree.cpp b/src/core/datatypes/trees/Tree.cpp
@@ -797,7 +797,7 @@ size_t Tree::getNumberOfInteriorNodes( void ) const
 
     size_t preliminaryNumIntNodes = getNumberOfNodes() - getNumberOfTips();
 
-    if ( isRooted() )
+    if ( preliminaryNumIntNodes > 1 )
     {
 	if (preliminaryNumIntNodes > 1)
 	    return preliminaryNumIntNodes - 1;
@@ -806,7 +806,7 @@ size_t Tree::getNumberOfInteriorNodes( void ) const
     }
     else
     {
-        return preliminaryNumIntNodes;
+        return 0;
     }
 
 }

diff --git a/...hylogenetics/tree/birthdeath/GeneralizedLineageHeterogeneousBirthDeathSamplingProcess.cpp b/...hylogenetics/tree/birthdeath/GeneralizedLineageHeterogeneousBirthDeathSamplingProcess.cpp
@@ -1117,9 +1117,11 @@ std::vector<double> GeneralizedLineageHeterogeneousBirthDeathSamplingProcess::si
     {
     	// get the age of the tip
     	double a = taxa[i + 1].getAge();
+        double min_age_tax = taxa[i + 1].getAgeRange().getMin();
+		double max_age_tax = taxa[i + 1].getAgeRange().getMax();
 
     	// simulate the age of a node
-    	double new_age = a + rng->uniform01() * (max_age - a);
+    	double new_age = min_age_tax + rng->uniform01() * (max_age_tax - min_age_tax);
 
     	//add the age to the vector of ages
     	ages.push_back(new_age);