Skip to content

Commit

Permalink
Merge branch 'release/4.87'
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-maeder committed Jun 26, 2021
2 parents 682c32d + 0b31713 commit 0abdeef
Show file tree
Hide file tree
Showing 195 changed files with 8,537 additions and 3,931 deletions.
104 changes: 103 additions & 1 deletion BEISPIEL/intell.inp
Original file line number Diff line number Diff line change
Expand Up @@ -1469,4 +1469,106 @@ zwilling verse e5 d6
zwilling verse d7 d6
zwilling verse d7 d5

endeproblem
weiteresproblem

auto TLi
quel 2559, Probleemblad 52/3, 5-6/1994
ausz 7. eE
ford reci-h#3
stei
weis kc3 dc1 te6 le4 bb4d2d4e3
schw kg6 dg3 sf5f6 bd5f2f7
opti intel zugn
zwil verse c3 b7

weiter

auto TLi Pachl Manhart
quel 994, Europa-Rochade 8/1992
ausz 1. eE
ford reci-h#3
stei
weis kh5 ta3 la8 be3
schw kc4 ta5b3 lc6g5 sh1 ba4b6c5
opti intel zugn
nullstellung verse h5 f1
zwil verse e3 c2

weiter

auto TLi
quel 2113, Gaudium 235, 24.12.2020
ford reci-h#7
stei
weis kc7 lf3
schw kc5 bh4g7 df6
opti intel zugn

weiter

auto TLi
quel FA1937, StrateGems 92, 10-12/2020
ford reci-h#8
stei
weis kh1 le5
schw kd3 de2 sa3 td2
opti intel zugn

weiter

autor Theodor Steudel
quelle t1, Problemkiste 92, 4/1994
forderung reci-h(=)#3
steine weiss kh1 bg7
schwarz kf1 be3
opti intel zugn

weiteresproblem

autor Theodor Steudel
quelle t2, Problemkiste 92, 4/1994
forderung reci-h(=)#3
steine weiss kh1 ba7
schwarz kf1 bb3
opti intel zugn

weiteresproblem

autor Theodor Steudel
quelle t4, Problemkiste 92, 4/1994
forderung reci-h(#)=2
steine weiss kh1 be7
schwarz kf1 be2
opti intel zugn

weiteresproblem

autor Theodor Steudel
quelle t5, Problemkiste 92, 4/1994
forderung reci-h(#)=3
steine weiss kf1 be7
schwarz kh1 bd3
opti intel zugn

weiteresproblem

autor Theodor Steudel
quelle t6, Problemkiste 92, 4/1994
forderung reci-h(#)=3
steine weiss kh3 bh7
schwarz kh1 bd3
opti intel zugn

weiteresproblem

autor Louis Azemard
autor Manuel Mu\~noz
quelle spez. ehr. Erw., RIFACE 1991
forderung ser-reci-h(=)#7
steine weiss ka8 dh7
schwarz kc8 bh5
opti intel zugn
zwill versetze h5 d7 ford ser-reci-h(#)=7

ende

35 changes: 35 additions & 0 deletions BEISPIEL/lengthy/intelligent_lengthy.inp
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
anfang

protokoll intelligent_lengthy.out

auto TLi
quel 8951, Phenix 312, 11/2020
ford reci-h#12
stei
weis kb5 bg2
schw kc1 bb7g7
opti intel zugn

weiter

auto TLi
quel 8952, Phenix 312, 11/2020
ford reci-h#13
stei
weis kb3 bh2
schw kd8 bf7h7
opti intel zugn

weiter

beme takes way too long
auto TLi
quel 18421, Die Schwalbe 306-1, 12/2020
ford reci-h#14.5
stei
weis kb6 bd2 te3
schw kd4 lb4
opti intel zugn

ende

98 changes: 98 additions & 0 deletions BEISPIEL/rollentausch.inp
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
anfang

protokoll rollentausch.out

autor Wolfang Erben
steine weiss kb8 schwar kb6 tc5
bedingung rollentausch
forderung #2
option vari

weiter

autor Wolfang Erben
steine weiss kb8 df1 schwarz kb6 tc5
forderung #3
bedingung rollentausch
option varianten

weiter

autor Wolfang Erben
steine weiss kb8 dh4 schwarz ka6 tc5
forderung #4
bedingung rollentausch
option varianten

weiter

autor Wolfgang Erben
bemerkung keine loesung, weil nur 1 rollentausch erlaubt ist
steine weiss kh1 bb5d6g6 schwarz kc8 bd7g7
bedingung rollentausch 1
forderung #8
option varianten ohnekurzvarianten

weiter

autor Wolfgang Erben
steine weiss kh1 bb5d6g6 schwarz kc8 bd7g7
bedingung rollentausch 2
forderung #8
option varianten ohnekurzvarianten

weiter

autor Wolfgang Erben
steine weiss kh1 bb4d6g6 schwarz kd8 bd7g7
bedingung rollentausch
forderung #9
option varianten ohnekurzvarianten

weiter

autor Wolfgang Erben
steine weiss kg1 ba6b6c6 schwar ka8 bf3g2g3h3
bemerkung Rollentausch in Mattstellung
bedingung rollentausch
forderung #2
option vari

weiter

autor Wolfgang Erben
steine weiss kh1 ba6b6c6 schwar ka8 bf3g2g3h3
bemerkung Rollentausch mit Koenig im Schach
bedingung rollentausch
forderung #2
option vari

weiter

autor Wolfgang Erben
steine weiss kg1 ba6b6c6 schwar ka8 bf3g2g3h3d6
bemerkung Rollentausch in Mattstellung
bedingung rollentausch
forderung #2
option vari

weiter

autor Wolfgang Erben
bemerkung Schwarz verteidigt durch Matt des weissen Koenigs
steine weiss kg1 ba6b6c6 schwar ka8 bf3g2g3h3d6
bedingung rollentausch
forderung #2
option vari ohnedroh zielistende

weiter

autor Wolfgang Erben
bemerkung ... auch gegen Drohung
steine weiss kg1 ba6b6c7 schwar ka8 bf3g2g3h3d6
bedingung rollentausch
forderung #2
option nachschlu zielistende

end

4 changes: 4 additions & 0 deletions DHT/dht.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ static InternHsElement *stepDirTable(dirEnumerate *enumeration)
if (di==0)
enumeration->current= (ht_dir*)accessAdr(enumeration->dt,
enumeration->index);
assert(enumeration->current!=0);
enumeration->index++;
TraceValue("%p",(void *)enumeration->current);
TraceValue("%p",(void *)*enumeration->current);
Expand Down Expand Up @@ -731,6 +732,7 @@ LOCAL dhtStatus ExpandHashTable(HashTable *ht)
TraceValue("%lu ",newp);
TraceValue("%p",(void *)newPointer);
TraceEOL();
assert(oldPointer!=0);
while (*oldPointer)
{
InternHsElement const *oldElmt = *oldPointer;
Expand Down Expand Up @@ -782,6 +784,7 @@ LOCAL void ShrinkHashTable(HashTable *ht)
oldp= ht->p + ht->maxp;
oldPointer= (InternHsElement**)accessAdr(&ht->DirTab, oldp);

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

assert(phe!=0);
while (*phe)
if ((ht->procs.Equal)((*phe)->HsEl.Key, key))
{
Expand Down
20 changes: 11 additions & 9 deletions DHT/fxf.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static FreeMapType *FreeMap;
} \
} while (0)

void SetRange(size_t x, size_t l) {
static void SetRange(size_t x, size_t l) {
if (FreeMap) {
size_t xi= x>>5, y= x+l, yi= y>>5;
if (xi==yi)
Expand All @@ -186,7 +186,7 @@ void SetRange(size_t x, size_t l) {
}
}

void ClrRange(size_t x, size_t l) {
static void ClrRange(size_t x, size_t l) {
if (FreeMap) {
size_t xi= x>>5, y= x+l, yi= y>>5;
if (xi==yi)
Expand Down Expand Up @@ -216,8 +216,8 @@ void PrintFreeMap(FILE *f) {
}
}
#else
# define SetRange(x,l) ((void)(x, l))
# define ClrRange(x,l) ((void)(x, l))
static void SetRange(size_t x, size_t l) { (void) x; (void) l; }
static void ClrRange(size_t x, size_t l) { (void) x; (void) l; }
#endif /*FREEMAP, !SEGMENTED*/

size_t fxfInit(size_t Size) {
Expand Down Expand Up @@ -245,6 +245,13 @@ size_t fxfInit(size_t Size) {
TopFreePtr+= ARENA_SEG_SIZE;
GlobalSize= ArenaSegCnt*ARENA_SEG_SIZE;
#else
#if defined(FREEMAP)
if (FreeMap)
{
free(FreeMap);
FreeMap = Nil(FreeMapType);
}
#endif
if (Arena)
free(Arena);
if ((Arena=nNew(Size, char)) == Nil(char)) {
Expand All @@ -260,11 +267,6 @@ size_t fxfInit(size_t Size) {
GlobalSize= Size;

#if defined(FREEMAP)
if (FreeMap)
{
free(FreeMap);
}

/* We aren't using Size again, so we can change it to the value we need here. */
if (Size > (((size_t)-1)-31))
{
Expand Down
9 changes: 8 additions & 1 deletion EXAMPLES/snek.inp
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,11 @@ stip #4
condition snekcircle
option vari

end
next

stip H#2
condition snekchess
pieces white Kf5 rb5 bb6 pd6 black Kd4 Sc5

End

16 changes: 16 additions & 0 deletions EXAMPLES/total_invisible.inp
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,21 @@ origin Julia's Fairies 2019 - 15.12.2019 - No. 1463
pieces total 4 white ke1 black kg4 pf4h3 neutral qh1 pg2
stipulation h#2.5

next

author Thomas Maeder
origin Probleemblad 2020
pieces total 3 white Ka4 Qh7 Rg6c7e2 Bc5 Pd2h3e5h4 black Kg1 Ph5f3
stipulation h#2
twin move a4 h6

next

author Thomas Maeder
origin -> Probleemblad 2020 (cooked earlier version)
pieces total 4 white Kh2 Qe4 Ra3h3 Bg7 Sb2b6 black Kc3 Sd2
stipulation h#2
twin move h2 f8

end

Loading

0 comments on commit 0abdeef

Please sign in to comment.