[GRASS-SVN] r48761 - in grass-addons/raster/r.pi: r.pi.corearea
r.pi.csr.mw r.pi.energy r.pi.energy.iter r.pi.enn
r.pi.enn.iter r.pi.export r.pi.fnn r.pi.graph r.pi.graph.dec
r.pi.graph.iter r.pi.graph.red r.pi.grow r.pi.import
r.pi.index r.pi.library r.pi.lm r.pi.neigh r.pi.nlm
r.pi.nlm.circ r.pi.nlm.stats r.pi.odc r.pi.prob.mw r.pi.prox
r.pi.searchtime r.pi.searchtime.iter r.pi.searchtime.mw
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Oct 12 09:52:55 EDT 2011
Author: neteler
Date: 2011-10-12 06:52:54 -0700 (Wed, 12 Oct 2011)
New Revision: 48761
Modified:
grass-addons/raster/r.pi/r.pi.corearea/local_proto.h
grass-addons/raster/r.pi/r.pi.csr.mw/local_proto.h
grass-addons/raster/r.pi/r.pi.energy.iter/local_proto.h
grass-addons/raster/r.pi/r.pi.energy/local_proto.h
grass-addons/raster/r.pi/r.pi.enn.iter/local_proto.h
grass-addons/raster/r.pi/r.pi.enn/local_proto.h
grass-addons/raster/r.pi/r.pi.export/local_proto.h
grass-addons/raster/r.pi/r.pi.fnn/local_proto.h
grass-addons/raster/r.pi/r.pi.graph.dec/local_proto.h
grass-addons/raster/r.pi/r.pi.graph.iter/local_proto.h
grass-addons/raster/r.pi/r.pi.graph.red/local_proto.h
grass-addons/raster/r.pi/r.pi.graph/local_proto.h
grass-addons/raster/r.pi/r.pi.grow/local_proto.h
grass-addons/raster/r.pi/r.pi.import/local_proto.h
grass-addons/raster/r.pi/r.pi.index/local_proto.h
grass-addons/raster/r.pi/r.pi.library/r_pi.h
grass-addons/raster/r.pi/r.pi.lm/local_proto.h
grass-addons/raster/r.pi/r.pi.neigh/local_proto.h
grass-addons/raster/r.pi/r.pi.nlm.circ/local_proto.h
grass-addons/raster/r.pi/r.pi.nlm.stats/local_proto.h
grass-addons/raster/r.pi/r.pi.nlm/local_proto.h
grass-addons/raster/r.pi/r.pi.odc/local_proto.h
grass-addons/raster/r.pi/r.pi.odc/main.c
grass-addons/raster/r.pi/r.pi.odc/voronoi.c
grass-addons/raster/r.pi/r.pi.prob.mw/local_proto.h
grass-addons/raster/r.pi/r.pi.prox/local_proto.h
grass-addons/raster/r.pi/r.pi.searchtime.iter/local_proto.h
grass-addons/raster/r.pi/r.pi.searchtime.mw/local_proto.h
grass-addons/raster/r.pi/r.pi.searchtime/local_proto.h
Log:
more cleanup
Modified: grass-addons/raster/r.pi/r.pi.corearea/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.corearea/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.corearea/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -16,7 +16,6 @@
#define GLOBAL extern
#endif
-
typedef struct
{
int x, y;
Modified: grass-addons/raster/r.pi/r.pi.csr.mw/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.csr.mw/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.csr.mw/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,20 +17,6 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
-typedef struct
-{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
typedef DCELL(*f_statmethod) (DCELL *, int);
typedef void (*f_method) (DCELL * values, int *map, int *mask, int n,
int size);
Modified: grass-addons/raster/r.pi/r.pi.energy/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.energy/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.energy/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,23 +17,9 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
double dir;
DCELL energy;
int finished;
Modified: grass-addons/raster/r.pi/r.pi.energy.iter/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.energy.iter/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.energy.iter/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,23 +17,9 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
double dir;
DCELL energy;
int finished;
Modified: grass-addons/raster/r.pi/r.pi.enn/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.enn/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.enn/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -16,15 +16,6 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
-typedef struct
-{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
typedef DCELL(*f_statmethod) (DCELL *, int);
typedef int (*f_func) (DCELL *, int, int *, int, f_statmethod);
Modified: grass-addons/raster/r.pi/r.pi.enn.iter/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.enn.iter/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.enn.iter/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,24 +17,9 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING 0
-#define TYPE_NOGO -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
} Point;
typedef DCELL(*f_statmethod) (DCELL *, int);
Modified: grass-addons/raster/r.pi/r.pi.export/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.export/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.export/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,23 +17,9 @@
#define GLOBAL extern
#endif
-#define NOTHING 0
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- DCELL value;
-} Coords;
-
-typedef struct
-{
- int x, y;
} Point;
typedef struct
Modified: grass-addons/raster/r.pi/r.pi.fnn/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.fnn/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.fnn/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -16,18 +16,9 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
DCELL f, g;
} Path_Coords;
Modified: grass-addons/raster/r.pi/r.pi.graph/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.graph/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.graph/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -16,18 +16,9 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
} Position;
typedef void (*f_neighborhood) (DCELL max_dist);
Modified: grass-addons/raster/r.pi/r.pi.graph.dec/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.graph.dec/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.graph.dec/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -16,18 +16,8 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-#define MAX_INT 0x7FFFFFFF
-
typedef struct
{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
Coords *first_cell;
int count;
} Patch;
Modified: grass-addons/raster/r.pi/r.pi.graph.iter/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.graph.iter/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.graph.iter/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -16,17 +16,8 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
typedef struct
{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
Coords *first_cell;
int count;
} Patch;
Modified: grass-addons/raster/r.pi/r.pi.graph.red/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.graph.red/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.graph.red/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -16,17 +16,8 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
typedef struct
{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
Coords *first_cell;
int count;
} Patch;
Modified: grass-addons/raster/r.pi/r.pi.grow/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.grow/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.grow/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,8 +17,6 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
typedef struct
{
int x, y;
Modified: grass-addons/raster/r.pi/r.pi.import/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.import/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.import/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -22,20 +22,6 @@
#define GLOBAL extern
#endif
-#define NOTHING 0
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
-typedef struct
-{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
typedef DCELL(*f_statmethod) (DCELL *, int);
/* helpers.c */
Modified: grass-addons/raster/r.pi/r.pi.index/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.index/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.index/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -7,15 +7,6 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
-typedef struct
-{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
extern void writeFrag(int row, int col, int nbr_cnt);
extern int f_area(DCELL * vals, Coords ** frags, int);
Modified: grass-addons/raster/r.pi/r.pi.library/r_pi.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.library/r_pi.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.library/r_pi.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -10,8 +10,13 @@
#include <grass/stats.h>
#define TYPE_NOTHING -1
+#define TYPE_NOGO -2
+/* TODO: we need to talk about these definitions... */
+#define MIN_DOUBLE -1000000
#define MAX_DOUBLE 1000000.0
+#define MAX_INT 0x7FFFFFFF
+#define RESOLUTION 10000
typedef struct
{
Modified: grass-addons/raster/r.pi/r.pi.lm/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.lm/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.lm/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -10,6 +10,4 @@
#include "../r.pi.library/r_pi.h"
#include <math.h>
-#define MAX_DOUBLE 1000000.0
-
#endif /* LOCAL_PROTO_H */
Modified: grass-addons/raster/r.pi/r.pi.neigh/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.neigh/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.neigh/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -13,15 +13,6 @@
#define GLOBAL extern
#endif
-#define MAX_DOUBLE 1000000.0
-
-typedef struct
-{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
typedef DCELL(*f_func) (DCELL * values, int count);
/* frag.c */
Modified: grass-addons/raster/r.pi/r.pi.nlm/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.nlm/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.nlm/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -11,14 +11,6 @@
#include <math.h>
#include <time.h>
-#define TYPE_NOTHING 0
-#define TYPE_NOGO -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
Modified: grass-addons/raster/r.pi/r.pi.nlm.circ/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.nlm.circ/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.nlm.circ/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -11,9 +11,6 @@
#include <math.h>
#include <time.h>
-#define TYPE_NOTHING -1
-#define TYPE_NOGO -2
-
typedef struct
{
int x, y;
Modified: grass-addons/raster/r.pi/r.pi.nlm.stats/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.nlm.stats/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.nlm.stats/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,24 +17,9 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING 0
-#define TYPE_NOGO -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
} Point;
typedef DCELL(*f_statmethod) (DCELL *, int);
Modified: grass-addons/raster/r.pi/r.pi.odc/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.odc/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.odc/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,24 +17,9 @@
#define GLOBAL extern
#endif
-#define NOGO -2
-#define NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
} Point;
typedef struct
Modified: grass-addons/raster/r.pi/r.pi.odc/main.c
===================================================================
--- grass-addons/raster/r.pi/r.pi.odc/main.c 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.odc/main.c 2011-10-12 13:52:54 UTC (rev 48761)
@@ -332,10 +332,10 @@
G_get_c_raster_row(in_fd, result, row);
for (col = 0; col < sx; col++) {
if (result[col] == 1) {
- map[row * sx + col] = NOTHING;
+ map[row * sx + col] = TYPE_NOTHING;
}
else {
- map[row * sx + col] = NOGO;
+ map[row * sx + col] = TYPE_NOGO;
}
}
@@ -346,7 +346,7 @@
}
else {
for (i = 0; i < sx * sy; i++) {
- map[i] = NOTHING;
+ map[i] = TYPE_NOTHING;
}
}
Modified: grass-addons/raster/r.pi/r.pi.odc/voronoi.c
===================================================================
--- grass-addons/raster/r.pi/r.pi.odc/voronoi.c 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.odc/voronoi.c 2011-10-12 13:52:54 UTC (rev 48761)
@@ -26,7 +26,7 @@
empty_count = 0;
for (x = 0; x < sx; x++) {
for (y = 0; y < sy; y++) {
- if (map[x + y * sx] == NOTHING) {
+ if (map[x + y * sx] == TYPE_NOTHING) {
empty_space[empty_count].x = x;
empty_space[empty_count].y = y;
empty_count++;
@@ -102,7 +102,7 @@
for (nx = l; nx <= r; nx++) {
for (ny = t; ny <= b; ny++) {
val = map[nx + ny * sx];
- if (val > NOTHING && checklist[val] == 0) {
+ if (val > TYPE_NOTHING && checklist[val] == 0) {
checklist[val] = 1;
res[count] = val;
count++;
@@ -113,7 +113,7 @@
else {
if (x > 0) { // left
val = map[x - 1 + y * sx];
- if (val > NOTHING && checklist[val] == 0) {
+ if (val > TYPE_NOTHING && checklist[val] == 0) {
checklist[val] = 1;
res[count] = val;
count++;
@@ -121,7 +121,7 @@
}
if (x < sx - 1) { // right
val = map[x + 1 + y * sx];
- if (val > NOTHING && checklist[val] == 0) {
+ if (val > TYPE_NOTHING && checklist[val] == 0) {
checklist[val] = 1;
res[count] = val;
count++;
@@ -129,7 +129,7 @@
}
if (y > 0) { // up
val = map[x + (y - 1) * sx];
- if (val > NOTHING && checklist[val] == 0) {
+ if (val > TYPE_NOTHING && checklist[val] == 0) {
checklist[val] = 1;
res[count] = val;
count++;
@@ -137,7 +137,7 @@
}
if (y < sy - 1) { // left
val = map[x + (y + 1) * sx];
- if (val > NOTHING && checklist[val] == 0) {
+ if (val > TYPE_NOTHING && checklist[val] == 0) {
checklist[val] = 1;
res[count] = val;
count++;
@@ -181,7 +181,7 @@
/* add new edge point */
new_edge[new_count].x = x;
new_edge[new_count].y = y;
- new_edge[new_count].patch = neighb_cnt == 1 ? neighbors[0] : NOGO;
+ new_edge[new_count].patch = neighb_cnt == 1 ? neighbors[0] : TYPE_NOGO;
new_count++;
/* add voronoi area to patches respectively */
@@ -199,7 +199,7 @@
patch = new_edge[i].patch;
map[x + y * sx] = patch;
- if (patch > NOTHING) {
+ if (patch > TYPE_NOTHING) {
/* test adjacency and mark adjacent patches in the matrix */
neighb_cnt =
gather_neighbors(neighbors, map, x, y, sx, sy, diag_grow);
Modified: grass-addons/raster/r.pi/r.pi.prob.mw/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.prob.mw/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.prob.mw/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,20 +17,6 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
-typedef struct
-{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
typedef DCELL(*f_statmethod) (DCELL *, int);
/* helpers.c */
Modified: grass-addons/raster/r.pi/r.pi.prox/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.prox/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.prox/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -1,18 +1,9 @@
-#define MAX_DOUBLE 1000000.0
-
#ifdef MAIN
#define GLOBAL
#else
#define GLOBAL extern
#endif
-typedef struct
-{
- int x, y;
- int neighbors;
- double value;
-} Coords;
-
/* frag.c */
void writeFrag(int row, int col, int nbr_cnt);
Modified: grass-addons/raster/r.pi/r.pi.searchtime/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.searchtime/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.searchtime/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,23 +17,9 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
double dir;
DCELL path;
int finished;
Modified: grass-addons/raster/r.pi/r.pi.searchtime.iter/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.searchtime.iter/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.searchtime.iter/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,23 +17,9 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
double dir;
DCELL path;
int finished;
Modified: grass-addons/raster/r.pi/r.pi.searchtime.mw/local_proto.h
===================================================================
--- grass-addons/raster/r.pi/r.pi.searchtime.mw/local_proto.h 2011-10-12 13:20:01 UTC (rev 48760)
+++ grass-addons/raster/r.pi/r.pi.searchtime.mw/local_proto.h 2011-10-12 13:52:54 UTC (rev 48761)
@@ -17,23 +17,9 @@
#define GLOBAL extern
#endif
-#define TYPE_NOTHING -1
-
-#define RESOLUTION 10000
-
-#define MIN_DOUBLE -1000000
-#define MAX_DOUBLE 1000000
-
typedef struct
{
int x, y;
- int neighbors;
- double value;
-} Coords;
-
-typedef struct
-{
- int x, y;
double dir;
DCELL path;
int finished;
More information about the grass-commit
mailing list