summaryrefslogtreecommitdiff
blob: 5597b36417508f34e24856b5f34b9846e87a162a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
--- gt-itm/src/geog.c
+++ gt-itm/src/geog.c
@@ -6,6 +6,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/param.h>		/* for NBBY */
 #include <alloca.h>
 #include <assert.h>
@@ -31,6 +32,9 @@
 
 static char geogId[]="$Id: gt-itm-implicits.patch,v 1.1 2010/10/12 15:32:45 xarthisius Exp $";
 
+long fdiam(Graph *g);
+void die(s);
+
 double
 distance(Vertex *u, Vertex *v)
 {
--- gt-itm/src/ts.c
+++ gt-itm/src/ts.c
@@ -8,6 +8,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>		/* for NBBY */
 #include <alloca.h>
 #include "gb_graph.h"
@@ -64,6 +65,10 @@
 			  return (x); }
 */
 
+int td_OK(Vertex *snp,Vertex *dnp);
+long random(void);
+int stubs_OK(Vertex *snp0,Vertex *snp1);
+
 /* fast diameter computation using Floyd-Warshall
  * Returns the HOP diameter of the graph, i.e. each edge given UNIT wt.
  * Leaves the LENGTH diameter of the graph in g->Gldiam.
--- gt-itm/include/geog.h
+++ gt-itm/include/geog.h
@@ -74,3 +74,8 @@
          geo_parms* toppp,      /* params for transit connectivity */
          geo_parms* transpp,    /*   "     "  transit domains   */
          geo_parms* stubpp);     /*   "     "  stub domains      */
+
+void randomize(long* a, long size, long mean, int iters);
+long idist(Vertex *u, Vertex *v);
+int printparms(char *buf,geo_parms *pp);
+int isconnected(Graph *G);
--- gt-itm/src/edriver.c
+++ gt-itm/src/edriver.c
@@ -35,6 +35,8 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "gb_graph.h"
 #include "gb_save.h"
 #include "gb_dijk.h"
--- gt-itm/include/eval.h
+++ gt-itm/include/eval.h
@@ -8,4 +8,7 @@
 enum Field {Len, A, B, Hops};
 
 void twofield_sptree(Graph*, Vertex*, enum Field, enum Field);
-
+int finddegdist(Graph *g, int** degdist);
+void dopaths(Graph *g, enum Field f0, enum Field f1, int *rmin, int *rmax, float *ravg);
+void dodepthdist(Graph *g, int** ddist);
+int bicomp(Graph *g,int verbose);
--- gt-itm/src/dfs.c
+++ gt-itm/src/dfs.c
@@ -6,6 +6,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <alloca.h>
 #include <sys/types.h>
 #include "gb_graph.h"
@@ -18,6 +19,8 @@
 
 #define NBBY 8
 
+int dfs(Graph *G,int n,u_char *vis);
+
 /* check connectivity of graph g                        */
 /* uses depth-first search.                             */
 isconnected(Graph *G)
--- gt-itm/src/itm.c.orig	2010-10-12 17:11:25.748461793 +0200
+++ gt-itm/src/itm.c	2010-10-12 17:13:09.237165705 +0200
@@ -42,6 +42,7 @@
 #include <stdlib.h>		/* for calloc(),atoi(),etc. */
 #include <string.h>		/* for strtok() */
 #include "gb_graph.h"
+#include "gb_save.h"
 #include "geog.h"
 
 #define LINE 512
@@ -55,6 +56,7 @@
 char *delim = " \t\n", *nonestr = "<none>";
 static char  errstr[256];
 
+void die(s);
 
 char *
 get_geoparms(FILE * f, geo_parms * pp)