[GRASS-SVN] r69885 - grass-addons/grass7/raster/r.gwr
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Nov 23 13:46:26 PST 2016
Author: mmetz
Date: 2016-11-23 13:46:26 -0800 (Wed, 23 Nov 2016)
New Revision: 69885
Added:
grass-addons/grass7/raster/r.gwr/pavl.c
grass-addons/grass7/raster/r.gwr/pavl.h
Modified:
grass-addons/grass7/raster/r.gwr/Makefile
grass-addons/grass7/raster/r.gwr/flag.c
grass-addons/grass7/raster/r.gwr/flag.h
grass-addons/grass7/raster/r.gwr/gwr.h
grass-addons/grass7/raster/r.gwr/gwra.c
grass-addons/grass7/raster/r.gwr/rclist.c
grass-addons/grass7/raster/r.gwr/rclist.h
Log:
r.gwr: Red-Black -> AVL
Modified: grass-addons/grass7/raster/r.gwr/Makefile
===================================================================
--- grass-addons/grass7/raster/r.gwr/Makefile 2016-11-23 21:42:34 UTC (rev 69884)
+++ grass-addons/grass7/raster/r.gwr/Makefile 2016-11-23 21:46:26 UTC (rev 69885)
@@ -2,8 +2,8 @@
PGM = r.gwr
-LIBES = $(RASTERLIB) $(BTREE2LIB) $(SEGMENTLIB) $(GISLIB) $(GMATHLIB) $(MATHLIB)
-DEPENDENCIES = $(RASTERDEP) $(BTREE2DEP) $(SEGMENTDEP) $(GISDEP)
+LIBES = $(RASTERLIB) $(SEGMENTLIB) $(GISLIB) $(GMATHLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(SEGMENTDEP) $(GISDEP)
EXTRA_LIBS = $(OMPLIB)
EXTRA_CFLAGS = $(OMPCFLAGS)
Property changes on: grass-addons/grass7/raster/r.gwr/flag.c
___________________________________________________________________
Added: svn:mime-type
+ text/x-csrc
Added: svn:eol-style
+ native
Property changes on: grass-addons/grass7/raster/r.gwr/flag.h
___________________________________________________________________
Added: svn:mime-type
+ text/x-chdr
Added: svn:eol-style
+ native
Property changes on: grass-addons/grass7/raster/r.gwr/gwr.h
___________________________________________________________________
Added: svn:mime-type
+ text/x-chdr
Added: svn:eol-style
+ native
Modified: grass-addons/grass7/raster/r.gwr/gwra.c
===================================================================
--- grass-addons/grass7/raster/r.gwr/gwra.c 2016-11-23 21:42:34 UTC (rev 69884)
+++ grass-addons/grass7/raster/r.gwr/gwra.c 2016-11-23 21:46:26 UTC (rev 69885)
@@ -5,8 +5,8 @@
#include <grass/gis.h>
#include <grass/glocale.h>
#include <grass/raster.h>
-#include <grass/rbtree.h>
#include "rclist.h"
+#include "pavl.h"
#include "local_proto.h"
#include "gwr.h"
@@ -19,7 +19,7 @@
int r, c; /* row, col in target window */
};
-static int cmp_rc(const void *first, const void *second)
+static int cmp_rc(const void *first, const void *second, void *avl_param)
{
struct rc *a = (struct rc *)first, *b = (struct rc *)second;
@@ -40,6 +40,11 @@
return (a->r - b->r);
}
+static void avl_free_item(void *avl_item, void *avl_param)
+{
+ G_free(avl_item);
+}
+
static int bfs_search(FLAG *null_flag, struct gwr_pnt *cur_pnts,
int max_points, int row, int col, double *distmax)
{
@@ -47,16 +52,20 @@
int nextr[8] = {0, -1, 0, 1, -1, -1, 1, 1};
int nextc[8] = {1, 0, -1, 0, 1, -1, -1, 1};
int n, found;
- struct rc next, ngbr_rc;
+ struct rc next, ngbr_rc, *pngbr_rc;
struct rclist rilist;
- struct RB_TREE *visited;
+ struct pavl_table *visited;
double dx, dy, dist;
- visited = rbtree_create(cmp_rc, sizeof(struct rc));
ngbr_rc.row = row;
ngbr_rc.col = col;
- rbtree_insert(visited, &ngbr_rc);
+ visited = pavl_create(cmp_rc, NULL, NULL);
+ pngbr_rc = G_malloc(sizeof(struct rc));
+ *pngbr_rc = ngbr_rc;
+ pavl_insert(visited, pngbr_rc);
+ pngbr_rc = NULL;
+
nrows = Rast_window_rows();
ncols = Rast_window_cols();
@@ -86,10 +95,17 @@
ngbr_rc.row = rown;
ngbr_rc.col = coln;
- if (rbtree_find(visited, &ngbr_rc))
+ if (pngbr_rc == NULL)
+ pngbr_rc = G_malloc(sizeof(struct rc));
+
+ *pngbr_rc = ngbr_rc;
+
+ if (pavl_insert(visited, pngbr_rc) != NULL) {
continue;
+ }
+
+ pngbr_rc = NULL;
- rbtree_insert(visited, &ngbr_rc);
rclist_add(&rilist, rown, coln);
if (FLAG_GET(null_flag, rown, coln)) {
@@ -116,7 +132,9 @@
rclist_destroy(&rilist);
- rbtree_destroy(visited);
+ if (pngbr_rc)
+ G_free(pngbr_rc);
+ pavl_destroy(visited, avl_free_item);
return found;
}
Property changes on: grass-addons/grass7/raster/r.gwr/gwra.c
___________________________________________________________________
Added: svn:mime-type
+ text/x-csrc
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.gwr/pavl.c
===================================================================
--- grass-addons/grass7/raster/r.gwr/pavl.c (rev 0)
+++ grass-addons/grass7/raster/r.gwr/pavl.c 2016-11-23 21:46:26 UTC (rev 69885)
@@ -0,0 +1,843 @@
+/* Produced by texiweb from libavl.w. */
+
+/* libavl - library for manipulation of binary trees.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software
+ Foundation, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+ */
+
+/* from libavl-2.0.3
+ some speed optimizations by Markus Metz
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "pavl.h"
+
+/* Creates and returns a new table
+ with comparison function |compare| using parameter |param|
+ and memory allocator |allocator|.
+ Returns |NULL| if memory allocation failed. */
+struct pavl_table *pavl_create(pavl_comparison_func * compare, void *param,
+ struct libavl_allocator *allocator)
+{
+ struct pavl_table *tree;
+
+ assert(compare != NULL);
+
+ if (allocator == NULL)
+ allocator = &pavl_allocator_default;
+
+ tree = allocator->libavl_malloc(allocator, sizeof *tree);
+ if (tree == NULL)
+ return NULL;
+
+ tree->pavl_root = NULL;
+ tree->pavl_compare = compare;
+ tree->pavl_param = param;
+ tree->pavl_alloc = allocator;
+ tree->pavl_count = 0;
+
+ return tree;
+}
+
+/* Search |tree| for an item matching |item|, and return it if found.
+ Otherwise return |NULL|. */
+void *pavl_find(const struct pavl_table *tree, const void *item)
+{
+ const struct pavl_node *p;
+
+ assert(tree != NULL && item != NULL);
+
+ p = tree->pavl_root;
+ while (p != NULL) {
+ int cmp = tree->pavl_compare(item, p->pavl_data, tree->pavl_param);
+
+ if (cmp == 0)
+ return p->pavl_data;
+
+ p = p->pavl_link[cmp > 0];
+ }
+
+ return NULL;
+}
+
+/* Inserts |item| into |tree| and returns a pointer to |item|'s address.
+ If a duplicate item is found in the tree,
+ returns a pointer to the duplicate without inserting |item|.
+ Returns |NULL| in case of memory allocation failure. */
+void **pavl_probe(struct pavl_table *tree, void *item)
+{
+ struct pavl_node *y; /* Top node to update balance factor, and parent. */
+ struct pavl_node *p, *q; /* Iterator, and parent. */
+ struct pavl_node *n; /* Newly inserted node. */
+ struct pavl_node *w; /* New root of rebalanced subtree. */
+ int dir; /* Direction to descend. */
+
+ assert(tree != NULL && item != NULL);
+
+ y = p = tree->pavl_root;
+ q = NULL;
+ dir = 0;
+ while (p != NULL) {
+ int cmp = tree->pavl_compare(item, p->pavl_data, tree->pavl_param);
+
+ if (cmp == 0)
+ return &p->pavl_data;
+
+ dir = cmp > 0;
+
+ if (p->pavl_balance != 0)
+ y = p;
+
+ q = p, p = p->pavl_link[dir];
+ }
+
+ n = tree->pavl_alloc->libavl_malloc(tree->pavl_alloc, sizeof *p);
+ if (n == NULL)
+ return NULL;
+
+ tree->pavl_count++;
+ n->pavl_link[0] = n->pavl_link[1] = NULL;
+ n->pavl_parent = q;
+ n->pavl_data = item;
+ n->pavl_balance = 0;
+ if (q != NULL)
+ q->pavl_link[dir] = n;
+ else {
+ tree->pavl_root = n;
+
+ return &n->pavl_data;
+ }
+
+ p = n;
+ while (p != y) {
+ q = p->pavl_parent;
+ /*
+ dir = q->pavl_link[0] != p;
+ if (dir == 0)
+ q->pavl_balance--;
+ else
+ q->pavl_balance++;
+ */
+ if (q->pavl_link[0] != p)
+ q->pavl_balance++;
+ else
+ q->pavl_balance--;
+
+ p = q;
+ }
+
+ if (y->pavl_balance == -2) {
+ struct pavl_node *x = y->pavl_link[0];
+
+ if (x->pavl_balance == -1) {
+ w = x;
+ y->pavl_link[0] = x->pavl_link[1];
+ x->pavl_link[1] = y;
+ x->pavl_balance = y->pavl_balance = 0;
+ x->pavl_parent = y->pavl_parent;
+ y->pavl_parent = x;
+ if (y->pavl_link[0] != NULL)
+ y->pavl_link[0]->pavl_parent = y;
+ }
+ else {
+ assert(x->pavl_balance == +1);
+ w = x->pavl_link[1];
+ x->pavl_link[1] = w->pavl_link[0];
+ w->pavl_link[0] = x;
+ y->pavl_link[0] = w->pavl_link[1];
+ w->pavl_link[1] = y;
+ if (w->pavl_balance == -1)
+ x->pavl_balance = 0, y->pavl_balance = +1;
+ else if (w->pavl_balance == 0)
+ x->pavl_balance = y->pavl_balance = 0;
+ else /* |w->pavl_balance == +1| */
+ x->pavl_balance = -1, y->pavl_balance = 0;
+ w->pavl_balance = 0;
+ w->pavl_parent = y->pavl_parent;
+ x->pavl_parent = y->pavl_parent = w;
+ if (x->pavl_link[1] != NULL)
+ x->pavl_link[1]->pavl_parent = x;
+ if (y->pavl_link[0] != NULL)
+ y->pavl_link[0]->pavl_parent = y;
+ }
+ }
+ else if (y->pavl_balance == +2) {
+ struct pavl_node *x = y->pavl_link[1];
+
+ if (x->pavl_balance == +1) {
+ w = x;
+ y->pavl_link[1] = x->pavl_link[0];
+ x->pavl_link[0] = y;
+ x->pavl_balance = y->pavl_balance = 0;
+ x->pavl_parent = y->pavl_parent;
+ y->pavl_parent = x;
+ if (y->pavl_link[1] != NULL)
+ y->pavl_link[1]->pavl_parent = y;
+ }
+ else {
+ assert(x->pavl_balance == -1);
+ w = x->pavl_link[0];
+ x->pavl_link[0] = w->pavl_link[1];
+ w->pavl_link[1] = x;
+ y->pavl_link[1] = w->pavl_link[0];
+ w->pavl_link[0] = y;
+ if (w->pavl_balance == +1)
+ x->pavl_balance = 0, y->pavl_balance = -1;
+ else if (w->pavl_balance == 0)
+ x->pavl_balance = y->pavl_balance = 0;
+ else /* |w->pavl_balance == -1| */
+ x->pavl_balance = +1, y->pavl_balance = 0;
+ w->pavl_balance = 0;
+ w->pavl_parent = y->pavl_parent;
+ x->pavl_parent = y->pavl_parent = w;
+ if (x->pavl_link[0] != NULL)
+ x->pavl_link[0]->pavl_parent = x;
+ if (y->pavl_link[1] != NULL)
+ y->pavl_link[1]->pavl_parent = y;
+ }
+ }
+ else
+ return &n->pavl_data;
+
+ if (w->pavl_parent != NULL)
+ w->pavl_parent->pavl_link[y != w->pavl_parent->pavl_link[0]] = w;
+ else
+ tree->pavl_root = w;
+
+ return &n->pavl_data;
+}
+
+/* Inserts |item| into |table|.
+ Returns |NULL| if |item| was successfully inserted
+ or if a memory allocation error occurred.
+ Otherwise, returns the duplicate item. */
+void *pavl_insert(struct pavl_table *table, void *item)
+{
+ void **p = pavl_probe(table, item);
+
+ return p == NULL || *p == item ? NULL : *p;
+}
+
+/* Inserts |item| into |table|, replacing any duplicate item.
+ Returns |NULL| if |item| was inserted without replacing a duplicate,
+ or if a memory allocation error occurred.
+ Otherwise, returns the item that was replaced. */
+void *pavl_replace(struct pavl_table *table, void *item)
+{
+ void **p = pavl_probe(table, item);
+
+ if (p == NULL || *p == item)
+ return NULL;
+ else {
+ void *r = *p;
+
+ *p = item;
+
+ return r;
+ }
+}
+
+/* Deletes from |tree| and returns an item matching |item|.
+ Returns a null pointer if no matching item found. */
+void *pavl_delete(struct pavl_table *tree, const void *item)
+{
+ struct pavl_node *p; /* Traverses tree to find node to delete. */
+ struct pavl_node *q; /* Parent of |p|. */
+ int dir; /* Side of |q| on which |p| is linked. */
+ int cmp; /* Result of comparison between |item| and |p|. */
+
+ assert(tree != NULL && item != NULL);
+
+ if (tree->pavl_root == NULL)
+ return NULL;
+
+ p = tree->pavl_root;
+ dir = 0;
+ cmp = tree->pavl_compare(item, p->pavl_data, tree->pavl_param);
+ while (cmp != 0) {
+ dir = cmp > 0;
+ p = p->pavl_link[dir];
+ if (p == NULL)
+ return NULL;
+
+ cmp = tree->pavl_compare(item, p->pavl_data, tree->pavl_param);
+ }
+ item = p->pavl_data;
+
+ q = p->pavl_parent;
+ if (q == NULL) {
+ q = (struct pavl_node *)&tree->pavl_root;
+ dir = 0;
+ }
+
+ if (p->pavl_link[1] == NULL) {
+ q->pavl_link[dir] = p->pavl_link[0];
+ if (q->pavl_link[dir] != NULL)
+ q->pavl_link[dir]->pavl_parent = p->pavl_parent;
+ }
+ else {
+ struct pavl_node *r = p->pavl_link[1];
+
+ if (r->pavl_link[0] == NULL) {
+ r->pavl_link[0] = p->pavl_link[0];
+ q->pavl_link[dir] = r;
+ r->pavl_parent = p->pavl_parent;
+ if (r->pavl_link[0] != NULL)
+ r->pavl_link[0]->pavl_parent = r;
+ r->pavl_balance = p->pavl_balance;
+ q = r;
+ dir = 1;
+ }
+ else {
+ struct pavl_node *s = r->pavl_link[0];
+
+ while (s->pavl_link[0] != NULL)
+ s = s->pavl_link[0];
+ r = s->pavl_parent;
+ r->pavl_link[0] = s->pavl_link[1];
+ s->pavl_link[0] = p->pavl_link[0];
+ s->pavl_link[1] = p->pavl_link[1];
+ q->pavl_link[dir] = s;
+ if (s->pavl_link[0] != NULL)
+ s->pavl_link[0]->pavl_parent = s;
+ s->pavl_link[1]->pavl_parent = s;
+ s->pavl_parent = p->pavl_parent;
+ if (r->pavl_link[0] != NULL)
+ r->pavl_link[0]->pavl_parent = r;
+ s->pavl_balance = p->pavl_balance;
+ q = r;
+ dir = 0;
+ }
+ }
+ tree->pavl_alloc->libavl_free(tree->pavl_alloc, p);
+
+ while (q != (struct pavl_node *)&tree->pavl_root) {
+ struct pavl_node *y = q;
+
+ if (y->pavl_parent != NULL)
+ q = y->pavl_parent;
+ else
+ q = (struct pavl_node *)&tree->pavl_root;
+
+ if (dir == 0) {
+ dir = q->pavl_link[0] != y;
+ y->pavl_balance++;
+ if (y->pavl_balance == +1)
+ break;
+ else if (y->pavl_balance == +2) {
+ struct pavl_node *x = y->pavl_link[1];
+
+ if (x->pavl_balance == -1) {
+ struct pavl_node *w;
+
+ assert(x->pavl_balance == -1);
+ w = x->pavl_link[0];
+ x->pavl_link[0] = w->pavl_link[1];
+ w->pavl_link[1] = x;
+ y->pavl_link[1] = w->pavl_link[0];
+ w->pavl_link[0] = y;
+ if (w->pavl_balance == +1)
+ x->pavl_balance = 0, y->pavl_balance = -1;
+ else if (w->pavl_balance == 0)
+ x->pavl_balance = y->pavl_balance = 0;
+ else /* |w->pavl_balance == -1| */
+ x->pavl_balance = +1, y->pavl_balance = 0;
+ w->pavl_balance = 0;
+ w->pavl_parent = y->pavl_parent;
+ x->pavl_parent = y->pavl_parent = w;
+ if (x->pavl_link[0] != NULL)
+ x->pavl_link[0]->pavl_parent = x;
+ if (y->pavl_link[1] != NULL)
+ y->pavl_link[1]->pavl_parent = y;
+ q->pavl_link[dir] = w;
+ }
+ else {
+ y->pavl_link[1] = x->pavl_link[0];
+ x->pavl_link[0] = y;
+ x->pavl_parent = y->pavl_parent;
+ y->pavl_parent = x;
+ if (y->pavl_link[1] != NULL)
+ y->pavl_link[1]->pavl_parent = y;
+ q->pavl_link[dir] = x;
+ if (x->pavl_balance == 0) {
+ x->pavl_balance = -1;
+ y->pavl_balance = +1;
+ break;
+ }
+ else {
+ x->pavl_balance = y->pavl_balance = 0;
+ y = x;
+ }
+ }
+ }
+ }
+ else {
+ dir = q->pavl_link[0] != y;
+ y->pavl_balance--;
+ if (y->pavl_balance == -1)
+ break;
+ else if (y->pavl_balance == -2) {
+ struct pavl_node *x = y->pavl_link[0];
+
+ if (x->pavl_balance == +1) {
+ struct pavl_node *w;
+
+ assert(x->pavl_balance == +1);
+ w = x->pavl_link[1];
+ x->pavl_link[1] = w->pavl_link[0];
+ w->pavl_link[0] = x;
+ y->pavl_link[0] = w->pavl_link[1];
+ w->pavl_link[1] = y;
+ if (w->pavl_balance == -1)
+ x->pavl_balance = 0, y->pavl_balance = +1;
+ else if (w->pavl_balance == 0)
+ x->pavl_balance = y->pavl_balance = 0;
+ else /* |w->pavl_balance == +1| */
+ x->pavl_balance = -1, y->pavl_balance = 0;
+ w->pavl_balance = 0;
+ w->pavl_parent = y->pavl_parent;
+ x->pavl_parent = y->pavl_parent = w;
+ if (x->pavl_link[1] != NULL)
+ x->pavl_link[1]->pavl_parent = x;
+ if (y->pavl_link[0] != NULL)
+ y->pavl_link[0]->pavl_parent = y;
+ q->pavl_link[dir] = w;
+ }
+ else {
+ y->pavl_link[0] = x->pavl_link[1];
+ x->pavl_link[1] = y;
+ x->pavl_parent = y->pavl_parent;
+ y->pavl_parent = x;
+ if (y->pavl_link[0] != NULL)
+ y->pavl_link[0]->pavl_parent = y;
+ q->pavl_link[dir] = x;
+ if (x->pavl_balance == 0) {
+ x->pavl_balance = +1;
+ y->pavl_balance = -1;
+ break;
+ }
+ else {
+ x->pavl_balance = y->pavl_balance = 0;
+ y = x;
+ }
+ }
+ }
+ }
+ }
+
+ tree->pavl_count--;
+ return (void *)item;
+}
+
+/* Initializes |trav| for use with |tree|
+ and selects the null node. */
+void pavl_t_init(struct pavl_traverser *trav, struct pavl_table *tree)
+{
+ trav->pavl_table = tree;
+ trav->pavl_node = NULL;
+}
+
+/* Initializes |trav| for |tree|.
+ Returns data item in |tree| with the least value,
+ or |NULL| if |tree| is empty. */
+void *pavl_t_first(struct pavl_traverser *trav, struct pavl_table *tree)
+{
+ assert(tree != NULL && trav != NULL);
+
+ trav->pavl_table = tree;
+ trav->pavl_node = tree->pavl_root;
+ if (trav->pavl_node != NULL) {
+ while (trav->pavl_node->pavl_link[0] != NULL)
+ trav->pavl_node = trav->pavl_node->pavl_link[0];
+
+ return trav->pavl_node->pavl_data;
+ }
+ else
+ return NULL;
+}
+
+/* Initializes |trav| for |tree|.
+ Returns data item in |tree| with the greatest value,
+ or |NULL| if |tree| is empty. */
+void *pavl_t_last(struct pavl_traverser *trav, struct pavl_table *tree)
+{
+ assert(tree != NULL && trav != NULL);
+
+ trav->pavl_table = tree;
+ trav->pavl_node = tree->pavl_root;
+ if (trav->pavl_node != NULL) {
+ while (trav->pavl_node->pavl_link[1] != NULL)
+ trav->pavl_node = trav->pavl_node->pavl_link[1];
+
+ return trav->pavl_node->pavl_data;
+ }
+ else
+ return NULL;
+}
+
+/* Searches for |item| in |tree|.
+ If found, initializes |trav| to the item found and returns the item
+ as well.
+ If there is no matching item, initializes |trav| to the null item
+ and returns |NULL|. */
+void *pavl_t_find(struct pavl_traverser *trav, struct pavl_table *tree,
+ void *item)
+{
+ struct pavl_node *p;
+ int dir;
+
+ assert(trav != NULL && tree != NULL && item != NULL);
+
+ trav->pavl_table = tree;
+ for (p = tree->pavl_root; p != NULL; p = p->pavl_link[dir]) {
+ int cmp = tree->pavl_compare(item, p->pavl_data, tree->pavl_param);
+
+ if (cmp == 0) {
+ trav->pavl_node = p;
+
+ return p->pavl_data;
+ }
+
+ dir = cmp > 0;
+ }
+
+ trav->pavl_node = NULL;
+ return NULL;
+}
+
+/* Attempts to insert |item| into |tree|.
+ If |item| is inserted successfully, it is returned and |trav| is
+ initialized to its location.
+ If a duplicate is found, it is returned and |trav| is initialized to
+ its location. No replacement of the item occurs.
+ If a memory allocation failure occurs, |NULL| is returned and |trav|
+ is initialized to the null item. */
+void *pavl_t_insert(struct pavl_traverser *trav,
+ struct pavl_table *tree, void *item)
+{
+ void **p;
+
+ assert(trav != NULL && tree != NULL && item != NULL);
+
+ p = pavl_probe(tree, item);
+ if (p != NULL) {
+ trav->pavl_table = tree;
+ trav->pavl_node = ((struct pavl_node *) ((char *)p -
+ offsetof(struct pavl_node, pavl_data)));
+
+ return *p;
+ }
+ else {
+ pavl_t_init(trav, tree);
+
+ return NULL;
+ }
+}
+
+/* Initializes |trav| to have the same current node as |src|. */
+void *pavl_t_copy(struct pavl_traverser *trav,
+ const struct pavl_traverser *src)
+{
+ assert(trav != NULL && src != NULL);
+
+ trav->pavl_table = src->pavl_table;
+ trav->pavl_node = src->pavl_node;
+
+ return trav->pavl_node != NULL ? trav->pavl_node->pavl_data : NULL;
+}
+
+/* Returns the next data item in inorder
+ within the tree being traversed with |trav|,
+ or if there are no more data items returns |NULL|. */
+void *pavl_t_next(struct pavl_traverser *trav)
+{
+ assert(trav != NULL);
+
+ if (trav->pavl_node == NULL)
+ return pavl_t_first(trav, trav->pavl_table);
+ else if (trav->pavl_node->pavl_link[1] == NULL) {
+ struct pavl_node *q, *p; /* Current node and its child. */
+
+ for (p = trav->pavl_node, q = p->pavl_parent;;
+ p = q, q = q->pavl_parent)
+ if (q == NULL || p == q->pavl_link[0]) {
+ trav->pavl_node = q;
+
+ return trav->pavl_node != NULL ?
+ trav->pavl_node->pavl_data : NULL;
+ }
+ }
+ else {
+ trav->pavl_node = trav->pavl_node->pavl_link[1];
+ while (trav->pavl_node->pavl_link[0] != NULL)
+ trav->pavl_node = trav->pavl_node->pavl_link[0];
+
+ return trav->pavl_node->pavl_data;
+ }
+}
+
+/* Returns the previous data item in inorder
+ within the tree being traversed with |trav|,
+ or if there are no more data items returns |NULL|. */
+void *pavl_t_prev(struct pavl_traverser *trav)
+{
+ assert(trav != NULL);
+
+ if (trav->pavl_node == NULL)
+ return pavl_t_last(trav, trav->pavl_table);
+ else if (trav->pavl_node->pavl_link[0] == NULL) {
+ struct pavl_node *q, *p; /* Current node and its child. */
+
+ for (p = trav->pavl_node, q = p->pavl_parent;;
+ p = q, q = q->pavl_parent)
+ if (q == NULL || p == q->pavl_link[1]) {
+ trav->pavl_node = q;
+
+ return trav->pavl_node != NULL ?
+ trav->pavl_node->pavl_data : NULL;
+ }
+ }
+ else {
+ trav->pavl_node = trav->pavl_node->pavl_link[0];
+ while (trav->pavl_node->pavl_link[1] != NULL)
+ trav->pavl_node = trav->pavl_node->pavl_link[1];
+
+ return trav->pavl_node->pavl_data;
+ }
+}
+
+/* Returns |trav|'s current item. */
+void *pavl_t_cur(struct pavl_traverser *trav)
+{
+ assert(trav != NULL);
+
+ return trav->pavl_node != NULL ? trav->pavl_node->pavl_data : NULL;
+}
+
+/* Replaces the current item in |trav| by |new| and returns the item replaced.
+ |trav| must not have the null item selected.
+ The new item must not upset the ordering of the tree. */
+void *pavl_t_replace(struct pavl_traverser *trav, void *new)
+{
+ void *old;
+
+ assert(trav != NULL && trav->pavl_node != NULL && new != NULL);
+ old = trav->pavl_node->pavl_data;
+ trav->pavl_node->pavl_data = new;
+
+ return old;
+}
+
+/* Destroys |new| with |pavl_destroy (new, destroy)|,
+ first initializing right links in |new| that have
+ not yet been initialized at time of call. */
+static void
+copy_error_recovery(struct pavl_node *q,
+ struct pavl_table *new, pavl_item_func * destroy)
+{
+ assert(q != NULL && new != NULL);
+
+ for (;;) {
+ struct pavl_node *p = q;
+
+ q = q->pavl_parent;
+ if (q == NULL)
+ break;
+
+ if (p == q->pavl_link[0])
+ q->pavl_link[1] = NULL;
+ }
+
+ pavl_destroy(new, destroy);
+}
+
+/* Copies |org| to a newly created tree, which is returned.
+ If |copy != NULL|, each data item in |org| is first passed to |copy|,
+ and the return values are inserted into the tree;
+ |NULL| return values are taken as indications of failure.
+ On failure, destroys the partially created new tree,
+ applying |destroy|, if non-null, to each item in the new tree so far,
+ and returns |NULL|.
+ If |allocator != NULL|, it is used for allocation in the new tree.
+ Otherwise, the same allocator used for |org| is used. */
+struct pavl_table *pavl_copy(const struct pavl_table *org,
+ pavl_copy_func * copy, pavl_item_func * destroy,
+ struct libavl_allocator *allocator)
+{
+ struct pavl_table *new;
+ const struct pavl_node *x;
+ struct pavl_node *y;
+
+ assert(org != NULL);
+ new = pavl_create(org->pavl_compare, org->pavl_param,
+ allocator != NULL ? allocator : org->pavl_alloc);
+ if (new == NULL)
+ return NULL;
+
+ new->pavl_count = org->pavl_count;
+ if (new->pavl_count == 0)
+ return new;
+
+ x = (const struct pavl_node *)&org->pavl_root;
+ y = (struct pavl_node *)&new->pavl_root;
+ for (;;) {
+ while (x->pavl_link[0] != NULL) {
+ y->pavl_link[0] =
+ new->pavl_alloc->libavl_malloc(new->pavl_alloc,
+ sizeof *y->pavl_link[0]);
+ if (y->pavl_link[0] == NULL) {
+ if (y != (struct pavl_node *)&new->pavl_root) {
+ y->pavl_data = NULL;
+ y->pavl_link[1] = NULL;
+ }
+
+ copy_error_recovery(y, new, destroy);
+
+ return NULL;
+ }
+ y->pavl_link[0]->pavl_parent = y;
+
+ x = x->pavl_link[0];
+ y = y->pavl_link[0];
+ }
+ y->pavl_link[0] = NULL;
+
+ for (;;) {
+ y->pavl_balance = x->pavl_balance;
+ if (copy == NULL)
+ y->pavl_data = x->pavl_data;
+ else {
+ y->pavl_data = copy(x->pavl_data, org->pavl_param);
+ if (y->pavl_data == NULL) {
+ y->pavl_link[1] = NULL;
+ copy_error_recovery(y, new, destroy);
+
+ return NULL;
+ }
+ }
+
+ if (x->pavl_link[1] != NULL) {
+ y->pavl_link[1] =
+ new->pavl_alloc->libavl_malloc(new->pavl_alloc,
+ sizeof *y->pavl_link[1]);
+ if (y->pavl_link[1] == NULL) {
+ copy_error_recovery(y, new, destroy);
+
+ return NULL;
+ }
+ y->pavl_link[1]->pavl_parent = y;
+
+ x = x->pavl_link[1];
+ y = y->pavl_link[1];
+ break;
+ }
+ else
+ y->pavl_link[1] = NULL;
+
+ for (;;) {
+ const struct pavl_node *w = x;
+
+ x = x->pavl_parent;
+ if (x == NULL) {
+ new->pavl_root->pavl_parent = NULL;
+ return new;
+ }
+ y = y->pavl_parent;
+
+ if (w == x->pavl_link[0])
+ break;
+ }
+ }
+ }
+
+ return new;
+}
+
+/* Frees storage allocated for |tree|.
+ If |destroy != NULL|, applies it to each data item in inorder. */
+void pavl_destroy(struct pavl_table *tree, pavl_item_func * destroy)
+{
+ struct pavl_node *p, *q;
+
+ assert(tree != NULL);
+
+ p = tree->pavl_root;
+ while (p != NULL) {
+ if (p->pavl_link[0] == NULL) {
+ q = p->pavl_link[1];
+ if (destroy != NULL && p->pavl_data != NULL)
+ destroy(p->pavl_data, tree->pavl_param);
+ tree->pavl_alloc->libavl_free(tree->pavl_alloc, p);
+ }
+ else {
+ q = p->pavl_link[0];
+ p->pavl_link[0] = q->pavl_link[1];
+ q->pavl_link[1] = p;
+ }
+ p = q;
+ }
+
+ tree->pavl_alloc->libavl_free(tree->pavl_alloc, tree);
+}
+
+/* Allocates |size| bytes of space using |malloc()|.
+ Returns a null pointer if allocation fails. */
+void *pavl_malloc(struct libavl_allocator *allocator, size_t size)
+{
+ assert(allocator != NULL && size > 0);
+
+ return malloc(size);
+}
+
+/* Frees |block|. */
+void pavl_free(struct libavl_allocator *allocator, void *block)
+{
+ assert(allocator != NULL && block != NULL);
+
+ free(block);
+}
+
+/* Default memory allocator that uses |malloc()| and |free()|. */
+struct libavl_allocator pavl_allocator_default = {
+ pavl_malloc,
+ pavl_free
+};
+
+#undef NDEBUG
+#include <assert.h>
+
+/* Asserts that |pavl_insert()| succeeds at inserting |item| into |table|. */
+void (pavl_assert_insert) (struct pavl_table * table, void *item)
+{
+ void **p = pavl_probe(table, item);
+
+ assert(p != NULL && *p == item);
+}
+
+/* Asserts that |pavl_delete()| really removes |item| from |table|,
+ and returns the removed item. */
+void *(pavl_assert_delete) (struct pavl_table * table, void *item)
+{
+ void *p = pavl_delete(table, item);
+
+ assert(p != NULL);
+
+ return p;
+}
Property changes on: grass-addons/grass7/raster/r.gwr/pavl.c
___________________________________________________________________
Added: svn:mime-type
+ text/x-csrc
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.gwr/pavl.h
===================================================================
--- grass-addons/grass7/raster/r.gwr/pavl.h (rev 0)
+++ grass-addons/grass7/raster/r.gwr/pavl.h 2016-11-23 21:46:26 UTC (rev 69885)
@@ -0,0 +1,108 @@
+/* Produced by texiweb from libavl.w. */
+
+/* libavl - library for manipulation of binary trees.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software
+ Foundation, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+*/
+
+#ifndef PAVL_H
+#define PAVL_H 1
+
+#include <stddef.h>
+
+/* Function types. */
+typedef int pavl_comparison_func (const void *pavl_a, const void *pavl_b,
+ void *pavl_param);
+typedef void pavl_item_func (void *pavl_item, void *pavl_param);
+typedef void *pavl_copy_func (void *pavl_item, void *pavl_param);
+
+#ifndef LIBAVL_ALLOCATOR
+#define LIBAVL_ALLOCATOR
+/* Memory allocator. */
+struct libavl_allocator
+{
+ void *(*libavl_malloc) (struct libavl_allocator *, size_t libavl_size);
+ void (*libavl_free) (struct libavl_allocator *, void *libavl_block);
+};
+#endif
+
+/* Default memory allocator. */
+extern struct libavl_allocator pavl_allocator_default;
+void *pavl_malloc (struct libavl_allocator *, size_t);
+void pavl_free (struct libavl_allocator *, void *);
+
+/* Maximum PAVL height, unused. */
+#ifndef PAVL_MAX_HEIGHT
+#define PAVL_MAX_HEIGHT 32
+#endif
+
+/* Tree data structure. */
+struct pavl_table
+{
+ struct pavl_node *pavl_root; /* Tree's root. */
+ pavl_comparison_func *pavl_compare; /* Comparison function. */
+ void *pavl_param; /* Extra argument to |pavl_compare|. */
+ struct libavl_allocator *pavl_alloc; /* Memory allocator. */
+ size_t pavl_count; /* Number of items in tree. */
+};
+
+/* An PAVL tree node. */
+struct pavl_node
+{
+ struct pavl_node *pavl_link[2]; /* Subtrees. */
+ struct pavl_node *pavl_parent; /* Parent node. */
+ void *pavl_data; /* Pointer to data. */
+ signed char pavl_balance; /* Balance factor. */
+};
+
+/* PAVL traverser structure. */
+struct pavl_traverser
+{
+ struct pavl_table *pavl_table; /* Tree being traversed. */
+ struct pavl_node *pavl_node; /* Current node in tree. */
+};
+
+/* Table functions. */
+struct pavl_table *pavl_create (pavl_comparison_func *, void *,
+ struct libavl_allocator *);
+struct pavl_table *pavl_copy (const struct pavl_table *, pavl_copy_func *,
+ pavl_item_func *, struct libavl_allocator *);
+void pavl_destroy (struct pavl_table *, pavl_item_func *);
+void **pavl_probe (struct pavl_table *, void *);
+void *pavl_insert (struct pavl_table *, void *);
+void *pavl_replace (struct pavl_table *, void *);
+void *pavl_delete (struct pavl_table *, const void *);
+void *pavl_find (const struct pavl_table *, const void *);
+void pavl_assert_insert (struct pavl_table *, void *);
+void *pavl_assert_delete (struct pavl_table *, void *);
+
+#define pavl_count(table) ((size_t) (table)->pavl_count)
+
+/* Table traverser functions. */
+void pavl_t_init (struct pavl_traverser *, struct pavl_table *);
+void *pavl_t_first (struct pavl_traverser *, struct pavl_table *);
+void *pavl_t_last (struct pavl_traverser *, struct pavl_table *);
+void *pavl_t_find (struct pavl_traverser *, struct pavl_table *, void *);
+void *pavl_t_insert (struct pavl_traverser *, struct pavl_table *, void *);
+void *pavl_t_copy (struct pavl_traverser *, const struct pavl_traverser *);
+void *pavl_t_next (struct pavl_traverser *);
+void *pavl_t_prev (struct pavl_traverser *);
+void *pavl_t_cur (struct pavl_traverser *);
+void *pavl_t_replace (struct pavl_traverser *, void *);
+
+#endif /* pavl.h */
Property changes on: grass-addons/grass7/raster/r.gwr/pavl.h
___________________________________________________________________
Added: svn:mime-type
+ text/x-chdr
Added: svn:eol-style
+ native
Property changes on: grass-addons/grass7/raster/r.gwr/rclist.c
___________________________________________________________________
Added: svn:mime-type
+ text/x-csrc
Added: svn:eol-style
+ native
Property changes on: grass-addons/grass7/raster/r.gwr/rclist.h
___________________________________________________________________
Added: svn:mime-type
+ text/x-chdr
Added: svn:eol-style
+ native
More information about the grass-commit
mailing list