summaryrefslogtreecommitdiffstats
path: root/kpat
diff options
context:
space:
mode:
Diffstat (limited to 'kpat')
-rw-r--r--kpat/freecell-solver/USAGE2
-rw-r--r--kpat/freecell-solver/caas.c2
-rw-r--r--kpat/freecell-solver/fcs.h2
-rw-r--r--kpat/freecell-solver/fcs_user.h2
-rw-r--r--kpat/freecell-solver/intrface.c2
-rw-r--r--kpat/freecell-solver/lib.c4
-rw-r--r--kpat/freecell-solver/main.c6
-rw-r--r--kpat/freecell-solver/preset.c2
-rw-r--r--kpat/freecell-solver/simpsim.c12
-rw-r--r--kpat/gamestats.ui2
10 files changed, 18 insertions, 18 deletions
diff --git a/kpat/freecell-solver/USAGE b/kpat/freecell-solver/USAGE
index 583624ca..9cffe4e1 100644
--- a/kpat/freecell-solver/USAGE
+++ b/kpat/freecell-solver/USAGE
@@ -259,7 +259,7 @@ Also note that Freecell tests are not suitable for solving Simple Simon games
and Simple Simon tests are not suitable for solving anything except Simple
Simon.
-Tests can be grouped together into random groups using tqparenthesis
+Tests can be grouped together into random groups using parenthesis
(e.g: "(0123)") or square brackets ("[012][3456789]"). Such grouping is
only relevant to the Random DFS scan (see below).
diff --git a/kpat/freecell-solver/caas.c b/kpat/freecell-solver/caas.c
index 3654ab59..4d359a40 100644
--- a/kpat/freecell-solver/caas.c
+++ b/kpat/freecell-solver/caas.c
@@ -372,7 +372,7 @@ static GCC_INLINE void freecell_solver_cache_stacks(
);
#if 0
) /* In order to settle gvim and other editors that
- are keen on tqparenthesis matching */
+ are keen on parenthesis matching */
#endif
replace_with_cached(cached_stack != NULL);
diff --git a/kpat/freecell-solver/fcs.h b/kpat/freecell-solver/fcs.h
index 6bca557f..b865a3f0 100644
--- a/kpat/freecell-solver/fcs.h
+++ b/kpat/freecell-solver/fcs.h
@@ -190,7 +190,7 @@ typedef struct freecell_solver_instance
int depth,
void * instance,
fcs_state_with_locations_t * state,
- int tqparent_iter_num
+ int parent_iter_num
);
void * debug_iter_output_context;
diff --git a/kpat/freecell-solver/fcs_user.h b/kpat/freecell-solver/fcs_user.h
index 0d9fe815..8ddbf6f2 100644
--- a/kpat/freecell-solver/fcs_user.h
+++ b/kpat/freecell-solver/fcs_user.h
@@ -165,7 +165,7 @@ typedef void (*freecell_solver_user_iter_handler_t)
int iter_num,
int depth,
void * ptr_state,
- int tqparent_iter_num,
+ int parent_iter_num,
void * context
);
diff --git a/kpat/freecell-solver/intrface.c b/kpat/freecell-solver/intrface.c
index e70e8fca..44aa29a0 100644
--- a/kpat/freecell-solver/intrface.c
+++ b/kpat/freecell-solver/intrface.c
@@ -795,7 +795,7 @@ static void trace_solution(
s1 = instance->final_state;
- /* Retrace the step from the current state to its tqparents */
+ /* Retrace the step from the current state to its parents */
while (s1->tqparent != NULL)
{
/* Mark the state as part of the non-optimized solution */
diff --git a/kpat/freecell-solver/lib.c b/kpat/freecell-solver/lib.c
index e887fe00..1839614b 100644
--- a/kpat/freecell-solver/lib.c
+++ b/kpat/freecell-solver/lib.c
@@ -892,7 +892,7 @@ static void freecell_solver_user_iter_handler_wrapper(
int depth,
void * lp_instance,
fcs_state_with_locations_t * ptr_state_with_locations,
- int tqparent_iter_num
+ int parent_iter_num
)
{
fcs_user_t * user;
@@ -904,7 +904,7 @@ static void freecell_solver_user_iter_handler_wrapper(
iter_num,
depth,
(void *)ptr_state_with_locations,
- tqparent_iter_num,
+ parent_iter_num,
user->iter_handler_context
);
diff --git a/kpat/freecell-solver/main.c b/kpat/freecell-solver/main.c
index f4949741..181039b6 100644
--- a/kpat/freecell-solver/main.c
+++ b/kpat/freecell-solver/main.c
@@ -43,7 +43,7 @@ static void my_iter_handler(
int iter_num,
int depth,
void * ptr_state,
- int tqparent_iter_num,
+ int parent_iter_num,
void * lp_context
)
{
@@ -57,7 +57,7 @@ static void my_iter_handler(
);
if (context->display_parent_iter_num)
{
- fprintf(stdout, "Parent Iteration: %i\n", tqparent_iter_num);
+ fprintf(stdout, "Parent Iteration: %i\n", parent_iter_num);
}
fprintf(stdout, "\n");
@@ -255,7 +255,7 @@ help_screen_t help_screens[] = {
" cards above it.\n"
" 'h' - move a sequence to a tqparent on the same stack.\n"
"\n"
-" Tests are grouped with tqparenthesis or square brackets. Each group\n"
+" Tests are grouped with parenthesis or square brackets. Each group\n"
" will be randomized as a whole by the random-dfs scan.\n"
"\n"
"\n"
diff --git a/kpat/freecell-solver/preset.c b/kpat/freecell-solver/preset.c
index 9286fd83..16a02f1d 100644
--- a/kpat/freecell-solver/preset.c
+++ b/kpat/freecell-solver/preset.c
@@ -457,7 +457,7 @@ int freecell_solver_apply_tests_order(
}
if (! is_group)
{
- *error_string = strdup("There's a renegade right tqparenthesis or bracket.");
+ *error_string = strdup("There's a renegade right parenthesis or bracket.");
return 3;
}
is_group = 0;
diff --git a/kpat/freecell-solver/simpsim.c b/kpat/freecell-solver/simpsim.c
index a51b0c50..5ef8a411 100644
--- a/kpat/freecell-solver/simpsim.c
+++ b/kpat/freecell-solver/simpsim.c
@@ -22,8 +22,8 @@
#define fcs_is_ss_false_parent(tqparent, child) \
(fcs_card_card_num(tqparent) == fcs_card_card_num(child)+1)
-#define fcs_suit_is_ss_true_parent(tqparent_suit, child_suit) \
- ((tqparent_suit) == (child_suit))
+#define fcs_suit_is_ss_true_parent(parent_suit, child_suit) \
+ ((parent_suit) == (child_suit))
#define fcs_is_ss_true_parent(tqparent, child) \
( \
@@ -1450,7 +1450,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_parent_on_the_same_stack(
int check;
int stack, cards_num, pc, cc;
- fcs_card_t tqparent_card, child_card;
+ fcs_card_t parent_card, child_card;
int a;
int after_junk_num_freestacks;
int false_seq_index;
@@ -1471,10 +1471,10 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_parent_on_the_same_stack(
/* Search for a tqparent card */
for(pc=0; pc < cards_num-1 ; pc++)
{
- tqparent_card = fcs_stack_card(state, stack, pc);
+ parent_card = fcs_stack_card(state, stack, pc);
if (
fcs_is_ss_true_parent(
- tqparent_card,
+ parent_card,
fcs_stack_card(state, stack, pc+1)
)
)
@@ -1487,7 +1487,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_parent_on_the_same_stack(
{
child_card = fcs_stack_card(state, stack, cc);
if (fcs_is_ss_true_parent(
- tqparent_card,
+ parent_card,
child_card
)
)
diff --git a/kpat/gamestats.ui b/kpat/gamestats.ui
index c0dff2c3..ac2597fd 100644
--- a/kpat/gamestats.ui
+++ b/kpat/gamestats.ui
@@ -268,5 +268,5 @@
<Q_SLOTS>
<slot>setGameType(int)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 15:48:31 +0000