Handle SparseLikelihoods.

bredelings · Jan 1, 2025 · a4e24da · a4e24da
1 parent df26fd0
commit a4e24da
Showing 1 changed file with 36 additions and 6 deletions.
diff --git a/src/substitution/likelihoodSEV.cc b/src/substitution/likelihoodSEV.cc
@@ -281,7 +281,12 @@ namespace substitution
 	for(auto& lc: LCB)
 	    LC.push_back(lc);
 	for(auto& lc: LCN)
-	    LC.push_back(lc);
+	{
+	    if (auto SL = lc.to<SparseLikelihoods>())
+		LC.push_back(SL->DenseLikelihoods());
+	    else
+		LC.push_back(lc);
+	}
 
 	auto cache = [&](int i) -> auto& { return LC[i].as_<Likelihood_Cache_Branch>(); };
 
@@ -424,7 +429,12 @@ namespace substitution
 	for(auto& lc: LCB)
 	    LC.push_back(lc);
 	for(auto& lc: LCN)
-	    LC.push_back(lc);
+	{
+	    if (auto SL = lc.to<SparseLikelihoods>())
+		LC.push_back(SL->DenseLikelihoods());
+	    else
+		LC.push_back(lc);
+	}
 
 	auto cache = [&](int i) -> auto& { return LC[i].as_<Likelihood_Cache_Branch>(); };
 
@@ -786,7 +796,12 @@ namespace substitution
 	for(auto& lc: LCB)
 	    LC.push_back(lc);
 	for(auto& lc: LCN)
-	    LC.push_back(lc);
+	{
+	    if (auto SL = lc.to<SparseLikelihoods>())
+		LC.push_back(SL->DenseLikelihoods());
+	    else
+		LC.push_back(lc);
+	}
 
 	auto cache = [&](int i) -> auto& { return LC[i].as_<Likelihood_Cache_Branch>(); };
 
@@ -884,7 +899,12 @@ namespace substitution
 	for(auto& lc: LCB)
 	    LC.push_back(lc);
 	for(auto& lc: LCN)
-	    LC.push_back(lc);
+	{
+	    if (auto SL = lc.to<SparseLikelihoods>())
+		LC.push_back(SL->DenseLikelihoods());
+	    else
+		LC.push_back(lc);
+	}
 
 	auto cache = [&](int i) -> auto& { return LC[i].as_<Likelihood_Cache_Branch>(); };
 
@@ -1103,7 +1123,12 @@ namespace substitution
 	for(auto& lc: LCB)
 	    LC.push_back(lc);
 	for(auto& lc: LCN)
-	    LC.push_back(lc);
+	{
+	    if (auto SL = lc.to<SparseLikelihoods>())
+		LC.push_back(SL->DenseLikelihoods());
+	    else
+		LC.push_back(lc);
+	}
 
 	auto cache = [&](int i) -> auto& { return LC[i].as_<Likelihood_Cache_Branch>(); };
 
@@ -1177,7 +1202,12 @@ namespace substitution
 	for(auto& lc: LCB)
 	    LC.push_back(lc);
 	for(auto& lc: LCN)
-	    LC.push_back(lc);
+	{
+	    if (auto SL = lc.to<SparseLikelihoods>())
+		LC.push_back(SL->DenseLikelihoods());
+	    else
+		LC.push_back(lc);
+	}
 
 	auto cache = [&](int i) -> auto& { return LC[i].as_<Likelihood_Cache_Branch>(); };