utils/split-pieces (QfConvert): Rename to `BaseQfConvert'.

[catacomb] / utils / split-pieces

diff --git a/utils/split-pieces b/utils/split-pieces
index 473e2fea0c92d81b3dc5e2de6ae8595b005334e6..11ecd8a9b1d3a28e1f608c83712da9dde7360c35 100755 (executable)
--- a/utils/split-pieces
+++ b/utils/split-pieces
@@ -5,7 +5,7 @@ from itertools import cycle, izip
 import re as RX
 
 def bad_usage():
-  exit('usage: split-pieces { scaf WD | qf WD/N|WD,WD,... } N N ...')
+  exit('usage: split-pieces { scaf WD | qf P WD/N|WD,WD,... } N N ...')
 
 ARGC = 1
 def getarg(must = True):
@@ -31,7 +31,7 @@ class ScafConvert (object):
   def unhack(me, nn):
     return sum(n << i*me.piecewd for i, n in enumerate(nn))
 
-class QfConvert (object):
+class BaseQfConvert (object):
   def __init__(me, p, wdseq):
     me.p = p
     me.wdseq = wdseq
@@ -45,7 +45,7 @@ class QfConvert (object):
     else:
       seq = map(int, arg.split(','))
     print ";; piece widths = %r" % seq
-    return QfConvert(p, seq)
+    return cls(p, seq)
   def hack(me, n):
     if 2*n >= me.p: n -= p
     nn = []
@@ -70,8 +70,8 @@ def spliteval(arg): return map(eval, R_split.split(arg.strip()))
 
 convmap = { 'scaf': ScafConvert,
             'unscaf': ScafConvert,
-            'qf': QfConvert,
-            'unqf': QfConvert }
+            'qf': BaseQfConvert,
+            'unqf': BaseQfConvert }
 op = getarg()
 cvt = convmap[op].parse()
 if op.startswith('un'): prepare, conv, format = spliteval, cvt.unhack, str