[GRASS-SVN] r34604 - grass/branches/develbranch_6/vector/v.delaunay2
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 28 17:23:12 EST 2008
Author: martinl
Date: 2008-11-28 17:23:12 -0500 (Fri, 28 Nov 2008)
New Revision: 34604
Modified:
grass/branches/develbranch_6/vector/v.delaunay2/geometry.c
grass/branches/develbranch_6/vector/v.delaunay2/in_out.c
grass/branches/develbranch_6/vector/v.delaunay2/main.c
grass/branches/develbranch_6/vector/v.delaunay2/memory.c
Log:
r34603 reverted
Modified: grass/branches/develbranch_6/vector/v.delaunay2/geometry.c
===================================================================
--- grass/branches/develbranch_6/vector/v.delaunay2/geometry.c 2008-11-28 22:17:43 UTC (rev 34603)
+++ grass/branches/develbranch_6/vector/v.delaunay2/geometry.c 2008-11-28 22:23:12 UTC (rev 34604)
@@ -21,13 +21,9 @@
{
unsigned int n;
-
unsigned int split;
-
struct edge *l_ccw_l, *r_cw_l, *l_ccw_r, *r_cw_r, *l_tangent;
-
struct edge *a, *b, *c;
-
double c_p;
n = r - l + 1;
@@ -102,9 +98,7 @@
struct vertex **org_r_lower)
{
struct edge *l, *r;
-
struct vertex *o_l, *o_r, *d_l, *d_r;
-
boolean ready;
l = r_cw_l;
@@ -145,11 +139,8 @@
struct edge **l_tangent)
{
struct edge *base, *l_cand, *r_cand;
-
struct vertex *org_base, *dest_base;
-
long double u_l_c_o_b, v_l_c_o_b, u_l_c_d_b, v_l_c_d_b;
-
long double u_r_c_o_b, v_r_c_o_b, u_r_c_d_b, v_r_c_d_b;
/* cross product */
@@ -157,15 +148,10 @@
/* dot product */
long double d_p_l_cand, d_p_r_cand;
-
boolean above_l_cand, above_r_cand, above_next, above_prev;
-
struct vertex *dest_l_cand, *dest_r_cand;
-
long double cot_l_cand, cot_r_cand;
-
struct edge *l_lower, *r_lower;
-
struct vertex *org_r_lower, *org_l_lower;
/* Create first cross edge by joining lower common tangent */
@@ -210,11 +196,8 @@
in_circle test gets invalid. */
if (above_l_cand) {
double u_n_o_b, v_n_o_b, u_n_d_b, v_n_d_b;
-
double c_p_next, d_p_next, cot_next;
-
struct edge *next;
-
struct vertex *dest_next;
d_p_l_cand =
@@ -250,11 +233,8 @@
in_circle test gets invalid. */
if (above_r_cand) {
double u_p_o_b, v_p_o_b, u_p_d_b, v_p_d_b;
-
double c_p_prev, d_p_prev, cot_prev;
-
struct edge *prev;
-
struct vertex *dest_prev;
d_p_r_cand =
Modified: grass/branches/develbranch_6/vector/v.delaunay2/in_out.c
===================================================================
--- grass/branches/develbranch_6/vector/v.delaunay2/in_out.c 2008-11-28 22:17:43 UTC (rev 34603)
+++ grass/branches/develbranch_6/vector/v.delaunay2/in_out.c 2008-11-28 22:23:12 UTC (rev 34604)
@@ -14,13 +14,10 @@
int Type, struct Map_info map_out)
{
struct edge *e_start, *e;
-
struct vertex *u, *v;
-
unsigned int i;
static struct line_pnts *Points = NULL;
-
static struct line_cats *Cats = NULL;
if (!Points) {
@@ -65,15 +62,11 @@
int mode3d, int Type, struct Map_info map_out)
{
struct edge *e_start, *e, *next;
-
struct vertex *u, *v, *w;
-
unsigned int i;
-
struct vertex *temp;
struct line_pnts *Points = Vect_new_line_struct();
-
struct line_cats *Cats = Vect_new_cats_struct();
double x1, y1, z1, x2, y2, z2, x3, y3, z3;
@@ -147,13 +140,9 @@
void remove_duplicates(struct vertex *list[], unsigned int *size)
{
int n = *size - 1;
-
int left = 0;
-
int right = 1;
-
int shift = 0;
-
int empty = 0;
if (n > 0)
@@ -175,7 +164,6 @@
BOUND_BOX Box)
{
int nlines, line, allocated, nsites;
-
struct line_pnts *Points;
Points = Vect_new_line_struct();
Modified: grass/branches/develbranch_6/vector/v.delaunay2/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.delaunay2/main.c 2008-11-28 22:17:43 UTC (rev 34603)
+++ grass/branches/develbranch_6/vector/v.delaunay2/main.c 2008-11-28 22:23:12 UTC (rev 34604)
@@ -1,4 +1,3 @@
-
/***************************************************************
*
* MODULE: v.delaunay
@@ -35,39 +34,26 @@
/* GRASS related variables */
char *mapset;
-
struct Map_info map_in, map_out;
-
struct Cell_head Window;
-
BOUND_BOX Box;
-
struct GModule *module;
-
struct Flag *reg_flag, *line_flag;
-
struct Option *in_opt, *out_opt;
struct line_pnts *Points;
-
struct line_cats *Cats;
-
int nareas, area;
int Type;
-
int complete_map;
-
int mode3d;
/* ---------------------- */
unsigned int i;
-
unsigned int n;
-
struct edge *l_cw, *r_ccw;
-
struct vertex **sites_sorted;
/* GRASS related manipulations */
@@ -158,7 +144,6 @@
/* Assign centroid to each area */
for (area = 1; area <= nareas; area++) {
double x, y, z, angle, slope;
-
int ret;
G_percent(area, nareas, 2);
Modified: grass/branches/develbranch_6/vector/v.delaunay2/memory.c
===================================================================
--- grass/branches/develbranch_6/vector/v.delaunay2/memory.c 2008-11-28 22:17:43 UTC (rev 34603)
+++ grass/branches/develbranch_6/vector/v.delaunay2/memory.c 2008-11-28 22:23:12 UTC (rev 34604)
@@ -5,9 +5,7 @@
#include "data_types.h"
struct vertex *sites;
-
static struct edge *edges;
-
static struct edge **free_list_e;
static unsigned int n_free_e;
@@ -15,7 +13,6 @@
void alloc_memory(unsigned int n)
{
struct edge *e;
-
int i;
/* Sites storage. */
@@ -55,7 +52,6 @@
void alloc_edges(unsigned int n)
{
struct edge *e;
-
int i;
/* Edges. Euler's formula - at most 3n edges on a set of n sites */
More information about the grass-commit
mailing list