Mercurial > hg > python
annotate nono.py @ 58:a3aaf6c085f4 simple
pass0, initial display working with Run and Space
| author | Henry Thompson <ht@markup.co.uk> |
|---|---|
| date | Thu, 01 Jun 2023 19:02:22 +0100 |
| parents | 057b52746850 |
| children | c22f83e049a9 |
| rev | line source |
|---|---|
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
1 #!/usr/bin/python3 |
|
55
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
2 # New version, input taken from Nonograms Outer HTML plus |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
3 # > fgrep 'task = ' nono10.xhtml|tr ';' '\n' | fgrep task\ = | sed 's/^.*= //'| tr -d \' |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
4 # E.g. 8/5.1/2.3/2.1/4.3/3.4/2/1.1/3/5.2/2.2/2.2/1.3.2/5.1/3.1.1/2/2.3.1/7.1/1.1.2/3.2 |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
5 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
6 import sys |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
7 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
8 Red='[31m' |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
9 eRed='[39m' |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
10 RedFmt=Red+'%s'+eRed |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
11 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
12 def interleave(*args): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
13 for vals in zip(*args): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
14 yield from vals |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
15 |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
16 class Run: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
17 def __init__(self,n,i,j): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
18 # A run of length n, starting within [i,j] |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
19 self.n=n |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
20 self.i=i |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
21 self.j=j |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
22 self.s=j-i |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
23 self.done=False |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
24 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
25 def __str__(self): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
26 return str(self.n) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
27 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
28 class Space: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
29 def __init__(self,n,i,j): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
30 # A space of length 1..n, starting within [i,j] |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
31 # Once done, length == n |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
32 assert n>0 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
33 self.n=n |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
34 self.i=i |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
35 self.j=j |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
36 self.s=j-i |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
37 self.done=False |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
38 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
39 def __str__(self): |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
40 return '' |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
41 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
42 class Vector(list): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
43 # reads top-to-bottom or left-to-right |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
44 def __init__(self,n,m): |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
45 list.__init__(self,list(range(n))) |
|
55
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
46 self.n=n # size |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
47 self.m=m # parent NoNo |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
48 self.margin0=0 # a run can start here, so if >0 then self[m0-1].val must be False |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
49 self.marginN=n-1 # a run can end here, so if <n-1 then self[mN+1].val ditto |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
50 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
51 def initRuns(self,runs): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
52 # Set runs to alternating list of Run and Skip |
| 56 | 53 self.rn=len(runs) |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
54 self.runs=[] |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
55 if self.rn==0: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
56 # No runs means a vector of x |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
57 for c in self: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
58 c.setVal(False) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
59 else: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
60 need=sum(1+runs[k] for k in range(self.rn))-1 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
61 space=self.n-need |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
62 pos=0 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
63 while runs: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
64 self.runs.append(Run(r:=runs.pop(0),pos,pos+space)) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
65 pos+=r |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
66 if runs: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
67 self.runs.append(Space(space,pos,pos+space)) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
68 pos+=1 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
69 self.initDisp() |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
70 |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
71 def __repr__(self): |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
72 return "V@%s%s:%s"%(self.x,self.runs,list.__repr__(self)) |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
73 |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
74 def __str__(self): |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
75 return '%s|'%('|'.join(str(c) for c in self)) |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
76 |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
77 def myPrintSize(self): |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
78 return sum((len(str(run)) if isinstance(run,Run) else 1) for run in self.runs) |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
79 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
80 #=========v-old-v============ |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
81 |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
82 def resetAllRuns(self): |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
83 # compute the set of all possible layouts for runs |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
84 self.rn=len(self.runs) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
85 rtot=sum(self.runs) |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
86 self.allRuns=list(self.seedList(0,0,self.margin0,self.marginN+1, |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
87 sum(1+self.runs[k] for k in range(self.rn))-1)) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
88 self.nar=len(self.allRuns) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
89 |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
90 def seedList(self,i,j,pos0,posN,runLen): |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
91 """ |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
92 :param i: starting skip before next run |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
93 :type i: 0 if pos==0 else 1 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
94 :param j: next run number |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
95 :type j: int |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
96 :param pos0: left margin |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
97 :type pos0: int |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
98 :param posN: right margin |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
99 :type posN: int |
|
55
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
100 :return: list of runlens separated, possibly prefixed, with skips as negative integers |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
101 """ |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
102 bound=posN-(pos0+runLen)+1 |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
103 dprint('s',i,j,pos0,posN,runLen,bound) |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
104 if j==self.rn: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
105 yield [] |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
106 return |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
107 r=self.runs[j] |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
108 for v in range(i,bound): |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
109 for sub in self.seedList(1,j+1,pos0+v+r,posN,runLen-(r+1)): |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
110 yield [-v,r]+sub |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
111 |
| 13 | 112 def step(self,pos): |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
113 if self.runs==[]: |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
114 return 0 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
115 scratch=[0 if c.val is None else c.val for c in self] |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
116 wins=0 |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
117 changed=0 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
118 for k,runs in enumerate(self.allRuns): |
|
17
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
119 if (self.m.loop,self.cLet,pos,k)==(1,'R',7,5): |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
120 print(self.m) |
| 13 | 121 dprint('=====pass %s.%s.%s.%s======'%(self.m.loop,self.cLet,pos,k)) |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
122 if self.onepass(self.margin0,self.marginN+1,scratch,runs.copy()): |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
123 wins+=1 |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
124 dprint(wins, scratch) |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
125 maybeSeq=None |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
126 inSeq=None |
| 14 | 127 j=None |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
128 for i in range(self.n): |
| 13 | 129 if scratch[i]>=wins: |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
130 # If blobby in _every_ pass, then must be a blob |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
131 if inSeq is None: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
132 inSeq=i if maybeSeq is None else maybeSeq |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
133 dprint('s1',inSeq) |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
134 maybeSeq=None |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
135 if self[i].val is None: |
| 14 | 136 dprint('s1a',i) |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
137 self.newBlob(i,True) # Check cross-vector |
| 14 | 138 j=i |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
139 changed=1 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
140 elif self[i].val is True: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
141 pass |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
142 else: |
| 14 | 143 eprint("Shouldn't happen: attempt to blob where x already present! %s at %s"%(self,i),err=101) |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
144 elif inSeq is not None: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
145 if self[i].val is not True: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
146 inSeq=None |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
147 maybeSeq=None |
| 14 | 148 dprint('s2',i-1,j) |
| 149 if j is not None: | |
| 150 # Only if we actually added a blob at some point | |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
151 dpush('b_s2') |
| 14 | 152 self.checkNew(i-1) |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
153 dpop('b_s2') |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
154 elif self[i].val is True and maybeSeq is None: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
155 dprint('s3',i) |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
156 maybeSeq=i |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
157 dprint('s4',inSeq,i) |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
158 if inSeq is not None: |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
159 dpush('b_s4') |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
160 self.checkNew(i) |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
161 dpop('b_s4') |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
162 return changed |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
163 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
164 def onepass(self,i0,iBound,scratch,stack): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
165 """note that stack is not a simple run, but one with _negative_ numbers between |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
166 and possibly before the positive ones, indicating obligatory skips |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
167 """ |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
168 i=i0 # starting index into self/scratch/maybe |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
169 maybe=[0]*self.n |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
170 dprint('r: %s'%stack,i0,iBound) |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
171 req=sum((-r if r<0 else r) for r in stack) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
172 while stack and i<iBound: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
173 r=rr=stack.pop(0) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
174 dprint('pop:',r) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
175 if r<1: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
176 # obligatory skip |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
177 # (Above init of self.allRuns is easier if we allow a 0 to be ignored |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
178 for k in range(i,i-r): |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
179 if self[k] is True: |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
180 # has to be False or None to skip |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
181 dprint('x0',k) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
182 return False |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
183 i-=r |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
184 req+=r |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
185 r=rr=stack.pop(0) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
186 # rr is run remaining -- how many we still need |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
187 # First, check if we can start here: 0 is OK, and n>0 iff n-1 is None or False |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
188 # if i>0 and self[i-1].val is True: |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
189 # dprint('x1',i) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
190 # return |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
191 if (iBound-i)<req: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
192 # Can't win, give up altogether |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
193 dprint('x2',i,iBound,req) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
194 return False |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
195 j=i # start of run, if we find it |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
196 gapsFilled=0 |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
197 dprint('top:',j) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
198 while rr>0: |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
199 # guaranteed by check above that we won't run over the far end |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
200 c=self[i].val |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
201 if c is False: |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
202 dprint('x3',i) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
203 return False |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
204 if c is None: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
205 # we could add a blob here |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
206 gapsFilled+=1 |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
207 # and a blob already present is OK |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
208 rr-=1 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
209 i+=1 |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
210 # Maybe a win? |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
211 # look ahead, can we stop here? |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
212 if i<self.n and self[i].val is True: |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
213 dprint('x4',i) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
214 return False |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
215 # elif gapsFilled==0: |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
216 # # We must have crossed at least one gap... |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
217 # print("Shouldn't happen: no gap! me:%s i:%s j:%s rr:%s"%(self,i, j, rr),file=sys.stderr) |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
218 # raise Exception |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
219 # Victory! |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
220 dprint('c6',r,j,i) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
221 for k in range(j,i): |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
222 maybe[k]+=1 |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
223 req-=r |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
224 # on to the next run |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
225 # end of inner loop, did we win? |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
226 if (not stack) or i==iBound: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
227 # yes |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
228 dprint('win:',maybe) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
229 for k in range(iBound): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
230 scratch[k]+=maybe[k] |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
231 return True |
| 14 | 232 eprint("Shouldn't happen? - fell through",stack,i,iBound,err=102) |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
233 |
| 13 | 234 def checkX(self,pos,crosspos): |
| 235 # New x at pos, are there others that can be xed out now? | |
| 236 # Overkill as is? | |
| 237 dprint('cx',self.cLet+str(crosspos),pos) | |
| 238 if self.runs: | |
|
15
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
239 start0=self.margin0 # 0 if self.margin0==0 else self.margin0+1 |
|
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
240 if self.marginal(range(start0,pos),self.runs[0]): |
| 13 | 241 dprint('cx1a') |
| 242 else: | |
| 243 dprint('cx1b') | |
| 244 # if len(self.runs)>1: | |
|
15
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
245 startN=self.marginN # self.marginN if (self.marginN==self.n-1) else self.marginN-1 |
| 13 | 246 if self.marginal(range(startN,pos,-1),self.runs[-1]): |
| 247 dprint('cx2a') | |
| 248 else: | |
| 249 dprint('cx2b') | |
| 250 | |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
251 def checkNew(self,pos): |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
252 # New blob at pos, can we complete anything? |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
253 # Assuming @@ FTTB that it's never possible to definitively complete a |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
254 # non-marginal run, which is wrong if the length is unique and it's bounded... |
| 13 | 255 start0=self.margin0 #0 if self.margin0==0 else self.margin0+1 |
| 256 startN=self.marginN # self.marginN if (self.marginN==self.n-1) else self.marginN-1 | |
| 257 dprint('cn',start0,pos,startN) | |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
258 changed=False |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
259 # First, find our boundaries: |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
260 s=pos # start index of our run |
| 13 | 261 if s>start0: |
| 262 while s>start0 and self[s-1].val is True: | |
| 263 s-=1 | |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
264 f=pos # finish index of our run |
| 13 | 265 if f<startN: |
| 266 while f<startN and self[f+1].val is True: | |
| 267 f+=1 | |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
268 l=(f-s)+1 # our length |
| 13 | 269 dprint('%s:%s,%s,%s,%s:<%s>'%(self.cLet,s,f,l,self.runs,self)) |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
270 c=self.runs.count(l) |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
271 if c==0: |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
272 # not big enough yet |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
273 dprint('x0') |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
274 return |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
275 if self.runs[0]==l: |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
276 # is it safely left marginal, i.e. no blobs or big enough gaps before us? |
|
12
ede2551ae7d9
red-formatting fixed, margins improved, cols 3&4 not being filled in, why?
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
11
diff
changeset
|
277 if self.marginal(range(start0,s),l): |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
278 changed=True |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
279 dprint('n1') |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
280 # mark our margins |
| 13 | 281 for i in range(start0,s): # not sure this is still needed since |
| 282 # added gap-filling in self.marginal | |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
283 if self[i].val is None: |
| 13 | 284 self.newX(i,False) |
|
12
ede2551ae7d9
red-formatting fixed, margins improved, cols 3&4 not being filled in, why?
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
11
diff
changeset
|
285 if f<startN: |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
286 if self[f+1].val is None: |
| 13 | 287 self.newX(f+1,True) |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
288 self.found0(f) # pull in the start margin at least to f+2 |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
289 else: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
290 dprint('x1a') |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
291 if not changed: |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
292 if self.runs[-1]==l: |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
293 # is it safely _right_ marginal, i.e. no blobs or big enough gaps _after_ us? |
|
12
ede2551ae7d9
red-formatting fixed, margins improved, cols 3&4 not being filled in, why?
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
11
diff
changeset
|
294 if self.marginal(range(startN,f,-1),l): |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
295 changed=True |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
296 dprint('n2') |
| 13 | 297 # mark our margins: still needed? see above |
|
12
ede2551ae7d9
red-formatting fixed, margins improved, cols 3&4 not being filled in, why?
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
11
diff
changeset
|
298 for i in range(startN,f,-1): |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
299 if self[i].val is None: |
| 13 | 300 self.newX(i,False) |
|
12
ede2551ae7d9
red-formatting fixed, margins improved, cols 3&4 not being filled in, why?
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
11
diff
changeset
|
301 if s>start0: |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
302 if self[s-1].val is None: |
| 13 | 303 self.newX(s-1,True) |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
304 self.foundN(s) # pull in the finish margin at least to s-2 |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
305 else: |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
306 dprint('x2a') |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
307 else: |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
308 dprint('x2b') |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
309 if changed: |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
310 self.resetAllRuns() |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
311 |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
312 def marginal(self,rng,l): |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
313 dprint('m%s'%self.cLet,rng.start,rng.stop,rng.step,l) |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
314 g=0 # length of a gap |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
315 for i in rng: |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
316 if self[i].val is True: |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
317 # Shouldn't be possible? |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
318 dprint('mx0') |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
319 return False |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
320 if self[i].val is False: |
| 13 | 321 if g>0: |
| 322 # Block a too-small gap | |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
323 dprint('m1',i-g,i) |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
324 for j in range(i-g,i): |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
325 self.newX(j,True) |
| 13 | 326 g=0 |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
327 else: |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
328 # None |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
329 g+=1 |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
330 if g==l: |
| 14 | 331 # run could fit here, so no go |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
332 dprint('mx1') |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
333 return False |
| 13 | 334 if g>0: |
| 335 # Block a too-small gap | |
|
17
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
336 if rng.step==1: |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
337 # forward |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
338 dprint('m2f',i-g,i) |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
339 for j in range(i+1-g,i+1): |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
340 self.newX(j,True) |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
341 else: |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
342 # backward |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
343 dprint('m2b',i+g,i) |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
344 for j in range(i+g-1,i-1,-1): |
|
6c9e371b0325
doesn't break, what's there is good, but stuck part-way in 10a
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
16
diff
changeset
|
345 self.newX(j,True) |
|
6
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
346 return True |
|
a56d5285575b
drafted Vector.checkNew, still need found0 and foundN
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
0
diff
changeset
|
347 |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
348 def found0(self,i): |
| 13 | 349 dprint('found0 called on %s at %s'%(self,i)) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
350 i=self.margin0 |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
351 while self[i].val is False: |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
352 i+=1 |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
353 if self[i].val is True: |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
354 r=self.runs.pop(0) |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
355 self.initialComplete.append(r) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
356 self.margin0+=r+1 |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
357 self.updateHeader(r=r,pre=True) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
358 |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
359 def foundN(self,i): |
| 13 | 360 dprint('foundN called on %s at %s'%(self,i)) |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
361 i=self.marginN |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
362 while self[i].val is False: |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
363 i-=1 |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
364 if self[i].val is True: |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
365 r=self.runs.pop() |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
366 self.finalComplete=[r]+self.finalComplete |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
367 self.marginN-=r+1 |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
368 self.updateHeader(r=r,pre=False) |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
369 |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
370 #=============new simple============ |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
371 def pass0(self): |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
372 for i in range(0,len(self.runs),2): |
|
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
373 run=self.runs[i] |
|
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
374 for p in range(run.i+run.s,run.i+run.n): |
|
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
375 self[p].setVal(True) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
376 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
377 class Row(Vector): |
| 13 | 378 cLet='R' |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
379 def __init__(self,n,m,pos): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
380 Vector.__init__(self,n,m) |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
381 self.y=pos |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
382 |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
383 def initDisp(self): |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
384 self.width=self.myPrintSize() |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
385 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
386 def __str__(self): |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
387 return ((self.fmt%(' '.join(str(r) for r in self.runs if isinstance(r,Run))))+ |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
388 Vector.__str__(self)) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
389 |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
390 def updateHeader(self,*,maxWidth=None,r=None,pre=None): |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
391 if maxWidth is None: |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
392 # update |
| 13 | 393 spacer=(" " if self.runs else "") |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
394 if pre: |
| 13 | 395 self.infix+=(RedFmt%r)+spacer |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
396 else: |
|
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
397 # post |
| 13 | 398 self.suffix=spacer+RedFmt%r+self.suffix |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
399 self.fmt="%s%s%%s%s|"%(self.prespace,self.infix,self.suffix) |
|
8
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
400 else: |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
401 # init |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
402 self.maxWidth=maxWidth |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
403 self.prespace=' '*(maxWidth-self.width) |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
404 self.fmt="%s%%s|"%self.prespace |
|
3276cf6ee6df
vastly simplified onePass, printing rows working
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
7
diff
changeset
|
405 self.infix="" |
|
9
28a7b0e992cb
lots of fails in trace of 5a wrt checkNew/found0/foundN???
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
8
diff
changeset
|
406 self.suffix="" |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
407 |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
408 def newBlob(self,x,crossCheck=False): |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
409 self[x].setVal(True) |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
410 if crossCheck: |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
411 dpush('b_cc') |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
412 self[x].column.checkNew(self.y) |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
413 dpop('b_cc') |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
414 |
| 13 | 415 def newX(self,x,crossCheck=False): |
| 416 dprint('nx %s%s@%s'%('R',self.y,x)) | |
| 417 self[x].setVal(False) | |
| 418 if crossCheck: | |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
419 dpush('x_cc') |
| 13 | 420 self[x].column.checkX(self.y,x) |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
421 dpop('x_cc') |
| 13 | 422 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
423 class Column(Vector): |
| 13 | 424 cLet='C' |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
425 def __init__(self,n,m,pos): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
426 Vector.__init__(self,n,m) |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
427 self.x=pos |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
428 |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
429 def initDisp(self): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
430 self.height=self.myPrintSize() |
| 56 | 431 |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
432 def updateHeader(self,*,maxHeight=None,r=None,pre=None): |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
433 dprint('CuH',r,pre) |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
434 if maxHeight is None: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
435 # update |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
436 if pre: |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
437 for rc in str(r): |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
438 self.infix.append(RedFmt%rc) |
|
15
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
439 if self.runs: |
|
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
440 self.infix.append('-') |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
441 else: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
442 # post |
|
15
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
443 ins=["-"] if self.runs else [] |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
444 for rc in str(r): |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
445 ins.append(RedFmt%r) |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
446 self.suffix=ins+self.suffix |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
447 dprint('CuH1: |%s|,%s,%s,%s'%(self.prespace,self.infix,self.suffix,self.runs)) |
|
15
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
448 self.header=([" "]*self.prespace)+\ |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
449 self.infix+\ |
|
15
22b0894c0f4c
fixed Column.updateHeader wrt 5a, but broke it wrt C0 and missing red for R2
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
14
diff
changeset
|
450 (['-'.join(str(c) for c in self.runs)] if self.runs else [])+\ |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
451 self.suffix |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
452 else: |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
453 # init |
|
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
454 self.maxHeight=maxHeight |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
455 self.infix=[] |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
456 self.suffix=[] |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
457 self.prespace=maxHeight - self.height # pad to same 'height' |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
458 self.fmt="%s%%s"%(' '*self.prespace) |
|
58
a3aaf6c085f4
pass0, initial display working with Run and Space
Henry Thompson <ht@markup.co.uk>
parents:
57
diff
changeset
|
459 header=('-'.join(str(c) for c in self.runs if isinstance(c,Run))) |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
460 self.header=self.fmt%header |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
461 dprint(self.header) |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
462 |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
463 def newBlob(self,y,crossCheck=False): |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
464 self[y].setVal(True) |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
465 if crossCheck: |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
466 dpush('b_cc') |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
467 self[y].row.checkNew(self.x) |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
468 dpop('b_cc') |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
469 |
| 13 | 470 def newX(self,y,crossCheck=False): |
| 471 dprint('nx %s%s@%s'%('C',self.x,y)) | |
| 472 self[y].setVal(False) | |
| 473 if crossCheck: | |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
474 dpush('x_cc') |
| 13 | 475 self[y].row.checkX(self.x,y) |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
476 dpop('x_cc') |
| 13 | 477 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
478 class Cell: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
479 def __init__(self,row,y,column,x): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
480 # At the intersection of row and column Vectors |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
481 self.row=row |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
482 self.column=column |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
483 self.x=x |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
484 self.y=y |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
485 self.val=None # three valued: None(unknown), True(filled), False(empty) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
486 self.row[x]=self |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
487 self.column[y]=self |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
488 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
489 def __repr__(self): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
490 return "C@(%s,%s):%s"%(self.x,self.y,self.val) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
491 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
492 def __str__(self): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
493 return ' ' if self.val is None else ('\u25A0' if self.val else 'x') |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
494 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
495 def setVal(self,v): |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
496 # Returns true iff old value was None |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
497 assert v in (True, False) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
498 if v == self.val: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
499 return False |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
500 if self.val is not None: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
501 eprint("Reset not allowed: %s -> %s at %s,%s"%(self.val, v, self.x,self.y),err=103) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
502 self.val=v |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
503 return True |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
504 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
505 class Nono(dict): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
506 # 0,0 is upper left, so increasing y goes _downwards_, to match the standard layout |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
507 def __init__(self,runsPerRow,runsPerCol): |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
508 global SOLVER |
| 13 | 509 self.loop=0 |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
510 self.dp='' |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
511 self.dstate=[] |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
512 SOLVER=self |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
513 n=self.n=len(runsPerCol) |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
514 if n!=len(runsPerRow): |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
515 print("losing r:%s x c:%s"%(len(runsPerRow),n),sys.stderr) |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
516 exit(1) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
517 self.rc=runsPerRow |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
518 self.cc=runsPerCol |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
519 # print col nums>9 vertically :-( |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
520 self.columns=cc=[Column(n,self,i) for i in range(n)] |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
521 self.rows=rr=[Row(n,self,i) for i in range(n)] |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
522 for x in range(n): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
523 for y in range(n): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
524 self[(x,y)]=Cell(rr[y],y,cc[x],x) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
525 # Need cells in place for the following |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
526 for row,runs in zip(rr,runsPerRow): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
527 row.initRuns(runs) |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
528 for col,runs in zip(cc,runsPerCol): |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
529 col.initRuns(runs) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
530 self.maxCRheight=maxCRheight=max(col.height for col in cc) |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
531 for c in cc: |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
532 c.updateHeader(maxHeight=maxCRheight) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
533 maxRRwidth=max(row.width for row in rr) |
|
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
534 for r in rr: |
|
10
0a24625b33fa
checkNew improving, reverse pass failing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
9
diff
changeset
|
535 r.updateHeader(maxWidth=maxRRwidth) |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
536 self.rowfmt="%s|%%s|"%(' '*maxRRwidth) |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
537 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
538 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
539 def __str__(self): |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
540 lines=[self.rowfmt%('|'.join([(self.columns[i]).header[j] for i in range(self.n)])) # 'rotate' |
|
7
13f600be3a1b
implemented newBlob and found0, refactoring display
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
6
diff
changeset
|
541 for j in range(self.maxCRheight)] |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
542 lines+=[str(r) for r in self.rows] |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
543 return "\n".join(lines) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
544 |
| 56 | 545 #=============new simple============ |
| 546 def pass0(self): # do columns of empty layout | |
| 547 for c in self.columns: | |
| 548 c.pass0() | |
|
57
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
549 for r in self.rows: |
|
057b52746850
use Run and Space classes in Vector.runs
Henry Thompson <ht@markup.co.uk>
parents:
56
diff
changeset
|
550 r.pass0() |
| 56 | 551 |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
552 def solve(self): |
| 56 | 553 self.pass0() |
| 554 print(self) | |
| 555 return | |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
556 someChanged=1 |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
557 while someChanged>0: |
| 13 | 558 self.loop+=1 |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
559 someChanged=0 |
| 13 | 560 dprint("***Solve C %s***"%self.loop) |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
561 for c in self.columns: |
| 13 | 562 someChanged+=c.step(c.x) |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
563 print(someChanged) |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
564 print(self) |
| 13 | 565 dprint("***Solve R %s***"%self.loop) |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
566 for r in self.rows: |
| 13 | 567 someChanged+=r.step(r.y) |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
568 print(someChanged) |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
569 print(self) |
|
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
570 |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
571 def dpush(s): |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
572 SOLVER.dp+=' ' |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
573 SOLVER.dstate.append(s) |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
574 |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
575 def dpop(s): |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
576 assert(SOLVER.dstate.pop()==s) |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
577 SOLVER.dp=SOLVER.dp[1:] |
|
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
578 |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
579 def dprint(*args): |
|
16
a7a10e40b344
5a working after obvious bugfix,
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
15
diff
changeset
|
580 print(SOLVER.dp,end='') |
| 14 | 581 print(*args) |
| 582 sys.stdout.flush() | |
| 583 | |
| 584 def eprint(*args,**kw): | |
| 585 print(*args,file=sys.stderr) | |
| 586 sys.stderr.flush() | |
| 587 exit(kw['err']) | |
| 588 | |
| 589 def wprint(*args): | |
| 590 print(*args,file=sys.stderr) | |
| 591 sys.stderr.flush() | |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
592 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
593 if __name__ == '__main__': |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
594 if len(sys.argv)>1: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
595 f=open(sys.argv[1]) |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
596 else: |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
597 f=sys.stdin |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
598 |
|
55
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
599 l = f.readline().rstrip() |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
600 vv=l.split('/') |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
601 n=int(len(vv)/2) |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
602 print('%sx%s puzzle'%(n,n),file=sys.stderr) |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
603 cols=[[int(i) for i in v.split('.')] for v in vv[:n]] |
|
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
604 rows=[[int(i) for i in v.split('.')] for v in vv[n:]] |
|
0
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
605 |
|
fee51ab07d09
blanket publication of all existing python files in lib/python on maritain
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
diff
changeset
|
606 solver=Nono(rows,cols) |
|
11
1b9daa849b0f
A bit further: red col working, finding middle of row 1, formatting off, outer loop in place, but fails overall after 3rd pass achieves nothing
Henry S. Thompson <ht@inf.ed.ac.uk>
parents:
10
diff
changeset
|
607 solver.solve() |
|
55
68004ce55703
convert to newer source of Nonogram data
Henry Thompson <ht@markup.co.uk>
parents:
17
diff
changeset
|
608 |