Merge pull request #246 from bacpop/graph-err-msg

Fix a broken error message in assign
bacpop · Nov 18, 2022 · 81d2017 · 81d2017
2 parents 4b9818d + 25d8c25
commit 81d2017
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/PopPUNK/__init__.py b/PopPUNK/__init__.py
@@ -3,7 +3,7 @@
 
 '''PopPUNK (POPulation Partitioning Using Nucleotide Kmers)'''
 
-__version__ = '2.6.0'
+__version__ = '2.6.1'
 
 # Minimum sketchlib version
 SKETCHLIB_MAJOR = 2

diff --git a/PopPUNK/assign.py b/PopPUNK/assign.py
@@ -507,9 +507,9 @@ def assign_query_hdf5(dbFuncs,
                              accessory_only = (fit_type == 'accessory_refined'),
                              use_gpu = gpu_graph)
 
-            if max(get_vertex_list(genomeNetwork, use_gpu = gpu_graph)) != (len(rNames) - 1):
-                sys.stderr.write("There are " + str(max(get_vertex_list(genomeNetwork, use_gpu = gpu_graph)) + 1) + \
-                                 " vertices in the network but " + str(len(rNames)) + " reference names supplied; " + \
+            n_vertices = len(get_vertex_list(genomeNetwork, use_gpu = gpu_graph))
+            if n_vertices != len(rNames):
+                sys.stderr.write(f"There are {n_vertices}  vertices in the network but {len(rNames)} reference names supplied; " + \
                                  "please check the '--model-dir' variable is pointing to the correct directory\n")
 
         if model.type == 'lineage':