Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add option to print a delimiter between tiles

Browse source 
For Hungarian, there are "duplicate" words because e.g. the string CS
can be spelled with two tiles or one. If a delimiter is printed at tile
boundaries the duplication goes away.
This commit is contained in:
Eric House 2020-04-24 21:14:20 -07:00
parent adadbd8647
commit 1c0348dbf1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/dawg/dawg2dict.py
View file

@ -116,7 +116,7 @@ def parseNode( node, nodeSize ):
return (nextEdge, chrIndex, accepting, isLast ) return (nextEdge, chrIndex, accepting, isLast )
def expandDAWG( nodes, nodeSize, indx, data, words, letters = [] ): def expandDAWG( nodes, nodeSize, delim, indx, data, words, letters = [] ):
if len(letters) > 15: error( "infinite recursion???" ) if len(letters) > 15: error( "infinite recursion???" )
while True: while True:
@ -126,10 +126,10 @@ def expandDAWG( nodes, nodeSize, indx, data, words, letters = [] ):
letters.append( data[chrIndex]['faces'][0] ) letters.append( data[chrIndex]['faces'][0] )
if accepting: if accepting:
words.append( ''.join(letters) ) words.append( delim.join(letters) )
if nextEdge != 0: if nextEdge != 0:
expandDAWG( nodes, nodeSize, nextEdge, data, words, letters ) expandDAWG( nodes, nodeSize, delim, nextEdge, data, words, letters )
letters.pop() letters.pop()
@ -221,7 +221,7 @@ def process(args):
nodes = loadNodes( dawg, nodeSize ) nodes = loadNodes( dawg, nodeSize )
words = [] words = []
if nodes: if nodes:
expandDAWG( nodes, nodeSize, offset, data, words ) expandDAWG( nodes, nodeSize, args.DELIM, offset, data, words )
assert len(words) == nWords assert len(words) == nWords
if args.DUMP_WORDS: if args.DUMP_WORDS:
for word in words: for word in words:
@ -239,6 +239,7 @@ def mkParser():
action = 'store_true', help = 'write header user-visible message to stdout') action = 'store_true', help = 'write header user-visible message to stdout')
parser.add_argument('--get-sum', dest = 'GET_SUM', default = False, parser.add_argument('--get-sum', dest = 'GET_SUM', default = False,
action = 'store_true', help = 'write md5sum to stdout') action = 'store_true', help = 'write md5sum to stdout')
parser.add_argument('--separator', dest = 'DELIM', default = '', help = 'printed between tiles')
# [-raw | -json] [-get-sum] [-get-desc] -dict <xwdORpdb> # [-raw | -json] [-get-sum] [-get-desc] -dict <xwdORpdb>