inc/request_closest.sh $OBJ may return $OBJ

ncbi · Mar 26, 2021 · 807100c · 807100c
1 parent a56c292
commit 807100c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/phylogeny/distTree_inc_search_init.sh b/phylogeny/distTree_inc_search_init.sh
@@ -16,7 +16,7 @@ DIR=$INC/search/$OBJ
 
 while true; do
   set +o errexit
-	$INC/request_closest.sh $OBJ "" | sed 's/$/\t'$OBJ'/1' > $DIR/request
+	$INC/request_closest.sh $OBJ "" > $DIR/request.raw
   S=$?
   set -o errexit
 	if [ $S == 0 ]; then
@@ -25,6 +25,9 @@ while true; do
 	sleep 30
 done
 
+grep -v "^${OBJ}$" $DIR/request.raw | sed 's/$/\t'$OBJ'/1' > $DIR/request || true
+rm $DIR/request.raw
+
 if [ -s $DIR/request ]; then
 	cp /dev/null $DIR/dissim
 else

diff --git a/version.inc b/version.inc
@@ -1,6 +1,8 @@
-#define VERSION "1.5.8"
+#define VERSION "1.5.10"
 
 
+// 1.5.10 03/25/2021  inc/request_closest.sh $OBJ may return $OBJ
+// 1.5.9  03/24/2021  NewLeaf::saveRequest() prints empty list of requests if location.indiscernible()
 // 1.5.8  03/22/2021  makeDistTree: quality calculation uses threads
 // 1.5.7  03/21/2021  FeatureTree::globalSingletonsSize bug
 // 1.5.6  03/17/2021  feature tree: only-optional features are removed;