diff python/cluster.py @ 7:3ee329b129c6

rename block properties, slightly revise result format
author Henry S. Thompson <ht@inf.ed.ac.uk>
date Wed, 26 May 2021 09:18:49 -0400
parents 672621ab4db4
children e411408d64ec
line wrap: on
line diff
--- a/python/cluster.py	Tue May 25 17:20:04 2021 -0400
+++ b/python/cluster.py	Wed May 26 09:18:49 2021 -0400
@@ -5,8 +5,9 @@
 from util import *
 
 if len(sys.argv)==1 or sys.argv[1]=='-h':
-  print("""Usage: cluster.py [-h] [-c n] infile.tsv [outfile.tsv]
+  print("""Usage: cluster.py [-h] [-c n] [-s] infile.tsv [outfile.tsv]
            n is cluster diameter, default is 5
+           -s for strict circle distance, reduces number of candidates
            default outfile is [infile]_c[n].tsv""")
   exit(1)
 if sys.argv[1]=='-c':
@@ -15,6 +16,12 @@
 else:
   n=5.0
 
+if sys.argv[1]=='-s':
+  sys.argv.pop(1)
+  strict=True
+else:
+  strict=False
+
 infile_name=sys.argv.pop(1)
 if len(sys.argv)>1:
   outfile_name=sys.argv.pop(1)
@@ -40,8 +47,9 @@
       (_,td,qd)=l.rstrip().split('\t')
       q=[float(i) for i in qd.split(',')]
       td=float(td)
-      if td>orad:
+      if strict and td>orad:
         # Enforce a circular region, not square
+        print(td,orad,file=sys.stderr)
         break
       for c in cc:
         for p in c: