Skip to content

Commit 0abdeef

Browse files
thomas-maederthomas-maeder
committed
Merge branch 'release/4.87'
2 parents 682c32d + 0b31713 commit 0abdeef

File tree

195 files changed

+8537
-3931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+8537
-3931
lines changed

‎BEISPIEL/intell.inp‎

Lines changed: 103 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1469,4 +1469,106 @@ zwilling verse e5 d6
14691469
zwilling verse d7 d6
14701470
zwilling verse d7 d5
14711471

1472-
endeproblem
1472+
weiteresproblem
1473+
1474+
auto TLi
1475+
quel 2559, Probleemblad 52/3, 5-6/1994
1476+
ausz 7. eE
1477+
ford reci-h#3
1478+
stei
1479+
weis kc3 dc1 te6 le4 bb4d2d4e3
1480+
schw kg6 dg3 sf5f6 bd5f2f7
1481+
opti intel zugn
1482+
zwil verse c3 b7
1483+
1484+
weiter
1485+
1486+
auto TLi Pachl Manhart
1487+
quel 994, Europa-Rochade 8/1992
1488+
ausz 1. eE
1489+
ford reci-h#3
1490+
stei
1491+
weis kh5 ta3 la8 be3
1492+
schw kc4 ta5b3 lc6g5 sh1 ba4b6c5
1493+
opti intel zugn
1494+
nullstellung verse h5 f1
1495+
zwil verse e3 c2
1496+
1497+
weiter
1498+
1499+
auto TLi
1500+
quel 2113, Gaudium 235, 24.12.2020
1501+
ford reci-h#7
1502+
stei
1503+
weis kc7 lf3
1504+
schw kc5 bh4g7 df6
1505+
opti intel zugn
1506+
1507+
weiter
1508+
1509+
auto TLi
1510+
quel FA1937, StrateGems 92, 10-12/2020
1511+
ford reci-h#8
1512+
stei
1513+
weis kh1 le5
1514+
schw kd3 de2 sa3 td2
1515+
opti intel zugn
1516+
1517+
weiter
1518+
1519+
autor Theodor Steudel
1520+
quelle t1, Problemkiste 92, 4/1994
1521+
forderung reci-h(=)#3
1522+
steine weiss kh1 bg7
1523+
schwarz kf1 be3
1524+
opti intel zugn
1525+
1526+
weiteresproblem
1527+
1528+
autor Theodor Steudel
1529+
quelle t2, Problemkiste 92, 4/1994
1530+
forderung reci-h(=)#3
1531+
steine weiss kh1 ba7
1532+
schwarz kf1 bb3
1533+
opti intel zugn
1534+
1535+
weiteresproblem
1536+
1537+
autor Theodor Steudel
1538+
quelle t4, Problemkiste 92, 4/1994
1539+
forderung reci-h(#)=2
1540+
steine weiss kh1 be7
1541+
schwarz kf1 be2
1542+
opti intel zugn
1543+
1544+
weiteresproblem
1545+
1546+
autor Theodor Steudel
1547+
quelle t5, Problemkiste 92, 4/1994
1548+
forderung reci-h(#)=3
1549+
steine weiss kf1 be7
1550+
schwarz kh1 bd3
1551+
opti intel zugn
1552+
1553+
weiteresproblem
1554+
1555+
autor Theodor Steudel
1556+
quelle t6, Problemkiste 92, 4/1994
1557+
forderung reci-h(#)=3
1558+
steine weiss kh3 bh7
1559+
schwarz kh1 bd3
1560+
opti intel zugn
1561+
1562+
weiteresproblem
1563+
1564+
autor Louis Azemard
1565+
autor Manuel Mu\~noz
1566+
quelle spez. ehr. Erw., RIFACE 1991
1567+
forderung ser-reci-h(=)#7
1568+
steine weiss ka8 dh7
1569+
schwarz kc8 bh5
1570+
opti intel zugn
1571+
zwill versetze h5 d7 ford ser-reci-h(#)=7
1572+
1573+
ende
1574+

‎BEISPIEL/lengthy/intelligent_lengthy.inp‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
anfang
2+
3+
protokoll intelligent_lengthy.out
4+
5+
auto TLi
6+
quel 8951, Phenix 312, 11/2020
7+
ford reci-h#12
8+
stei
9+
weis kb5 bg2
10+
schw kc1 bb7g7
11+
opti intel zugn
12+
13+
weiter
14+
15+
auto TLi
16+
quel 8952, Phenix 312, 11/2020
17+
ford reci-h#13
18+
stei
19+
weis kb3 bh2
20+
schw kd8 bf7h7
21+
opti intel zugn
22+
23+
weiter
24+
25+
beme takes way too long
26+
auto TLi
27+
quel 18421, Die Schwalbe 306-1, 12/2020
28+
ford reci-h#14.5
29+
stei
30+
weis kb6 bd2 te3
31+
schw kd4 lb4
32+
opti intel zugn
33+
34+
ende
35+

‎BEISPIEL/rollentausch.inp‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
anfang
2+
3+
protokoll rollentausch.out
4+
5+
autor Wolfang Erben
6+
steine weiss kb8 schwar kb6 tc5
7+
bedingung rollentausch
8+
forderung #2
9+
option vari
10+
11+
weiter
12+
13+
autor Wolfang Erben
14+
steine weiss kb8 df1 schwarz kb6 tc5
15+
forderung #3
16+
bedingung rollentausch
17+
option varianten
18+
19+
weiter
20+
21+
autor Wolfang Erben
22+
steine weiss kb8 dh4 schwarz ka6 tc5
23+
forderung #4
24+
bedingung rollentausch
25+
option varianten
26+
27+
weiter
28+
29+
autor Wolfgang Erben
30+
bemerkung keine loesung, weil nur 1 rollentausch erlaubt ist
31+
steine weiss kh1 bb5d6g6 schwarz kc8 bd7g7
32+
bedingung rollentausch 1
33+
forderung #8
34+
option varianten ohnekurzvarianten
35+
36+
weiter
37+
38+
autor Wolfgang Erben
39+
steine weiss kh1 bb5d6g6 schwarz kc8 bd7g7
40+
bedingung rollentausch 2
41+
forderung #8
42+
option varianten ohnekurzvarianten
43+
44+
weiter
45+
46+
autor Wolfgang Erben
47+
steine weiss kh1 bb4d6g6 schwarz kd8 bd7g7
48+
bedingung rollentausch
49+
forderung #9
50+
option varianten ohnekurzvarianten
51+
52+
weiter
53+
54+
autor Wolfgang Erben
55+
steine weiss kg1 ba6b6c6 schwar ka8 bf3g2g3h3
56+
bemerkung Rollentausch in Mattstellung
57+
bedingung rollentausch
58+
forderung #2
59+
option vari
60+
61+
weiter
62+
63+
autor Wolfgang Erben
64+
steine weiss kh1 ba6b6c6 schwar ka8 bf3g2g3h3
65+
bemerkung Rollentausch mit Koenig im Schach
66+
bedingung rollentausch
67+
forderung #2
68+
option vari
69+
70+
weiter
71+
72+
autor Wolfgang Erben
73+
steine weiss kg1 ba6b6c6 schwar ka8 bf3g2g3h3d6
74+
bemerkung Rollentausch in Mattstellung
75+
bedingung rollentausch
76+
forderung #2
77+
option vari
78+
79+
weiter
80+
81+
autor Wolfgang Erben
82+
bemerkung Schwarz verteidigt durch Matt des weissen Koenigs
83+
steine weiss kg1 ba6b6c6 schwar ka8 bf3g2g3h3d6
84+
bedingung rollentausch
85+
forderung #2
86+
option vari ohnedroh zielistende
87+
88+
weiter
89+
90+
autor Wolfgang Erben
91+
bemerkung ... auch gegen Drohung
92+
steine weiss kg1 ba6b6c7 schwar ka8 bf3g2g3h3d6
93+
bedingung rollentausch
94+
forderung #2
95+
option nachschlu zielistende
96+
97+
end
98+

‎DHT/dht.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ static InternHsElement *stepDirTable(dirEnumerate *enumeration)
375375
if (di==0)
376376
enumeration->current= (ht_dir*)accessAdr(enumeration->dt,
377377
enumeration->index);
378+
assert(enumeration->current!=0);
378379
enumeration->index++;
379380
TraceValue("%p",(void *)enumeration->current);
380381
TraceValue("%p",(void *)*enumeration->current);
@@ -731,6 +732,7 @@ LOCAL dhtStatus ExpandHashTable(HashTable *ht)
731732
TraceValue("%lu ",newp);
732733
TraceValue("%p",(void *)newPointer);
733734
TraceEOL();
735+
assert(oldPointer!=0);
734736
while (*oldPointer)
735737
{
736738
InternHsElement const *oldElmt = *oldPointer;
@@ -782,6 +784,7 @@ LOCAL void ShrinkHashTable(HashTable *ht)
782784
oldp= ht->p + ht->maxp;
783785
oldPointer= (InternHsElement**)accessAdr(&ht->DirTab, oldp);
784786

787+
assert(oldPointer!=0);
785788
if (*oldPointer)
786789
{
787790
while (*newPointer)
@@ -807,6 +810,7 @@ LOCAL InternHsElement **LookupInternHsElement(HashTable *ht, dhtConstValue key)
807810
phe = (InternHsElement**)accessAdr(&ht->DirTab, h);
808811
TMDBG(printf("h:%lu\n",h));
809812

813+
assert(phe!=0);
810814
while (*phe)
811815
if ((ht->procs.Equal)((*phe)->HsEl.Key, key))
812816
{

‎DHT/fxf.c‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static FreeMapType *FreeMap;
172172
} \
173173
} while (0)
174174

175-
void SetRange(size_t x, size_t l) {
175+
static void SetRange(size_t x, size_t l) {
176176
if (FreeMap) {
177177
size_t xi= x>>5, y= x+l, yi= y>>5;
178178
if (xi==yi)
@@ -186,7 +186,7 @@ void SetRange(size_t x, size_t l) {
186186
}
187187
}
188188

189-
void ClrRange(size_t x, size_t l) {
189+
static void ClrRange(size_t x, size_t l) {
190190
if (FreeMap) {
191191
size_t xi= x>>5, y= x+l, yi= y>>5;
192192
if (xi==yi)
@@ -216,8 +216,8 @@ void PrintFreeMap(FILE *f) {
216216
}
217217
}
218218
#else
219-
# define SetRange(x,l) ((void)(x, l))
220-
# define ClrRange(x,l) ((void)(x, l))
219+
static void SetRange(size_t x, size_t l) { (void) x; (void) l; }
220+
static void ClrRange(size_t x, size_t l) { (void) x; (void) l; }
221221
#endif /*FREEMAP, !SEGMENTED*/
222222

223223
size_t fxfInit(size_t Size) {
@@ -245,6 +245,13 @@ size_t fxfInit(size_t Size) {
245245
TopFreePtr+= ARENA_SEG_SIZE;
246246
GlobalSize= ArenaSegCnt*ARENA_SEG_SIZE;
247247
#else
248+
#if defined(FREEMAP)
249+
if (FreeMap)
250+
{
251+
free(FreeMap);
252+
FreeMap = Nil(FreeMapType);
253+
}
254+
#endif
248255
if (Arena)
249256
free(Arena);
250257
if ((Arena=nNew(Size, char)) == Nil(char)) {
@@ -260,11 +267,6 @@ size_t fxfInit(size_t Size) {
260267
GlobalSize= Size;
261268

262269
#if defined(FREEMAP)
263-
if (FreeMap)
264-
{
265-
free(FreeMap);
266-
}
267-
268270
/* We aren't using Size again, so we can change it to the value we need here. */
269271
if (Size > (((size_t)-1)-31))
270272
{

‎EXAMPLES/snek.inp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,11 @@ stip #4
119119
condition snekcircle
120120
option vari
121121

122-
end
122+
next
123+
124+
stip H#2
125+
condition snekchess
126+
pieces white Kf5 rb5 bb6 pd6 black Kd4 Sc5
127+
128+
End
129+

‎EXAMPLES/total_invisible.inp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,21 @@ origin Julia's Fairies 2019 - 15.12.2019 - No. 1463
168168
pieces total 4 white ke1 black kg4 pf4h3 neutral qh1 pg2
169169
stipulation h#2.5
170170

171+
next
172+
173+
author Thomas Maeder
174+
origin Probleemblad 2020
175+
pieces total 3 white Ka4 Qh7 Rg6c7e2 Bc5 Pd2h3e5h4 black Kg1 Ph5f3
176+
stipulation h#2
177+
twin move a4 h6
178+
179+
next
180+
181+
author Thomas Maeder
182+
origin -> Probleemblad 2020 (cooked earlier version)
183+
pieces total 4 white Kh2 Qe4 Ra3h3 Bg7 Sb2b6 black Kc3 Sd2
184+
stipulation h#2
185+
twin move h2 f8
186+
171187
end
172188

0 commit comments

Comments
 (0)