final per-task counts for sorting

MesserLab · Aug 12, 2023 · 7213886 · 7213886
1 parent 164fcba
commit 7213886
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/EidosScribe/EidosHelpFunctions.rtf b/EidosScribe/EidosHelpFunctions.rtf
@@ -5958,6 +5958,7 @@ The task keys recognized, and the tasks they govern, are:\
 \f1\fs18 \uc0\u8232 "RUNIF_3"	runif()
 \f3\fs20  other cases
 \f1\fs18 \
+"SORT_INT"	sort(integer x)\uc0\u8232 "SORT_FLOAT"	sort(float x)\u8232 "SORT_STRING"	sort(string x)\
 "CLIPPEDINTEGRAL_1S"	clippedIntegral()
 \f3\fs20  for 
 \f1\fs18 "x"

diff --git a/QtSLiM/help/EidosHelpFunctions.html b/QtSLiM/help/EidosHelpFunctions.html
@@ -551,6 +551,9 @@
 "RUNIF_1"<span class="Apple-tab-span">	</span>runif(numeric$ min = 0, numeric$ max = 1)<br>
 "RUNIF_2"<span class="Apple-tab-span">	</span>runif(numeric$ min, numeric$ max)<span class="s19"> other cases</span><br>
 "RUNIF_3"<span class="Apple-tab-span">	</span>runif()<span class="s19"> other cases</span></p>
+<p class="p10">"SORT_INT"<span class="Apple-tab-span">	</span>sort(integer x)<br>
+"SORT_FLOAT"<span class="Apple-tab-span">	</span>sort(float x)<br>
+"SORT_STRING"<span class="Apple-tab-span">	</span>sort(string x)</p>
 <p class="p10">"CLIPPEDINTEGRAL_1S"<span class="Apple-tab-span">	</span>clippedIntegral()<span class="s19"> for </span>"x"<span class="s19">, </span>"y"<span class="s19">, </span>"z"<br>
 "CLIPPEDINTEGRAL_2S"<span class="Apple-tab-span">	</span>clippedIntegral()<span class="s19"> for </span>"xy"<span class="s19">, </span>"xz"<span class="s19">, </span>"yz"<br>
 "DRAWBYSTRENGTH"<span class="Apple-tab-span">	</span>drawByStrength(returnDict=T)<br>

diff --git a/eidos/eidos_globals.cpp b/eidos/eidos_globals.cpp
@@ -589,9 +589,9 @@ void _Eidos_SetOpenMPThreadCounts(EidosPerTaskThreadCounts per_task_thread_count
 		gEidos_OMP_threads_RUNIF_2 = 16;
 		gEidos_OMP_threads_RUNIF_3 = 16;
 
-		gEidos_OMP_threads_SORT_INT = 16;		// subject to revision
-		gEidos_OMP_threads_SORT_FLOAT = 16;		// subject to revision
-		gEidos_OMP_threads_SORT_STRING = 16;	// subject to revision
+		gEidos_OMP_threads_SORT_INT = 16;
+		gEidos_OMP_threads_SORT_FLOAT = 4;
+		gEidos_OMP_threads_SORT_STRING = 16;
 
 		gEidos_OMP_threads_POINT_IN_BOUNDS_1D = 12;
 		gEidos_OMP_threads_POINT_IN_BOUNDS_2D = 12;
@@ -725,9 +725,9 @@ void _Eidos_SetOpenMPThreadCounts(EidosPerTaskThreadCounts per_task_thread_count
 		gEidos_OMP_threads_RUNIF_2 = 40;
 		gEidos_OMP_threads_RUNIF_3 = 40;
 
-		gEidos_OMP_threads_SORT_INT = 40;		// subject to revision
-		gEidos_OMP_threads_SORT_FLOAT = 40;		// subject to revision
-		gEidos_OMP_threads_SORT_STRING = 40;	// subject to revision
+		gEidos_OMP_threads_SORT_INT = 10;
+		gEidos_OMP_threads_SORT_FLOAT = 10;
+		gEidos_OMP_threads_SORT_STRING = 10;
 
 		gEidos_OMP_threads_POINT_IN_BOUNDS_1D = 40;
 		gEidos_OMP_threads_POINT_IN_BOUNDS_2D = 40;