bruno/Le-Compte-est-Bon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Suppression of "6 numbers" limit. New option to choose tree type.

Browse Source
This commit is contained in:
Bruno Raoult
2021-01-28 11:01:29 +01:00
parent 9ee0453611
commit 26dc599d88
6 changed files with 81 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
best.c
View File

@@ -43,8 +43,13 @@ int check_best(res, nops, node, values, ops)
if (diff < bestdiff || (diff == bestdiff && nops < bestops)) {
//best=res;
// clear old bests
for (i=0; i<nbests; ++i)
free_node(bests[i].root);
for (i=0; i<nbests; ++i) {
found=free_node(bests[i].root);
# ifdef DEBUG_TREE
printf("check_best: freed %d nodes\n", found);
# endif
}
bestdiff=diff;
bestops=nops;
nbests=0;

13
lceb.c
View File

@@ -154,19 +154,20 @@ int main(ac, av)
stacksize=ac-optind-1;
nops=stacksize-1;
gen_combinations(nops);
ncombs=n_combs();
for (i=optind+1; i<ac; ++i) {
val=atoi(av[i]);
push_stack(&inputstack, val);
}
gen_stacks(&inputstack);
gen_combinations(nops);
ncombs=n_combs();
if (treetype==TREE_CATALAN) {
gen_tree(intarray, nops, 0, 0);
gen_tree(intarray, nops, 0, 0, 0);
} else {
gen_reduced_trees(nops);
gen_tree(intarray, nops, 0, 0, 1);
//gen_reduced_trees(nops);
}
set_target(target);
set_intr();

6
lceb.h
View File

@@ -1,6 +1,6 @@
#include <time.h>
#define MAXINPUT (6) /* max numbers as input */
#define MAXINPUT (10) /* max numbers as input */
#define ALLOCSIZE (1024) /* # of elements to alloc */
#define MIN(a,b) (((a)<(b))?(a):(b))
@@ -78,7 +78,7 @@ extern void set_alarm(int ms);
/* tree.c */
extern NODE *get_node();
extern void free_node(NODE *node);
extern int free_node(NODE *node);
extern int compare_nodes(NODE *node1, NODE *node2, int depth);
extern void print_node(NODE *node, char side, int depth, int details);
extern void print_tree(TREE *tree, int details);
@@ -89,7 +89,7 @@ extern NODE *dup_node(NODE *src);
extern NODE *build_tree(char *desc, int size);
//extern void gen_tree(int *seq, int n, int nb1, int nb0);
extern void gen_reduced_trees(int n);
extern void gen_tree(char *seq, int n, int nb1, int nb0);
extern void gen_tree(char *seq, int n, int nb1, int nb0, int reduced);
extern TREE *nth_tree(int n);
extern int n_trees();

17
oper.c
View File

@@ -4,7 +4,7 @@
#include <malloc.h>
#include "lceb.h"
static char *combs[1024]; /* should be dynamic */
static char **combs;
static int ncombs=0;
void print_comb(n)
@@ -59,19 +59,23 @@ static char *combine(ops, len, n)
void gen_combinations(nops)
int nops;
{
char *ops="+-*/";
char *ops="/-*+";
int i, n_combs;
int len_ops=strlen(ops);
# ifdef DEBUG_OPER
printf("gen_combinations(%d)\n", nops);
# endif
n_combs=n_combine(len_ops, nops);
//printf("gen: n=%d\n", n_combs);
# ifdef DEBUG_MEM
printf("allocating %d operators combinations\n", n_combs);
# endif
combs=malloc(sizeof (char*)*n_combs);
for (i=0; i<n_combs; ++i) {
combs[ncombs]=strdup(combine(ops, nops, i));
ncombs++;
}
}
int n_combs()
{
return ncombs;
@@ -87,12 +91,17 @@ int main(ac, av)
int ac;
char **av;
{
char *ops="+-*/", *p;
char *ops="/-+*", *p;
int len_ops=strlen(ops);
int i, nops, ncombs;
if (ac!=2) {
fprintf(stderr, "usage: %s nops\n", *av);
exit (1);
}
nops=atoi(*(av+1));
ncombs=n_combine(len_ops, nops);
combs=malloc(sizeof (char*)*ncombs);
printf("# operators combinations : %d\nlist = ", ncombs);
for (i=0; i<ncombs; ++i) {
p=combine(ops, nops, i);

8
stack.c
View File

@@ -52,7 +52,7 @@ STACK *new_stack(size, name, keep)
STACK *stack;
int i;
# ifdef DEBUG_STACK2
# ifdef DEBUG_STACK
printf("new_stack(size=%d, name=[%s] last=%d total=%d)\n",
size, name, laststack, totalstacks);
# endif
@@ -82,7 +82,7 @@ STACK *new_stack(size, name, keep)
strncpy(stack->name, name? name: "No name", sizeof(stack->name));
//if (size) {
//pelt=malloc(size*sizeof(int));
stack->size=MAXINPUT;
stack->size=size;
//stack->stack=pelt;
//if (keep)
// keep_stack(stack);
@@ -146,7 +146,7 @@ STACK *dup_stack(stack, name)
STACK *new;
int *dst;
int size=stack->size, last=stack->last, i;
//printf("DUP: totalstacks=%d\n", totalstacks);
new=new_stack(size, name, 0);
new->last=stack->last;
dst=new->stack;
@@ -201,6 +201,8 @@ void gen_stacks(stack)
int n=1;
int exists=1;
printf("GEN: totalstacks=%d\n", totalstacks);
# ifdef DEBUG_STACK
printf("generating stacks...\n");
# endif

64
tree.c
View File

@@ -39,19 +39,28 @@ NODE *get_node()
return ret;
}
void free_node(node)
int free_node(node)
NODE *node;
{
if (node->left) {
free_node(node->left);
int n=0;
if (node->type==TREE_NODE) {
# ifdef DEBUG_TREE2
printf("free tree: ");
print_node(node, 3);
# endif
n+=free_node(node->left);
node->left=NULL;
}
if (node->right) {
free_node(node->right);
n+=free_node(node->right);
node->right=NULL;
# ifdef DEBUG_TREE2
printf("free tree: ");
print_node(node, 3);
# endif
}
node->next=freenodes;
freenodes=node;
n++;
return n;
}
int compare_nodes(node1, node2, depth)
@@ -290,7 +299,6 @@ NODE *build_tree(desc, size)
node->type=TREE_LEAF;
}
}
return root;
}
@@ -374,36 +382,55 @@ void gen_reduced_trees(n)
return;
}
void gen_tree(seq, n, nb1, nb0)
void gen_tree(seq, n, nb1, nb0, reduced)
char *seq;
int n; /* number of nodes */
int nb1; /* number of "1" */
int nb0; /* number of "0" */
int reduced;
{
char name[80];
TREE *tree;
NODE *node;
int i;
# ifdef DEBUG_TREE
printf("gen_tree(n=%d, nb1=%d, nb0=%d)\n", n, nb1, nb0);
# endif
if((nb1 + nb0) == 2*n) { /* end */
if ((nb1 + nb0) == 2*n) { /* end */
seq[2*n] = '0';
seq[2*n+1] = 0;
ntrees++;
sprintf(name, "Tree %d", ntrees);
tree=new_tree(name);
tree->head=build_tree(seq, 2*n+1);
node=build_tree(seq, 2*n+1);
if (reduced) {
for (i=0; i<ntrees; ++i) {
if (compare_nodes(node, nth_tree(i)->head, 0)) {
# ifdef DEBUG_TREE
printf("gen_tree: skipping unused tree (%d nodes freed)\n", free_node(node));
# else
free_node(node);
# endif
node=NULL;
break;
}
}
}
if (node) {
ntrees++;
sprintf(name, "Tree %d", ntrees);
tree=new_tree(name);
tree->head=node;
}
return;
}
if(nb1 >= nb0 && nb1 < n) {
if (nb1 >= nb0 && nb1 < n) {
seq[nb1+nb0] = '1';
gen_tree(seq, n, nb1+1, nb0);
gen_tree(seq, n, nb1+1, nb0, reduced);
}
if(nb0 < nb1 && nb1 <=n) {
seq[nb1+nb0] = '0';
gen_tree(seq, n, nb1, nb0+1);
gen_tree(seq, n, nb1, nb0+1, reduced);
}
}
@@ -444,10 +471,11 @@ int main(ac, av)
n=atoi(av[2]);
if (type == 0) {
printf("generating Calalan tree...\n");
gen_tree(array, n, 0, 0);
gen_tree(array, n, 0, 0, 0);
} else {
printf("generating Wedderburn tree...\n");
gen_reduced_trees(n);
gen_tree(array, n, 0, 0, 1);
//gen_reduced_trees(n);
}
print_trees(details);
exit(0);