aboutsummaryrefslogtreecommitdiff
path: root/src/backend/optimizer/geqo
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/optimizer/geqo')
-rw-r--r--src/backend/optimizer/geqo/geqo_cx.c4
-rw-r--r--src/backend/optimizer/geqo/geqo_erx.c22
-rw-r--r--src/backend/optimizer/geqo/geqo_eval.c50
-rw-r--r--src/backend/optimizer/geqo/geqo_main.c4
-rw-r--r--src/backend/optimizer/geqo/geqo_misc.c6
-rw-r--r--src/backend/optimizer/geqo/geqo_params.c12
-rw-r--r--src/backend/optimizer/geqo/geqo_paths.c8
-rw-r--r--src/backend/optimizer/geqo/geqo_pool.c12
-rw-r--r--src/backend/optimizer/geqo/geqo_recombination.c4
-rw-r--r--src/backend/optimizer/geqo/geqo_selection.c4
10 files changed, 63 insertions, 63 deletions
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 4ade5143004..976a6dd2704 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -6,7 +6,7 @@
* CX operator according to Oliver et al
* (Proc 2nd Int'l Conf on GA's)
*
-* $Id: geqo_cx.c,v 1.4 1997/09/08 21:44:15 momjian Exp $
+* $Id: geqo_cx.c,v 1.5 1998/09/01 03:23:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -133,5 +133,5 @@ cx(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table)
}
- return (num_diffs);
+ return num_diffs;
}
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index 4a8d53e7a12..adbaa02855b 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -3,7 +3,7 @@
* geqo_erx.c--
* edge recombination crossover [ER]
*
-* $Id: geqo_erx.c,v 1.9 1998/06/15 19:28:34 momjian Exp $
+* $Id: geqo_erx.c,v 1.10 1998/09/01 03:23:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -77,7 +77,7 @@ alloc_edge_table(int num_gene)
edge_table = (Edge *) palloc((num_gene + 1) * sizeof(Edge));
- return (edge_table);
+ return edge_table;
}
/* free_edge_table--
@@ -147,7 +147,7 @@ gimme_edge_table(Gene *tour1, Gene *tour2, int num_gene, Edge *edge_table)
}
/* return average number of edges per index */
- return (((float) (edge_total * 2) / (float) num_gene));
+ return ((float) (edge_total * 2) / (float) num_gene);
}
/* gimme_edge--
@@ -184,7 +184,7 @@ gimme_edge(Gene gene1, Gene gene2, Edge *edge_table)
/* mark shared edges as negative */
edge_table[city1].edge_list[i] = 0 - city2;
- return (0);
+ return 0;
}
}
@@ -195,7 +195,7 @@ gimme_edge(Gene gene1, Gene gene2, Edge *edge_table)
edge_table[city1].total_edges++;
edge_table[city1].unused_edges++;
- return (1);
+ return 1;
}
/* gimme_tour--
@@ -242,7 +242,7 @@ gimme_tour(Edge *edge_table, Gene *new_gene, int num_gene)
} /* for (i=1; i<num_gene; i++) */
- return (edge_failures);
+ return edge_failures;
}
@@ -326,7 +326,7 @@ gimme_gene(Edge edge, Edge *edge_table)
* converting to absolute values
*/
if (friend < 0)
- return ((Gene) Abs(friend));
+ return (Gene) Abs(friend);
/*
@@ -372,7 +372,7 @@ gimme_gene(Edge edge, Edge *edge_table)
minimum_count--;
if (minimum_count == rand_decision)
- return (friend);
+ return friend;
}
}
@@ -433,7 +433,7 @@ edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene)
four_count--;
if (rand_decision == four_count)
- return ((Gene) i);
+ return (Gene) i;
}
}
@@ -458,7 +458,7 @@ edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene)
remaining_edges--;
if (rand_decision == remaining_edges)
- return (i);
+ return i;
}
}
@@ -478,7 +478,7 @@ edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene)
for (i = 1; i <= num_gene; i++)
if (edge_table[i].unused_edges >= 0)
- return ((Gene) i);
+ return (Gene) i;
elog(DEBUG, "edge_failure(3): no edge found via looking for the last ununsed point");
}
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index 5f66f9ee9be..cf52ddfc457 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_eval.c,v 1.22 1998/08/10 02:26:16 momjian Exp $
+ * $Id: geqo_eval.c,v 1.23 1998/09/01 03:23:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,7 +52,7 @@
static List *gimme_clause_joins(Query *root, RelOptInfo *outer_rel, RelOptInfo *inner_rel);
static RelOptInfo *gimme_clauseless_join(RelOptInfo *outer_rel, RelOptInfo *inner_rel);
-static RelOptInfo *init_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JInfo *joininfo);
+static RelOptInfo *init_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo);
static List *new_join_tlist(List *tlist, List *other_relids, int first_resdomno);
static List *new_joininfo_list(List *joininfo_list, List *join_relids);
static void geqo_joinrel_size(RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_rel);
@@ -86,7 +86,7 @@ geqo_eval(Query *root, Gene *tour, int num_gene)
pfree(joinrel);
freeList(temp);
- return (fitness);
+ return fitness;
}
@@ -176,7 +176,7 @@ gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *out
}
- return (outer_rel); /* tree finished ... */
+ return outer_rel; /* tree finished ... */
}
/*
@@ -197,7 +197,7 @@ gimme_clause_joins(Query *root, RelOptInfo *outer_rel, RelOptInfo *inner_rel)
foreach(i, joininfo_list)
{
- JInfo *joininfo = (JInfo *) lfirst(i);
+ JoinInfo *joininfo = (JoinInfo *) lfirst(i);
RelOptInfo *rel = NULL;
if (!joininfo->inactive)
@@ -228,7 +228,7 @@ gimme_clause_joins(Query *root, RelOptInfo *outer_rel, RelOptInfo *inner_rel)
}
}
- return (join_list);
+ return join_list;
}
/*
@@ -242,7 +242,7 @@ gimme_clause_joins(Query *root, RelOptInfo *outer_rel, RelOptInfo *inner_rel)
static RelOptInfo *
gimme_clauseless_join(RelOptInfo *outer_rel, RelOptInfo *inner_rel)
{
- return (init_join_rel(outer_rel, inner_rel, (JInfo *) NULL));
+ return init_join_rel(outer_rel, inner_rel, (JoinInfo *) NULL);
}
/*
@@ -257,7 +257,7 @@ gimme_clauseless_join(RelOptInfo *outer_rel, RelOptInfo *inner_rel)
* Returns the new join relation node.
*/
static RelOptInfo *
-init_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JInfo *joininfo)
+init_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo)
{
RelOptInfo *joinrel = makeNode(RelOptInfo);
List *joinrel_joininfo_list = NIL;
@@ -315,7 +315,7 @@ init_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JInfo *joininfo)
geqo_joinrel_size(joinrel, outer_rel, inner_rel);
- return (joinrel);
+ return joinrel;
}
/*
@@ -363,7 +363,7 @@ new_join_tlist(List *tlist,
}
}
- return (t_list);
+ return t_list;
}
/*
@@ -389,13 +389,13 @@ new_joininfo_list(List *joininfo_list, List *join_relids)
{
List *current_joininfo_list = NIL;
List *new_otherrels = NIL;
- JInfo *other_joininfo = (JInfo *) NULL;
+ JoinInfo *other_joininfo = (JoinInfo *) NULL;
List *xjoininfo = NIL;
foreach(xjoininfo, joininfo_list)
{
List *or;
- JInfo *joininfo = (JInfo *) lfirst(xjoininfo);
+ JoinInfo *joininfo = (JoinInfo *) lfirst(xjoininfo);
new_otherrels = joininfo->otherrels;
foreach(or, new_otherrels)
@@ -416,7 +416,7 @@ new_joininfo_list(List *joininfo_list, List *join_relids)
}
else
{
- other_joininfo = makeNode(JInfo);
+ other_joininfo = makeNode(JoinInfo);
other_joininfo->otherrels =
joininfo->otherrels;
@@ -434,7 +434,7 @@ new_joininfo_list(List *joininfo_list, List *join_relids)
}
}
- return (current_joininfo_list);
+ return current_joininfo_list;
}
#ifdef NOTUSED
@@ -462,7 +462,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
List *super_rels;
List *xsuper_rel = NIL;
- JInfo *new_joininfo;
+ JoinInfo *new_joininfo;
foreach(xjoinrel, joinrels)
{
@@ -506,7 +506,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
foreach(xjoininfo, joinrel->joininfo)
{
- JInfo *joininfo = (JInfo *) lfirst(xjoininfo);
+ JoinInfo *joininfo = (JoinInfo *) lfirst(xjoininfo);
List *other_rels = joininfo->otherrels;
List *clause_info = joininfo->jinfoclauseinfo;
bool mergejoinable = joininfo->mergejoinable;
@@ -537,7 +537,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
rel = rel_member(relids, root->base_rel_list);
super_rels = rel->superrels;
- new_joininfo = makeNode(JInfo);
+ new_joininfo = makeNode(JoinInfo);
new_joininfo->otherrels = joinrel->relids;
new_joininfo->jinfoclauseinfo = clause_info;
@@ -554,7 +554,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
if (nonoverlap_rels(super_rel, joinrel))
{
List *new_relids = super_rel->relids;
- JInfo *other_joininfo =
+ JoinInfo *other_joininfo =
joininfo_member(new_relids,
joinrel->joininfo);
@@ -566,7 +566,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
}
else
{
- JInfo *new_joininfo = makeNode(JInfo);
+ JoinInfo *new_joininfo = makeNode(JoinInfo);
new_joininfo->otherrels = new_relids;
new_joininfo->jinfoclauseinfo = clause_info;
@@ -617,7 +617,7 @@ geqo_final_join_rels(List *join_rel_list)
foreach(xjoininfo, rel->joininfo)
{
- JInfo *joininfo = (JInfo *) lfirst(xjoininfo);
+ JoinInfo *joininfo = (JoinInfo *) lfirst(xjoininfo);
if (joininfo->otherrels != NIL)
{
@@ -632,7 +632,7 @@ geqo_final_join_rels(List *join_rel_list)
}
}
- return (t_list);
+ return t_list;
}
/*
@@ -662,7 +662,7 @@ add_superrels(RelOptInfo *rel, RelOptInfo *super_rel)
static bool
nonoverlap_rels(RelOptInfo *rel1, RelOptInfo *rel2)
{
- return (nonoverlap_sets(rel1->relids, rel2->relids));
+ return nonoverlap_sets(rel1->relids, rel2->relids);
}
static bool
@@ -675,9 +675,9 @@ nonoverlap_sets(List *s1, List *s2)
int e = lfirsti(x);
if (intMember(e, s2))
- return (false);
+ return false;
}
- return (true);
+ return true;
}
#endif /* NOTUSED */
@@ -712,7 +712,7 @@ geqo_joinrel_size(RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_
double
geqo_log(double x, double b)
{
- return (log(x) / log(b));
+ return log(x) / log(b);
}
static RelOptInfo *
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index fcb81b857b0..fd75985c40a 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_main.c,v 1.9 1998/08/10 02:26:17 momjian Exp $
+ * $Id: geqo_main.c,v 1.10 1998/09/01 03:23:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -284,5 +284,5 @@ print_plan(best_plan, root);
free_pool(pool);
- return (best_rel);
+ return best_rel;
}
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index ce915a5f2c8..c1dab6a99ca 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_misc.c,v 1.9 1998/07/18 04:22:28 momjian Exp $
+ * $Id: geqo_misc.c,v 1.10 1998/09/01 03:23:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -58,7 +58,7 @@ avg_pool(Pool *pool)
for (i = 0; i < pool->size; i++)
cumulative = cumulative + pool->data[i].worth;
- return ((float) cumulative / pool->size);
+ return (float) cumulative / pool->size;
}
/* print_pool--
@@ -146,7 +146,7 @@ geqo_print_joinclauses(Query *root, List *clauses)
foreach(l, clauses)
{
- CInfo *c = lfirst(l);
+ ClauseInfo *c = lfirst(l);
print_expr((Node *) c->clause, root->rtable);
if (lnext(l))
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 0b1636125df..2257f2c293d 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
-* $Id: geqo_params.c,v 1.9 1998/06/15 19:28:36 momjian Exp $
+* $Id: geqo_params.c,v 1.10 1998/09/01 03:23:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -297,7 +297,7 @@ next_token(FILE *fp, char *buf, int bufsz)
ungetc(c, fp);
/* If we ended with a newline, return that, otherwise return 0 */
- return (c == '\n' ? '\n' : 0);
+ return c == '\n' ? '\n' : 0;
}
/* gimme_pool_size--
@@ -315,11 +315,11 @@ gimme_pool_size(int string_length)
size = pow(2.0, exponent);
if (size < MIN_POOL)
- return (MIN_POOL);
+ return MIN_POOL;
else if (size > MAX_POOL)
- return (MAX_POOL);
+ return MAX_POOL;
else
- return ((int) ceil(size));
+ return (int) ceil(size);
}
/* gimme_number_generations--
@@ -333,5 +333,5 @@ gimme_number_generations(int pool_size, int effort)
number_gens = (int) ceil(geqo_log((double) pool_size, 2.0));
- return (effort * number_gens);
+ return effort * number_gens;
}
diff --git a/src/backend/optimizer/geqo/geqo_paths.c b/src/backend/optimizer/geqo/geqo_paths.c
index 8bc75c2349a..a23c9010de2 100644
--- a/src/backend/optimizer/geqo/geqo_paths.c
+++ b/src/backend/optimizer/geqo/geqo_paths.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_paths.c,v 1.10 1998/07/18 04:22:28 momjian Exp $
+ * $Id: geqo_paths.c,v 1.11 1998/09/01 03:23:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,7 +50,7 @@ geqo_prune_rels(List *rel_list)
geqo_prune_rels(geqo_prune_rel((RelOptInfo *) lfirst(rel_list),
lnext(rel_list))));
}
- return (temp_list);
+ return temp_list;
}
/*
@@ -88,7 +88,7 @@ geqo_prune_rel(RelOptInfo *rel, List *other_rels)
t_list = nconc(t_list, temp_node);
}
}
- return (t_list);
+ return t_list;
}
/*
@@ -149,5 +149,5 @@ set_paths(RelOptInfo *rel, Path *unorderedpath)
else
rel->unorderedpath = (Path *) unorderedpath;
- return (cheapest);
+ return cheapest;
}
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index 84210a4a437..40996eff03a 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_pool.c,v 1.8 1998/06/15 19:28:37 momjian Exp $
+ * $Id: geqo_pool.c,v 1.9 1998/09/01 03:23:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -68,7 +68,7 @@ alloc_pool(int pool_size, int string_length)
for (i = 0; i < pool_size; i++)
chromo[i].string = palloc((string_length + 1) * sizeof(Gene));
- return (new_pool);
+ return new_pool;
}
/*
@@ -140,11 +140,11 @@ compare(const void *arg1, const void *arg2)
Chromosome chromo2 = *(Chromosome *) arg2;
if (chromo1.worth == chromo2.worth)
- return (0);
+ return 0;
else if (chromo1.worth > chromo2.worth)
- return (1);
+ return 1;
else
- return (-1);
+ return -1;
}
/* alloc_chromo--
@@ -158,7 +158,7 @@ alloc_chromo(int string_length)
chromo = (Chromosome *) palloc(sizeof(Chromosome));
chromo->string = (Gene *) palloc((string_length + 1) * sizeof(Gene));
- return (chromo);
+ return chromo;
}
/* free_chromo--
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index a045c327691..a2c52ff3473 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -3,7 +3,7 @@
* geqo_recombination.c--
* misc recombination procedures
*
-* $Id: geqo_recombination.c,v 1.5 1998/02/26 04:32:25 momjian Exp $
+* $Id: geqo_recombination.c,v 1.6 1998/09/01 03:23:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -96,7 +96,7 @@ alloc_city_table(int num_gene)
city_table = (City *) palloc((num_gene + 1) * sizeof(City));
- return (city_table);
+ return city_table;
}
/* free_city_table--
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index f41630d40a4..42eac8600da 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_selection.c,v 1.4 1997/09/08 21:44:41 momjian Exp $
+ * $Id: geqo_selection.c,v 1.5 1998/09/01 03:23:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -101,5 +101,5 @@ linear(int pool_size, double bias) /* bias is y-intercept of linear
max * (bias - sqrt((bias * bias) - 4.0 * (bias - 1.0) * geqo_rand()))
/ 2.0 / (bias - 1.0);
- return ((int) index);
+ return (int) index;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 16:32:33 +0000