update version

Zilong-Li · Feb 8, 2024 · 834fbfe · 834fbfe
1 parent 6dd9341
commit 834fbfe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/admixture.cpp b/src/admixture.cpp
@@ -162,24 +162,26 @@ void Admixture::protectPars()
     }
 
     if(F.isNaN().any()) cao.error("NaN in F\n");
-    if(!cF)
+    if(cF)
+    {
+        constrainF();
+    }
+    else
     {
         F = (F < clusterFreqThreshold).select(clusterFreqThreshold, F); // lower bound
         F = (F > 1 - clusterFreqThreshold).select(1 - clusterFreqThreshold, F); // upper bound
+        for(int k = 0; k < K; k++) F.middleRows(k * C, C).rowwise() /= F.middleRows(k * C, C).colwise().sum();
     }
-    constrainF();
 }
 
+// need to fix the cluster ordering
 void Admixture::constrainF()
 {
     for(int k = 0; k < K; k++)
     {
-        if(cF)
-        {
-            for(int c = 0; c < C; c++)
-                for(int g = 0; g < G; g++)
-                    if(F(k * C + c, g) < P(c, g)) F(k * C + c, g) = P(c, g);
-        }
+        for(int c = 0; c < C; c++)
+            for(int g = 0; g < G; g++)
+                if(F(k * C + c, g) < P(c, g)) F(k * C + c, g) = P(c, g);
         F.middleRows(k * C, C).rowwise() /= F.middleRows(k * C, C).colwise().sum();
     }
 }

diff --git a/src/main.cpp b/src/main.cpp
@@ -18,7 +18,7 @@ int main(int argc, char * argv[])
 {
     // ========= helper message and parameters parsing ===========================
 
-    const std::string VERSION{"0.5.0"};
+    const std::string VERSION{"0.5.1"};
 
     // below for catching ctrl+c, and dumping files
     struct sigaction sa;