Allow more parents in experimental chimeras_denovo command

torognes · Oct 26, 2023 · 5dea255 · 5dea255 · frederic-mahe · Oct 26, 2023
1 parent 2f37815
commit 5dea255
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/chimera.cc b/src/chimera.cc
@@ -73,7 +73,6 @@
 /* global constants/data, no need for synchronization */
 static int parts = 0;
 const int maxparts = 100;
-const int maxparents = 4; /* max, could be fewer */
 const int window = 64;
 const int few = 4;
 const int maxcandidates = few * maxparts;

diff --git a/src/chimera.h b/src/chimera.h
@@ -58,4 +58,6 @@
 
 */
 
+const int maxparents = 20; /* max, could be fewer */
+
 void chimera();
diff --git a/src/vsearch.cc b/src/vsearch.cc
@@ -4775,9 +4775,11 @@ void args_init(int argc, char **argv)
       fatal("The argument to chimeras_length_min must be at least 1");
     }
 
-  if ((opt_chimeras_parents_max < 2) || (opt_chimeras_parents_max > 4))
+  if ((opt_chimeras_parents_max < 2) || (opt_chimeras_parents_max > maxparents))
     {
-      fatal("The argument to chimeras_parents_max must be in the range 2 to 4");
+      char maxparents_string[25];
+      snprintf(maxparents_string, 25, "%d", maxparents);
+      fatal("The argument to chimeras_parents_max must be in the range 2 to %s.\n", maxparents_string);
     }
 
   if (options_selected[option_chimeras_parts] &&
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,4 +58,6 @@

		*/

		const int maxparents = 20; /* max, could be fewer */

		void chimera();