Skip to content

Commit bf4dce1

Browse files
author
Thomas Maeder
committed
Merge branch 'master' into release/v4.91
2 parents 430a5d9 + efce02b commit bf4dce1

File tree

9 files changed

+1089
-3682
lines changed

9 files changed

+1089
-3682
lines changed

conditions/depend

Lines changed: 233 additions & 1386 deletions
Large diffs are not rendered by default.

input/plaintext/depend

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ input/plaintext/condition$(OBJ_SUFFIX): input/plaintext/condition.c \
789789
pieces/walks/pawns/promotee_sequence.h pieces/attributes/chameleon.h \
790790
pieces/attributes/neutral/neutral.h conditions/annan.h \
791791
conditions/anticirce/cheylan.h conditions/bgl.h conditions/bolero.h \
792-
conditions/breton.h conditions/cast.h conditions/circe/april.h \
792+
conditions/breton.h conditions/circe/april.h \
793793
conditions/circe/rex_inclusive.h conditions/circe/chameleon.h \
794794
conditions/circe/assassin.h conditions/circe/parrain.h \
795795
conditions/dister.h conditions/football.h conditions/geneva.h \
@@ -801,13 +801,11 @@ input/plaintext/condition$(OBJ_SUFFIX): input/plaintext/condition.c \
801801
debugging/measure.h output/plaintext/protocol.h \
802802
conditions/marscirce/anti.h conditions/marscirce/phantom.h \
803803
conditions/messigny.h conditions/oscillating_kings.h \
804-
conditions/protean.h conditions/frankfurt.h conditions/republican.h \
805-
conditions/sat.h conditions/singlebox/type1.h \
804+
conditions/protean.h conditions/republican.h conditions/sat.h \
805+
conditions/singlebox/type1.h \
806806
conditions/transmuting_kings/vaulting_kings.h conditions/woozles.h \
807-
conditions/role_exchange.h conditions/multicaptures.h \
808-
conditions/powertransfer.h conditions/take_and_make.h \
809-
pieces/walks/pawns/en_passant.h solving/castling.h solving/pipe.h \
810-
debugging/assert.h
807+
conditions/role_exchange.h pieces/walks/pawns/en_passant.h \
808+
solving/castling.h solving/pipe.h debugging/assert.h
811809
input/plaintext/condition.h:
812810
stipulation/stipulation.h:
813811
stipulation/goals/goals.h:
@@ -879,7 +877,6 @@ conditions/anticirce/cheylan.h:
879877
conditions/bgl.h:
880878
conditions/bolero.h:
881879
conditions/breton.h:
882-
conditions/cast.h:
883880
conditions/circe/april.h:
884881
conditions/circe/rex_inclusive.h:
885882
conditions/circe/chameleon.h:
@@ -909,16 +906,12 @@ conditions/marscirce/phantom.h:
909906
conditions/messigny.h:
910907
conditions/oscillating_kings.h:
911908
conditions/protean.h:
912-
conditions/frankfurt.h:
913909
conditions/republican.h:
914910
conditions/sat.h:
915911
conditions/singlebox/type1.h:
916912
conditions/transmuting_kings/vaulting_kings.h:
917913
conditions/woozles.h:
918914
conditions/role_exchange.h:
919-
conditions/multicaptures.h:
920-
conditions/powertransfer.h:
921-
conditions/take_and_make.h:
922915
pieces/walks/pawns/en_passant.h:
923916
solving/castling.h:
924917
solving/pipe.h:

optimisations/depend

Lines changed: 65 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ optimisations/immobility_tester_king_first$(OBJ_SUFFIX): \
1717
stipulation/slice_contextual_type.enum.h \
1818
stipulation/slice_contextual_type.enum stipulation/traversal.h \
1919
conditions/mummer.h solving/machinery/solve.h \
20-
solving/machinery/dispatch.h debugging/trace.h position/position.h \
21-
position/color.h position/color.enum.h position/color.enum \
22-
position/pieceid.h pieces/walks/vectors.h position/castling_rights.h \
23-
solving/ply.h stipulation/proxy.h stipulation/pipe.h \
24-
stipulation/branch.h stipulation/boolean/and.h \
20+
solving/machinery/dispatch.h debugging/trace.h stipulation/proxy.h \
21+
stipulation/pipe.h stipulation/branch.h stipulation/boolean/and.h \
2522
solving/king_move_generator.h solving/non_king_move_generator.h \
2623
debugging/assert.h
2724
stipulation/goals/immobile/reached_tester.h:
@@ -56,14 +53,6 @@ conditions/mummer.h:
5653
solving/machinery/solve.h:
5754
solving/machinery/dispatch.h:
5855
debugging/trace.h:
59-
position/position.h:
60-
position/color.h:
61-
position/color.enum.h:
62-
position/color.enum:
63-
position/pieceid.h:
64-
pieces/walks/vectors.h:
65-
position/castling_rights.h:
66-
solving/ply.h:
6756
stipulation/proxy.h:
6857
stipulation/pipe.h:
6958
stipulation/branch.h:
@@ -81,8 +70,8 @@ optimisations/keepmating$(OBJ_SUFFIX): optimisations/keepmating.c \
8170
solving/machinery/dispatch.h debugging/trace.h position/position.h \
8271
position/color.h position/color.enum.h position/color.enum \
8372
position/pieceid.h pieces/walks/vectors.h position/castling_rights.h \
84-
solving/ply.h stipulation/pipe.h stipulation/structure_traversal.h \
85-
stipulation/slice.h stipulation/slice_structural_type.h \
73+
stipulation/pipe.h stipulation/structure_traversal.h stipulation/slice.h \
74+
stipulation/slice_structural_type.h \
8675
stipulation/slice_structural_type.enum.h \
8776
stipulation/slice_structural_type.enum \
8877
stipulation/slice_functional_type.h \
@@ -119,7 +108,6 @@ position/color.enum:
119108
position/pieceid.h:
120109
pieces/walks/vectors.h:
121110
position/castling_rights.h:
122-
solving/ply.h:
123111
stipulation/pipe.h:
124112
stipulation/structure_traversal.h:
125113
stipulation/slice.h:
@@ -145,17 +133,16 @@ optimisations/hash$(OBJ_SUFFIX): optimisations/hash.c debugging/assert.h \
145133
stipulation/slice_type.h stipulation/slice_type.enum.h \
146134
stipulation/slice_type.enum position/side.h position/side.enum.h \
147135
position/side.enum output/mode.h output/mode.enum.h output/mode.enum \
148-
solving/machinery/dispatch.h debugging/trace.h position/position.h \
149-
position/color.h position/color.enum.h position/color.enum \
150-
position/pieceid.h pieces/walks/vectors.h position/castling_rights.h \
151-
solving/ply.h position/underworld.h solving/move_effect_journal.h \
152-
conditions/bgl.h conditions/fuddled_men.h output/plaintext/message.h \
153-
output/message.h input/plaintext/language.h solving/proofgames.h \
154-
DHT/dhtvalue.h DHT/fxf.h DHT/dht.h DHT/fxf.h \
155-
pieces/walks/pawns/en_passant.h solving/observation.h \
156-
solving/temporary_hacks.h solving/fork.h conditions/circe/circe.h \
157-
stipulation/structure_traversal.h stipulation/slice.h \
158-
stipulation/slice_structural_type.h \
136+
solving/machinery/dispatch.h debugging/trace.h solving/ply.h \
137+
output/plaintext/message.h output/message.h input/plaintext/language.h \
138+
solving/proofgames.h position/position.h position/color.h \
139+
position/color.enum.h position/color.enum position/pieceid.h \
140+
pieces/walks/vectors.h position/castling_rights.h \
141+
solving/move_effect_journal.h DHT/dhtvalue.h DHT/fxf.h DHT/dht.h \
142+
DHT/fxf.h pieces/walks/pawns/en_passant.h solving/observation.h \
143+
solving/temporary_hacks.h solving/fork.h conditions/bgl.h \
144+
conditions/circe/circe.h stipulation/structure_traversal.h \
145+
stipulation/slice.h stipulation/slice_structural_type.h \
159146
stipulation/slice_structural_type.enum.h \
160147
stipulation/slice_structural_type.enum \
161148
stipulation/slice_functional_type.h \
@@ -170,14 +157,15 @@ optimisations/hash$(OBJ_SUFFIX): optimisations/hash.c debugging/assert.h \
170157
conditions/circe/relevant_capture.h conditions/circe/relevant_piece.h \
171158
conditions/circe/relevant_side.h conditions/circe/parachute.h \
172159
conditions/duellists.h conditions/mummer.h conditions/haunted_chess.h \
173-
conditions/imitator.h options/nontrivial.h solving/avoid_unsolvable.h \
174-
solving/castling.h solving/machinery/slack_length.h \
175-
solving/has_solution_type.h solving/has_solution_type.enum.h \
176-
solving/has_solution_type.enum stipulation/proxy.h stipulation/pipe.h \
177-
stipulation/battle_play/branch.h stipulation/help_play/branch.h \
178-
stipulation/branch.h platform/maxtime.h platform/maxmem.h solving/pipe.h \
179-
pieces/attributes/neutral/neutral.h options/options.h \
180-
conditions/conditions.h position/effects/piece_movement.h
160+
position/underworld.h conditions/imitator.h options/nontrivial.h \
161+
solving/avoid_unsolvable.h solving/castling.h \
162+
solving/machinery/slack_length.h solving/has_solution_type.h \
163+
solving/has_solution_type.enum.h solving/has_solution_type.enum \
164+
stipulation/proxy.h stipulation/pipe.h stipulation/battle_play/branch.h \
165+
stipulation/help_play/branch.h stipulation/branch.h platform/maxtime.h \
166+
platform/maxmem.h solving/pipe.h pieces/attributes/neutral/neutral.h \
167+
options/options.h conditions/conditions.h \
168+
position/effects/piece_movement.h
181169
debugging/assert.h:
182170
optimisations/hash.h:
183171
DHT/dhtbcmem.h:
@@ -199,22 +187,19 @@ output/mode.enum.h:
199187
output/mode.enum:
200188
solving/machinery/dispatch.h:
201189
debugging/trace.h:
190+
solving/ply.h:
191+
output/plaintext/message.h:
192+
output/message.h:
193+
input/plaintext/language.h:
194+
solving/proofgames.h:
202195
position/position.h:
203196
position/color.h:
204197
position/color.enum.h:
205198
position/color.enum:
206199
position/pieceid.h:
207200
pieces/walks/vectors.h:
208201
position/castling_rights.h:
209-
solving/ply.h:
210-
position/underworld.h:
211202
solving/move_effect_journal.h:
212-
conditions/bgl.h:
213-
conditions/fuddled_men.h:
214-
output/plaintext/message.h:
215-
output/message.h:
216-
input/plaintext/language.h:
217-
solving/proofgames.h:
218203
DHT/dhtvalue.h:
219204
DHT/fxf.h:
220205
DHT/dht.h:
@@ -223,6 +208,7 @@ pieces/walks/pawns/en_passant.h:
223208
solving/observation.h:
224209
solving/temporary_hacks.h:
225210
solving/fork.h:
211+
conditions/bgl.h:
226212
conditions/circe/circe.h:
227213
stipulation/structure_traversal.h:
228214
stipulation/slice.h:
@@ -248,6 +234,7 @@ conditions/circe/parachute.h:
248234
conditions/duellists.h:
249235
conditions/mummer.h:
250236
conditions/haunted_chess.h:
237+
position/underworld.h:
251238
conditions/imitator.h:
252239
options/nontrivial.h:
253240
solving/avoid_unsolvable.h:
@@ -279,10 +266,10 @@ optimisations/orthodox_square_observation$(OBJ_SUFFIX): \
279266
stipulation/slice_type.enum.h stipulation/slice_type.enum \
280267
pieces/pieces.h output/mode.h output/mode.enum.h output/mode.enum \
281268
solving/machinery/dispatch.h solving/ply.h debugging/trace.h \
282-
position/position.h position/color.h position/color.enum.h \
283-
position/color.enum position/pieceid.h position/castling_rights.h \
284269
solving/temporary_hacks.h solving/fork.h solving/machinery/solve.h \
285-
pieces/walks/pawns/en_passant.h solving/move_effect_journal.h
270+
pieces/walks/pawns/en_passant.h solving/move_effect_journal.h \
271+
position/castling_rights.h position/pieceid.h position/position.h \
272+
position/color.h position/color.enum.h position/color.enum
286273
optimisations/orthodox_square_observation.h:
287274
position/side.h:
288275
position/side.enum.h:
@@ -305,17 +292,17 @@ output/mode.enum:
305292
solving/machinery/dispatch.h:
306293
solving/ply.h:
307294
debugging/trace.h:
308-
position/position.h:
309-
position/color.h:
310-
position/color.enum.h:
311-
position/color.enum:
312-
position/pieceid.h:
313-
position/castling_rights.h:
314295
solving/temporary_hacks.h:
315296
solving/fork.h:
316297
solving/machinery/solve.h:
317298
pieces/walks/pawns/en_passant.h:
318299
solving/move_effect_journal.h:
300+
position/castling_rights.h:
301+
position/pieceid.h:
302+
position/position.h:
303+
position/color.h:
304+
position/color.enum.h:
305+
position/color.enum:
319306
optimisations/orthodox_check_directions$(OBJ_SUFFIX): \
320307
optimisations/orthodox_check_directions.c \
321308
optimisations/orthodox_check_directions.h stipulation/stipulation.h \
@@ -327,7 +314,7 @@ optimisations/orthodox_check_directions$(OBJ_SUFFIX): \
327314
position/position.h position/color.h position/color.enum.h \
328315
position/color.enum position/pieceid.h position/castling_rights.h \
329316
solving/pipe.h solving/machinery/solve.h solving/machinery/dispatch.h \
330-
debugging/trace.h solving/ply.h
317+
debugging/trace.h
331318
optimisations/orthodox_check_directions.h:
332319
stipulation/stipulation.h:
333320
stipulation/goals/goals.h:
@@ -355,18 +342,17 @@ solving/pipe.h:
355342
solving/machinery/solve.h:
356343
solving/machinery/dispatch.h:
357344
debugging/trace.h:
358-
solving/ply.h:
359345
optimisations/detect_retraction$(OBJ_SUFFIX): optimisations/detect_retraction.c \
360346
optimisations/detect_retraction.h solving/machinery/solve.h \
361347
stipulation/stipulation.h stipulation/goals/goals.h position/board.h \
362348
utilities/bitmask.h utilities/boolean.h stipulation/slice_type.h \
363349
stipulation/slice_type.enum.h stipulation/slice_type.enum \
364350
position/side.h position/side.enum.h position/side.enum pieces/pieces.h \
365351
output/mode.h output/mode.enum.h output/mode.enum \
366-
solving/machinery/dispatch.h debugging/trace.h position/position.h \
367-
position/color.h position/color.enum.h position/color.enum \
368-
position/pieceid.h pieces/walks/vectors.h position/castling_rights.h \
369-
solving/ply.h solving/move_generator.h stipulation/structure_traversal.h \
352+
solving/machinery/dispatch.h debugging/trace.h solving/move_generator.h \
353+
solving/ply.h debugging/measure.h output/plaintext/protocol.h \
354+
solving/move_effect_journal.h position/castling_rights.h \
355+
position/pieceid.h stipulation/pipe.h stipulation/structure_traversal.h \
370356
stipulation/slice.h stipulation/slice_structural_type.h \
371357
stipulation/slice_structural_type.enum.h \
372358
stipulation/slice_structural_type.enum \
@@ -376,7 +362,6 @@ optimisations/detect_retraction$(OBJ_SUFFIX): optimisations/detect_retraction.c
376362
stipulation/slice_contextual_type.h \
377363
stipulation/slice_contextual_type.enum.h \
378364
stipulation/slice_contextual_type.enum stipulation/traversal.h \
379-
debugging/measure.h solving/move_effect_journal.h stipulation/pipe.h \
380365
stipulation/move.h solving/machinery/slack_length.h solving/pipe.h \
381366
stipulation/proxy.h stipulation/slice_insertion.h debugging/assert.h
382367
optimisations/detect_retraction.h:
@@ -398,15 +383,14 @@ output/mode.enum.h:
398383
output/mode.enum:
399384
solving/machinery/dispatch.h:
400385
debugging/trace.h:
401-
position/position.h:
402-
position/color.h:
403-
position/color.enum.h:
404-
position/color.enum:
405-
position/pieceid.h:
406-
pieces/walks/vectors.h:
407-
position/castling_rights.h:
408-
solving/ply.h:
409386
solving/move_generator.h:
387+
solving/ply.h:
388+
debugging/measure.h:
389+
output/plaintext/protocol.h:
390+
solving/move_effect_journal.h:
391+
position/castling_rights.h:
392+
position/pieceid.h:
393+
stipulation/pipe.h:
410394
stipulation/structure_traversal.h:
411395
stipulation/slice.h:
412396
stipulation/slice_structural_type.h:
@@ -419,9 +403,6 @@ stipulation/slice_contextual_type.h:
419403
stipulation/slice_contextual_type.enum.h:
420404
stipulation/slice_contextual_type.enum:
421405
stipulation/traversal.h:
422-
debugging/measure.h:
423-
solving/move_effect_journal.h:
424-
stipulation/pipe.h:
425406
stipulation/move.h:
426407
solving/machinery/slack_length.h:
427408
solving/pipe.h:
@@ -436,13 +417,14 @@ optimisations/observation$(OBJ_SUFFIX): optimisations/observation.c \
436417
position/side.h position/side.enum.h position/side.enum pieces/pieces.h \
437418
output/mode.h output/mode.enum.h output/mode.enum solving/observation.h \
438419
solving/machinery/dispatch.h pieces/walks/vectors.h solving/ply.h \
439-
debugging/trace.h position/position.h position/color.h \
440-
position/color.enum.h position/color.enum position/pieceid.h \
441-
position/castling_rights.h solving/temporary_hacks.h solving/fork.h \
442-
solving/machinery/solve.h conditions/conditions.h \
420+
debugging/trace.h solving/temporary_hacks.h solving/fork.h \
421+
solving/machinery/solve.h conditions/conditions.h position/position.h \
422+
position/color.h position/color.enum.h position/color.enum \
423+
position/pieceid.h position/castling_rights.h \
443424
conditions/singlebox/type1.h \
444425
solving/find_square_observer_tracking_back_from_target.h \
445-
solving/move_generator.h stipulation/structure_traversal.h \
426+
solving/move_generator.h debugging/measure.h output/plaintext/protocol.h \
427+
solving/pipe.h stipulation/branch.h stipulation/structure_traversal.h \
446428
stipulation/slice.h stipulation/slice_structural_type.h \
447429
stipulation/slice_structural_type.enum.h \
448430
stipulation/slice_structural_type.enum \
@@ -452,7 +434,6 @@ optimisations/observation$(OBJ_SUFFIX): optimisations/observation.c \
452434
stipulation/slice_contextual_type.h \
453435
stipulation/slice_contextual_type.enum.h \
454436
stipulation/slice_contextual_type.enum stipulation/traversal.h \
455-
debugging/measure.h solving/pipe.h stipulation/branch.h \
456437
stipulation/pipe.h
457438
optimisations/observation.h:
458439
stipulation/stipulation.h:
@@ -475,19 +456,23 @@ solving/machinery/dispatch.h:
475456
pieces/walks/vectors.h:
476457
solving/ply.h:
477458
debugging/trace.h:
459+
solving/temporary_hacks.h:
460+
solving/fork.h:
461+
solving/machinery/solve.h:
462+
conditions/conditions.h:
478463
position/position.h:
479464
position/color.h:
480465
position/color.enum.h:
481466
position/color.enum:
482467
position/pieceid.h:
483468
position/castling_rights.h:
484-
solving/temporary_hacks.h:
485-
solving/fork.h:
486-
solving/machinery/solve.h:
487-
conditions/conditions.h:
488469
conditions/singlebox/type1.h:
489470
solving/find_square_observer_tracking_back_from_target.h:
490471
solving/move_generator.h:
472+
debugging/measure.h:
473+
output/plaintext/protocol.h:
474+
solving/pipe.h:
475+
stipulation/branch.h:
491476
stipulation/structure_traversal.h:
492477
stipulation/slice.h:
493478
stipulation/slice_structural_type.h:
@@ -500,7 +485,4 @@ stipulation/slice_contextual_type.h:
500485
stipulation/slice_contextual_type.enum.h:
501486
stipulation/slice_contextual_type.enum:
502487
stipulation/traversal.h:
503-
debugging/measure.h:
504-
solving/pipe.h:
505-
stipulation/branch.h:
506488
stipulation/pipe.h:

0 commit comments

Comments
 (0)