Merge lp:~mvngu/igraph/doc into lp:~igraph/igraph/0.6-main-old
- doc
- Merge into 0.6-main-old
Status: | Merged |
---|---|
Merge reported by: | Gábor Csárdi |
Merged at revision: | not available |
Proposed branch: | lp:~mvngu/igraph/doc |
Merge into: | lp:~igraph/igraph/0.6-main-old |
Diff against target: |
649 lines (+63/-63) 24 files modified
src/adjlist.c (+2/-2) src/bipartite.c (+1/-1) src/cattributes.c (+3/-3) src/centrality.c (+1/-1) src/cliques.c (+1/-1) src/cocitation.c (+4/-4) src/community.c (+1/-1) src/conversion.c (+1/-1) src/decomposition.c (+2/-2) src/flow.c (+11/-11) src/foreign.c (+3/-3) src/igraph_hashtable.c (+1/-1) src/igraph_strvector.c (+3/-3) src/igraph_trie.c (+1/-1) src/lapack.c (+2/-2) src/layout.c (+5/-5) src/mixing.c (+3/-3) src/operators.c (+3/-3) src/revolver_cit.c (+1/-1) src/revolver_ml_cit.c (+1/-1) src/sparsemat.c (+7/-7) src/st-cuts.c (+1/-1) src/topology.c (+2/-2) src/vector_ptr.c (+3/-3) |
To merge this branch: | bzr merge lp:~mvngu/igraph/doc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gábor Csárdi | Approve | ||
Review via email: mp+75031@code.launchpad.net |
Commit message
Description of the change
A bunch of typo fixes.
- 2543. By Tamás Nepusz
-
removed a right-recursive rule from the LGL parser, thanks to Gregory Stafford
- 2544. By Gábor Csárdi
-
C docs fix for leading eigenvector method, thanks to Minh.
- 2545. By Gábor Csárdi
-
Updated email addresses.
- 2546. By Tamás Nepusz
-
sorted out a minor type issue in igraph_motifs.h
- 2547. By Tamás Nepusz
-
compatibility fixes for Python 2.5 + more image viewers for Linux
- 2548. By Tamás Nepusz
-
igraph_
random_ sample_ alga is now internal - 2549. By Gábor Csárdi
-
R: make edges curve automatically when plotting graphs with multiple edges.
- 2550. By Gábor Csárdi
-
R: interconnected islands game fixed.
- 2551. By Gábor Csárdi
-
R: fixed a weird tkplot issue, when the layout matrix had column names.
- 2552. By Tamás Nepusz
-
GraphML files now validate for identical edge & vertex attribute names
- 2553. By Gábor Csárdi
-
Fixed a bug in igraph_
vector_ ptr_pop_ back. Last element was not returned. - 2554. By Gábor Csárdi
-
Fixed some return values in the revolver functions.
- 2555. By Gábor Csárdi
-
Eliminated some gcc warnings because of unused variables.
- 2556. By Gábor Csárdi
-
R: eliminated a potentially undefined return value.
- 2557. By Gábor Csárdi
-
R: handle some enum cases in a switch() that never actually happen. To eliminate gcc warnings.
- 2558. By Gábor Csárdi
-
Updated stimulus to generate R code without unused variables.
- 2559. By Gábor Csárdi
-
R: update argument names for onLoad(), as suggested by R docs.
- 2560. By Gábor Csárdi
-
R: fixed some check NOTEs.
- 2561. By Gábor Csárdi
-
R: fixed a tkplot bug, when a font family was 'symbol'.
- 2562. By Gábor Csárdi
-
R: remove '/' from \name in manual pages.
- 2563. By Gábor Csárdi
-
R: fixed two as.dendogram bugs:
1) 'merges' matrix must be integer
2) 'merges' was misspelled as 'merged' - 2564. By Gábor Csárdi
-
Repaired PDF manual building, code examples are omitted from PDF and info manuals.
Gábor Csárdi (gabor.csardi) wrote : | # |
Added in revision #2565 (0.6-main).
Preview Diff
1 | === modified file 'src/adjlist.c' | |||
2 | --- src/adjlist.c 2011-07-15 09:34:29 +0000 | |||
3 | +++ src/adjlist.c 2011-09-12 16:01:36 +0000 | |||
4 | @@ -35,7 +35,7 @@ | |||
5 | 35 | * <para>Sometimes it is easier to work with a graph which is in | 35 | * <para>Sometimes it is easier to work with a graph which is in |
6 | 36 | * adjacency list format: a list of vectors; each vector contains the | 36 | * adjacency list format: a list of vectors; each vector contains the |
7 | 37 | * neighbor vertices or incident edges of a given vertex. Typically, | 37 | * neighbor vertices or incident edges of a given vertex. Typically, |
9 | 38 | * this representation is good if we need to iterate over the neigbors | 38 | * this representation is good if we need to iterate over the neighbors |
10 | 39 | * of all vertices many times. E.g. when finding the shortest paths | 39 | * of all vertices many times. E.g. when finding the shortest paths |
11 | 40 | * between every pairs of vertices or calculating closeness centrality | 40 | * between every pairs of vertices or calculating closeness centrality |
12 | 41 | * for all the vertices.</para> | 41 | * for all the vertices.</para> |
13 | @@ -515,7 +515,7 @@ | |||
14 | 515 | * (<code>IGRAPH_ALL</code>) are considered. It is ignored for | 515 | * (<code>IGRAPH_ALL</code>) are considered. It is ignored for |
15 | 516 | * undirected graphs. | 516 | * undirected graphs. |
16 | 517 | * \param simplify Constant, it gives whether to simplify the vectors | 517 | * \param simplify Constant, it gives whether to simplify the vectors |
18 | 518 | * in the adjacency list (<code>IGRAPH_SIMPLIFY</code>) ot not | 518 | * in the adjacency list (<code>IGRAPH_SIMPLIFY</code>) or not |
19 | 519 | * (<code>IGRAPH_DONT_SIMPLIFY</code>). | 519 | * (<code>IGRAPH_DONT_SIMPLIFY</code>). |
20 | 520 | * \return Error code. | 520 | * \return Error code. |
21 | 521 | * | 521 | * |
22 | 522 | 522 | ||
23 | === modified file 'src/bipartite.c' | |||
24 | --- src/bipartite.c 2011-03-01 20:27:49 +0000 | |||
25 | +++ src/bipartite.c 2011-09-12 16:01:36 +0000 | |||
26 | @@ -454,7 +454,7 @@ | |||
27 | 454 | * the graph is indeed bipartite with respect to the given \p types | 454 | * the graph is indeed bipartite with respect to the given \p types |
28 | 455 | * vector. If there is an edge connecting two vertices of the same | 455 | * vector. If there is an edge connecting two vertices of the same |
29 | 456 | * kind, then an error is reported. | 456 | * kind, then an error is reported. |
31 | 457 | * \param graph Pointer to an uninitlized graph object, the result is | 457 | * \param graph Pointer to an uninitialized graph object, the result is |
32 | 458 | * created here. | 458 | * created here. |
33 | 459 | * \param types Boolean vector giving the vertex types. The length of | 459 | * \param types Boolean vector giving the vertex types. The length of |
34 | 460 | * the vector defines the number of vertices in the graph. | 460 | * the vector defines the number of vertices in the graph. |
35 | 461 | 461 | ||
36 | === modified file 'src/cattributes.c' | |||
37 | --- src/cattributes.c 2011-05-02 15:42:15 +0000 | |||
38 | +++ src/cattributes.c 2011-09-12 16:01:36 +0000 | |||
39 | @@ -3035,7 +3035,7 @@ | |||
40 | 3035 | igraph_i_cattribute_free_rec(VECTOR(*gal)[j]); | 3035 | igraph_i_cattribute_free_rec(VECTOR(*gal)[j]); |
41 | 3036 | igraph_vector_ptr_remove(gal, j); | 3036 | igraph_vector_ptr_remove(gal, j); |
42 | 3037 | } else { | 3037 | } else { |
44 | 3038 | IGRAPH_WARNING("Cannot remove non-existant graph attribute"); | 3038 | IGRAPH_WARNING("Cannot remove non-existent graph attribute"); |
45 | 3039 | } | 3039 | } |
46 | 3040 | } | 3040 | } |
47 | 3041 | 3041 | ||
48 | @@ -3060,7 +3060,7 @@ | |||
49 | 3060 | igraph_i_cattribute_free_rec(VECTOR(*val)[j]); | 3060 | igraph_i_cattribute_free_rec(VECTOR(*val)[j]); |
50 | 3061 | igraph_vector_ptr_remove(val, j); | 3061 | igraph_vector_ptr_remove(val, j); |
51 | 3062 | } else { | 3062 | } else { |
53 | 3063 | IGRAPH_WARNING("Cannot remove non-existant graph attribute"); | 3063 | IGRAPH_WARNING("Cannot remove non-existent graph attribute"); |
54 | 3064 | } | 3064 | } |
55 | 3065 | } | 3065 | } |
56 | 3066 | 3066 | ||
57 | @@ -3085,7 +3085,7 @@ | |||
58 | 3085 | igraph_i_cattribute_free_rec(VECTOR(*eal)[j]); | 3085 | igraph_i_cattribute_free_rec(VECTOR(*eal)[j]); |
59 | 3086 | igraph_vector_ptr_remove(eal, j); | 3086 | igraph_vector_ptr_remove(eal, j); |
60 | 3087 | } else { | 3087 | } else { |
62 | 3088 | IGRAPH_WARNING("Cannot remove non-existant graph attribute"); | 3088 | IGRAPH_WARNING("Cannot remove non-existent graph attribute"); |
63 | 3089 | } | 3089 | } |
64 | 3090 | } | 3090 | } |
65 | 3091 | 3091 | ||
66 | 3092 | 3092 | ||
67 | === modified file 'src/centrality.c' | |||
68 | --- src/centrality.c 2011-07-07 11:07:36 +0000 | |||
69 | +++ src/centrality.c 2011-09-12 16:01:36 +0000 | |||
70 | @@ -454,7 +454,7 @@ | |||
71 | 454 | 454 | ||
72 | 455 | /** | 455 | /** |
73 | 456 | * \function igraph_eigenvector_centrality | 456 | * \function igraph_eigenvector_centrality |
75 | 457 | * Eigenvector centrality of the verices | 457 | * Eigenvector centrality of the vertices |
76 | 458 | * | 458 | * |
77 | 459 | * Eigenvector centrality is a measure of the importance of a node in a | 459 | * Eigenvector centrality is a measure of the importance of a node in a |
78 | 460 | * network. It assigns relative scores to all nodes in the network based | 460 | * network. It assigns relative scores to all nodes in the network based |
79 | 461 | 461 | ||
80 | === modified file 'src/cliques.c' | |||
81 | --- src/cliques.c 2011-03-01 20:27:49 +0000 | |||
82 | +++ src/cliques.c 2011-09-12 16:01:36 +0000 | |||
83 | @@ -799,7 +799,7 @@ | |||
84 | 799 | * in the graph which contains more vertices. | 799 | * in the graph which contains more vertices. |
85 | 800 | * | 800 | * |
86 | 801 | * </para><para> | 801 | * </para><para> |
88 | 802 | * Note that this is not neccessarily the same as a maximal clique, | 802 | * Note that this is not necessarily the same as a maximal clique, |
89 | 803 | * ie. the largest cliques are always maximal but a maximal clique is | 803 | * ie. the largest cliques are always maximal but a maximal clique is |
90 | 804 | * not always largest. | 804 | * not always largest. |
91 | 805 | * | 805 | * |
92 | 806 | 806 | ||
93 | === modified file 'src/cocitation.c' | |||
94 | --- src/cocitation.c 2011-07-15 08:42:15 +0000 | |||
95 | +++ src/cocitation.c 2011-09-12 16:01:36 +0000 | |||
96 | @@ -411,7 +411,7 @@ | |||
97 | 411 | * \endclist | 411 | * \endclist |
98 | 412 | * | 412 | * |
99 | 413 | * Time complexity: O(nd), n is the number of pairs in the given vector, d is | 413 | * Time complexity: O(nd), n is the number of pairs in the given vector, d is |
101 | 414 | * the (maximum) degree of the vertices in the grpah. | 414 | * the (maximum) degree of the vertices in the graph. |
102 | 415 | * | 415 | * |
103 | 416 | * \sa \ref igraph_similarity_jaccard() to calculate the Jaccard similarity | 416 | * \sa \ref igraph_similarity_jaccard() to calculate the Jaccard similarity |
104 | 417 | * between all pairs of a vertex set, or \ref igraph_similarity_dice() and | 417 | * between all pairs of a vertex set, or \ref igraph_similarity_dice() and |
105 | @@ -524,7 +524,7 @@ | |||
106 | 524 | * \endclist | 524 | * \endclist |
107 | 525 | * | 525 | * |
108 | 526 | * Time complexity: O(nd), n is the number of edges in the edge selector, d is | 526 | * Time complexity: O(nd), n is the number of edges in the edge selector, d is |
110 | 527 | * the (maximum) degree of the vertices in the grpah. | 527 | * the (maximum) degree of the vertices in the graph. |
111 | 528 | * | 528 | * |
112 | 529 | * \sa \ref igraph_similarity_jaccard() and \ref igraph_similarity_jaccard_pairs() | 529 | * \sa \ref igraph_similarity_jaccard() and \ref igraph_similarity_jaccard_pairs() |
113 | 530 | * to calculate the Jaccard similarity between all pairs of a vertex set or | 530 | * to calculate the Jaccard similarity between all pairs of a vertex set or |
114 | @@ -669,7 +669,7 @@ | |||
115 | 669 | * \endclist | 669 | * \endclist |
116 | 670 | * | 670 | * |
117 | 671 | * Time complexity: O(nd), n is the number of pairs in the given vector, d is | 671 | * Time complexity: O(nd), n is the number of pairs in the given vector, d is |
119 | 672 | * the (maximum) degree of the vertices in the grpah. | 672 | * the (maximum) degree of the vertices in the graph. |
120 | 673 | * | 673 | * |
121 | 674 | * \sa \ref igraph_similarity_dice() to calculate the Dice similarity | 674 | * \sa \ref igraph_similarity_dice() to calculate the Dice similarity |
122 | 675 | * between all pairs of a vertex set, or \ref igraph_similarity_jaccard(), | 675 | * between all pairs of a vertex set, or \ref igraph_similarity_jaccard(), |
123 | @@ -733,7 +733,7 @@ | |||
124 | 733 | * \endclist | 733 | * \endclist |
125 | 734 | * | 734 | * |
126 | 735 | * Time complexity: O(nd), n is the number of pairs in the given vector, d is | 735 | * Time complexity: O(nd), n is the number of pairs in the given vector, d is |
128 | 736 | * the (maximum) degree of the vertices in the grpah. | 736 | * the (maximum) degree of the vertices in the graph. |
129 | 737 | * | 737 | * |
130 | 738 | * \sa \ref igraph_similarity_dice() and \ref igraph_similarity_dice_pairs() | 738 | * \sa \ref igraph_similarity_dice() and \ref igraph_similarity_dice_pairs() |
131 | 739 | * to calculate the Dice similarity between all pairs of a vertex set or | 739 | * to calculate the Dice similarity between all pairs of a vertex set or |
132 | 740 | 740 | ||
133 | === modified file 'src/community.c' | |||
134 | --- src/community.c 2011-08-12 13:05:58 +0000 | |||
135 | +++ src/community.c 2011-09-12 16:01:36 +0000 | |||
136 | @@ -3006,7 +3006,7 @@ | |||
137 | 3006 | * - sum (n(*,j) choose 2) | 3006 | * - sum (n(*,j) choose 2) |
138 | 3007 | * + 2 * sum (n(i,j) choose 2). | 3007 | * + 2 * sum (n(i,j) choose 2). |
139 | 3008 | * | 3008 | * |
141 | 3009 | * Since a+b+c+d = (n choose 2) and this goes in the denumerator, we can | 3009 | * Since a+b+c+d = (n choose 2) and this goes in the denominator, we can |
142 | 3010 | * just as well start dividing each term in a+d by (n choose 2), which | 3010 | * just as well start dividing each term in a+d by (n choose 2), which |
143 | 3011 | * yields: | 3011 | * yields: |
144 | 3012 | * | 3012 | * |
145 | 3013 | 3013 | ||
146 | === modified file 'src/conversion.c' | |||
147 | --- src/conversion.c 2011-03-01 20:27:49 +0000 | |||
148 | +++ src/conversion.c 2011-09-12 16:01:36 +0000 | |||
149 | @@ -410,7 +410,7 @@ | |||
150 | 410 | * If the supplied graph is undirected, this function does nothing. | 410 | * If the supplied graph is undirected, this function does nothing. |
151 | 411 | * \param graph The graph object to convert. | 411 | * \param graph The graph object to convert. |
152 | 412 | * \param mode Constant, specifies the details of how exactly the | 412 | * \param mode Constant, specifies the details of how exactly the |
154 | 413 | * convesion is done. Possible values: \c | 413 | * conversion is done. Possible values: \c |
155 | 414 | * IGRAPH_TO_UNDIRECTED_EACH: the number of edges remains | 414 | * IGRAPH_TO_UNDIRECTED_EACH: the number of edges remains |
156 | 415 | * constant, an undirected edge is created for each directed | 415 | * constant, an undirected edge is created for each directed |
157 | 416 | * one, this version might create graphs with multiple edges; | 416 | * one, this version might create graphs with multiple edges; |
158 | 417 | 417 | ||
159 | === modified file 'src/decomposition.c' | |||
160 | --- src/decomposition.c 2010-06-28 10:30:37 +0000 | |||
161 | +++ src/decomposition.c 2011-09-12 16:01:36 +0000 | |||
162 | @@ -102,7 +102,7 @@ | |||
163 | 102 | VECTOR(prev)[v]=v; | 102 | VECTOR(prev)[v]=v; |
164 | 103 | } | 103 | } |
165 | 104 | VECTOR(next)[no_of_nodes-1] = 0; | 104 | VECTOR(next)[no_of_nodes-1] = 0; |
167 | 105 | /* size is allready all zero */ | 105 | /* size is already all zero */ |
168 | 106 | 106 | ||
169 | 107 | /***************/ | 107 | /***************/ |
170 | 108 | /* i:=n; j:=0; */ | 108 | /* i:=n; j:=0; */ |
171 | @@ -222,7 +222,7 @@ | |||
172 | 222 | * chordless cycles have at most three nodes. | 222 | * chordless cycles have at most three nodes. |
173 | 223 | * | 223 | * |
174 | 224 | * If either \p alpha or \p alpha1 is given, then the other is | 224 | * If either \p alpha or \p alpha1 is given, then the other is |
176 | 225 | * calculated by taking simply the inverse. If neighter are given, | 225 | * calculated by taking simply the inverse. If neither are given, |
177 | 226 | * then \ref igraph_maximum_cardinality_search() is called to calculate | 226 | * then \ref igraph_maximum_cardinality_search() is called to calculate |
178 | 227 | * them. | 227 | * them. |
179 | 228 | * \param graph The input graph, it might be directed, but edge | 228 | * \param graph The input graph, it might be directed, but edge |
180 | 229 | 229 | ||
181 | === modified file 'src/flow.c' | |||
182 | --- src/flow.c 2011-03-23 05:34:22 +0000 | |||
183 | +++ src/flow.c 2011-09-12 16:01:36 +0000 | |||
184 | @@ -63,9 +63,9 @@ | |||
185 | 63 | * (15) edge connectivity, directed graph | 63 | * (15) edge connectivity, directed graph |
186 | 64 | * (16) edge connectivity, undirected graph | 64 | * (16) edge connectivity, undirected graph |
187 | 65 | * (17) s-t vertex connectivity, directed graph | 65 | * (17) s-t vertex connectivity, directed graph |
189 | 66 | * (18) s-t vertex connectivity, undireced graph | 66 | * (18) s-t vertex connectivity, undirected graph |
190 | 67 | * (19) vertex connectivity, directed graph | 67 | * (19) vertex connectivity, directed graph |
192 | 68 | * (20) vertex connectivity, undireced graph | 68 | * (20) vertex connectivity, undirected graph |
193 | 69 | * (21) s-t number of edge disjoint paths, directed graph | 69 | * (21) s-t number of edge disjoint paths, directed graph |
194 | 70 | * (22) s-t number of edge disjoint paths, undirected graph | 70 | * (22) s-t number of edge disjoint paths, undirected graph |
195 | 71 | * (23) s-t number of vertex disjoint paths, directed graph | 71 | * (23) s-t number of vertex disjoint paths, directed graph |
196 | @@ -885,7 +885,7 @@ | |||
197 | 885 | * target vertex. The maximum flow is the flow with the maximum | 885 | * target vertex. The maximum flow is the flow with the maximum |
198 | 886 | * value. </para> | 886 | * value. </para> |
199 | 887 | * | 887 | * |
201 | 888 | * <para> According to a theorem by Ford and Furkelson | 888 | * <para> According to a theorem by Ford and Fulkerson |
202 | 889 | * (L. R. Ford Jr. and D. R. Fulkerson. Maximal flow through a | 889 | * (L. R. Ford Jr. and D. R. Fulkerson. Maximal flow through a |
203 | 890 | * network. Canadian J. Math., 8:399-404, 1956.) the maximum flow | 890 | * network. Canadian J. Math., 8:399-404, 1956.) the maximum flow |
204 | 891 | * between two vertices is the same as the | 891 | * between two vertices is the same as the |
205 | @@ -985,7 +985,7 @@ | |||
206 | 985 | * vertices in the first partition of the cut are stored | 985 | * vertices in the first partition of the cut are stored |
207 | 986 | * here. This argument is ignored if it is a null pointer. | 986 | * here. This argument is ignored if it is a null pointer. |
208 | 987 | * \param partition2 Pointer to a real vector, the vertex ids of the | 987 | * \param partition2 Pointer to a real vector, the vertex ids of the |
210 | 988 | * vertices in the second partinio of the cut are stored here. | 988 | * vertices in the second partition of the cut are stored here. |
211 | 989 | * This argument is ignored if it is a null pointer. | 989 | * This argument is ignored if it is a null pointer. |
212 | 990 | * \param source Integer, the id of the source vertex. | 990 | * \param source Integer, the id of the source vertex. |
213 | 991 | * \param target Integer, the id of the target vertex. | 991 | * \param target Integer, the id of the target vertex. |
214 | @@ -996,7 +996,7 @@ | |||
215 | 996 | * | 996 | * |
216 | 997 | * \sa \ref igraph_maxflow(). | 997 | * \sa \ref igraph_maxflow(). |
217 | 998 | * | 998 | * |
219 | 999 | * Time complecity: see \ref igraph_maxflow(). | 999 | * Time complexity: see \ref igraph_maxflow(). |
220 | 1000 | */ | 1000 | */ |
221 | 1001 | 1001 | ||
222 | 1002 | int igraph_st_mincut(const igraph_t *graph, igraph_real_t *value, | 1002 | int igraph_st_mincut(const igraph_t *graph, igraph_real_t *value, |
223 | @@ -1054,7 +1054,7 @@ | |||
224 | 1054 | /* } */ | 1054 | /* } */ |
225 | 1055 | 1055 | ||
226 | 1056 | /* | 1056 | /* |
228 | 1057 | * This is the Stoer-Wagner algorithm, it works for calcuating the | 1057 | * This is the Stoer-Wagner algorithm, it works for calculating the |
229 | 1058 | * minimum cut for undirected graphs, for the whole graph. | 1058 | * minimum cut for undirected graphs, for the whole graph. |
230 | 1059 | * I.e. this is basically the edge-connectivity of the graph. | 1059 | * I.e. this is basically the edge-connectivity of the graph. |
231 | 1060 | * It can also calculate the cut itself, not just the cut value. | 1060 | * It can also calculate the cut itself, not just the cut value. |
232 | @@ -1219,7 +1219,7 @@ | |||
233 | 1219 | char *mark; | 1219 | char *mark; |
234 | 1220 | mark=igraph_Calloc(no_of_nodes, char); | 1220 | mark=igraph_Calloc(no_of_nodes, char); |
235 | 1221 | if (!mark) { | 1221 | if (!mark) { |
237 | 1222 | IGRAPH_ERROR("Not enough memory for minumum cut", IGRAPH_ENOMEM); | 1222 | IGRAPH_ERROR("Not enough memory for minimum cut", IGRAPH_ENOMEM); |
238 | 1223 | } | 1223 | } |
239 | 1224 | IGRAPH_FINALLY(igraph_free, mark); | 1224 | IGRAPH_FINALLY(igraph_free, mark); |
240 | 1225 | 1225 | ||
241 | @@ -1401,7 +1401,7 @@ | |||
242 | 1401 | * This function calculates the minimum cut in a graph. | 1401 | * This function calculates the minimum cut in a graph. |
243 | 1402 | * The minimum cut is the minimum set of edges which needs to be | 1402 | * The minimum cut is the minimum set of edges which needs to be |
244 | 1403 | * removed to disconnect the graph. The minimum is calculated using | 1403 | * removed to disconnect the graph. The minimum is calculated using |
246 | 1404 | * the weigths (\p capacity) of the edges, so the cut with the minimum | 1404 | * the weights (\p capacity) of the edges, so the cut with the minimum |
247 | 1405 | * total capacity is calculated. | 1405 | * total capacity is calculated. |
248 | 1406 | * | 1406 | * |
249 | 1407 | * </para><para> For directed graphs an implementation based on | 1407 | * </para><para> For directed graphs an implementation based on |
250 | @@ -1717,7 +1717,7 @@ | |||
251 | 1717 | * \c IGRAPH_VCONN_NUMBER_OF_NODES, return the number of nodes. | 1717 | * \c IGRAPH_VCONN_NUMBER_OF_NODES, return the number of nodes. |
252 | 1718 | * \c IGRAPH_VCONN_IGNORE, ignore the fact that the two vertices | 1718 | * \c IGRAPH_VCONN_IGNORE, ignore the fact that the two vertices |
253 | 1719 | * are connected and calculated the number of vertices needed | 1719 | * are connected and calculated the number of vertices needed |
255 | 1720 | * to aliminate all paths except for the trivial (direct) paths | 1720 | * to eliminate all paths except for the trivial (direct) paths |
256 | 1721 | * between \c source and \c vertex. TOOD: what about neighbors? | 1721 | * between \c source and \c vertex. TOOD: what about neighbors? |
257 | 1722 | * \return Error code. | 1722 | * \return Error code. |
258 | 1723 | * | 1723 | * |
259 | @@ -1862,7 +1862,7 @@ | |||
260 | 1862 | * They were suggested by Peter McMahan, thanks Peter. | 1862 | * They were suggested by Peter McMahan, thanks Peter. |
261 | 1863 | * \return Error code. | 1863 | * \return Error code. |
262 | 1864 | * | 1864 | * |
264 | 1865 | * Time complecity: O(|V|^5). | 1865 | * Time complexity: O(|V|^5). |
265 | 1866 | * | 1866 | * |
266 | 1867 | * \sa \ref igraph_st_vertex_connectivity(), \ref igraph_maxflow_value(), | 1867 | * \sa \ref igraph_st_vertex_connectivity(), \ref igraph_maxflow_value(), |
267 | 1868 | * and \ref igraph_edge_connectivity(). | 1868 | * and \ref igraph_edge_connectivity(). |
268 | @@ -1997,7 +1997,7 @@ | |||
269 | 1997 | * \param target The id of the target vertex. | 1997 | * \param target The id of the target vertex. |
270 | 1998 | * \return Error code. | 1998 | * \return Error code. |
271 | 1999 | * | 1999 | * |
273 | 2000 | * Time complecity: O(|V|^3), but see the discussion at \ref | 2000 | * Time complexity: O(|V|^3), but see the discussion at \ref |
274 | 2001 | * igraph_maxflow_value(). | 2001 | * igraph_maxflow_value(). |
275 | 2002 | * | 2002 | * |
276 | 2003 | * \sa \ref igraph_vertex_disjoint_paths(), \ref | 2003 | * \sa \ref igraph_vertex_disjoint_paths(), \ref |
277 | 2004 | 2004 | ||
278 | === modified file 'src/foreign.c' | |||
279 | --- src/foreign.c 2011-05-02 15:42:15 +0000 | |||
280 | +++ src/foreign.c 2011-09-12 16:01:36 +0000 | |||
281 | @@ -158,7 +158,7 @@ | |||
282 | 158 | * \param instream Pointer to a stream, it should be readable. | 158 | * \param instream Pointer to a stream, it should be readable. |
283 | 159 | * \param predefnames Pointer to the symbolic names of the vertices in | 159 | * \param predefnames Pointer to the symbolic names of the vertices in |
284 | 160 | * the file. If \c NULL is given here then vertex ids will be | 160 | * the file. If \c NULL is given here then vertex ids will be |
286 | 161 | * assigned to vertex names in the order of their appearence in | 161 | * assigned to vertex names in the order of their appearance in |
287 | 162 | * the \c .ncol file. If it is not \c NULL and some unknown | 162 | * the \c .ncol file. If it is not \c NULL and some unknown |
288 | 163 | * vertex names are found in the \c .ncol file then new vertex | 163 | * vertex names are found in the \c .ncol file then new vertex |
289 | 164 | * ids will be assigned to them. | 164 | * ids will be assigned to them. |
290 | @@ -1367,7 +1367,7 @@ | |||
291 | 1367 | snprintf(name, sizeof(name)/sizeof(char)-1, "%li", to); | 1367 | snprintf(name, sizeof(name)/sizeof(char)-1, "%li", to); |
292 | 1368 | IGRAPH_CHECK(igraph_trie_get(&trie, name, &to)); | 1368 | IGRAPH_CHECK(igraph_trie_get(&trie, name, &to)); |
293 | 1369 | if (igraph_trie_size(&trie) != no_of_nodes) { | 1369 | if (igraph_trie_size(&trie) != no_of_nodes) { |
295 | 1370 | IGRAPH_ERROR("Unkown node id found at an edge", IGRAPH_PARSEERROR); | 1370 | IGRAPH_ERROR("Unknown node id found at an edge", IGRAPH_PARSEERROR); |
296 | 1371 | } | 1371 | } |
297 | 1372 | VECTOR(edges)[edgeptr++]=from; | 1372 | VECTOR(edges)[edgeptr++]=from; |
298 | 1373 | VECTOR(edges)[edgeptr++]=to; | 1373 | VECTOR(edges)[edgeptr++]=to; |
299 | @@ -2339,7 +2339,7 @@ | |||
300 | 2339 | * file as well, if they are numeric of string. | 2339 | * file as well, if they are numeric of string. |
301 | 2340 | * | 2340 | * |
302 | 2341 | * </para><para> As igraph is more forgiving about attribute names, it might | 2341 | * </para><para> As igraph is more forgiving about attribute names, it might |
304 | 2342 | * be neccessary to simplify the them before writing to the GML file. | 2342 | * be necessary to simplify the them before writing to the GML file. |
305 | 2343 | * This way we'll have a syntactically correct GML file. The following | 2343 | * This way we'll have a syntactically correct GML file. The following |
306 | 2344 | * simple procedure is performed on each attribute name: first the alphanumeric | 2344 | * simple procedure is performed on each attribute name: first the alphanumeric |
307 | 2345 | * characters are extracted, the others are ignored. Then if the first character | 2345 | * characters are extracted, the others are ignored. Then if the first character |
308 | 2346 | 2346 | ||
309 | === modified file 'src/igraph_hashtable.c' | |||
310 | --- src/igraph_hashtable.c 2009-05-07 17:49:52 +0000 | |||
311 | +++ src/igraph_hashtable.c 2011-09-12 16:01:36 +0000 | |||
312 | @@ -45,7 +45,7 @@ | |||
313 | 45 | igraph_strvector_destroy(&ht->defaults); | 45 | igraph_strvector_destroy(&ht->defaults); |
314 | 46 | } | 46 | } |
315 | 47 | 47 | ||
317 | 48 | /* Note: may leave the hashtable in an inconsistent state if a new | 48 | /* Note: may leave the hash table in an inconsistent state if a new |
318 | 49 | element is added, but this is not a big problem, since while the | 49 | element is added, but this is not a big problem, since while the |
319 | 50 | defaults, or the defaults plus the elements may contain more elements | 50 | defaults, or the defaults plus the elements may contain more elements |
320 | 51 | than the keys trie, but the data is always retrieved based on the trie | 51 | than the keys trie, but the data is always retrieved based on the trie |
321 | 52 | 52 | ||
322 | === modified file 'src/igraph_strvector.c' | |||
323 | --- src/igraph_strvector.c 2011-05-02 15:42:15 +0000 | |||
324 | +++ src/igraph_strvector.c 2011-09-12 16:01:36 +0000 | |||
325 | @@ -38,7 +38,7 @@ | |||
326 | 38 | * The current implementation is very simple and not too efficient. It | 38 | * The current implementation is very simple and not too efficient. It |
327 | 39 | * works fine for not too many strings, e.g. the list of attribute | 39 | * works fine for not too many strings, e.g. the list of attribute |
328 | 40 | * names is returned in a string vector by \ref | 40 | * names is returned in a string vector by \ref |
330 | 41 | * igraph_cattribute_list(). Do not expect great performace from this | 41 | * igraph_cattribute_list(). Do not expect great performance from this |
331 | 42 | * type.</para> | 42 | * type.</para> |
332 | 43 | * | 43 | * |
333 | 44 | * <para> | 44 | * <para> |
334 | @@ -323,7 +323,7 @@ | |||
335 | 323 | * Concatenate two string vectors. | 323 | * Concatenate two string vectors. |
336 | 324 | * | 324 | * |
337 | 325 | * \param to The first string vector, the result is stored here. | 325 | * \param to The first string vector, the result is stored here. |
339 | 326 | * \param from The second string vector, it is kep unchanged. | 326 | * \param from The second string vector, it is kept unchanged. |
340 | 327 | * \return Error code. | 327 | * \return Error code. |
341 | 328 | * | 328 | * |
342 | 329 | * Time complexity: O(n+l2), n is the number of strings in the new | 329 | * Time complexity: O(n+l2), n is the number of strings in the new |
343 | @@ -443,7 +443,7 @@ | |||
344 | 443 | if (tmp != 0) { | 443 | if (tmp != 0) { |
345 | 444 | v->data=tmp; | 444 | v->data=tmp; |
346 | 445 | } | 445 | } |
348 | 446 | IGRAPH_ERROR("canot resize string vector", IGRAPH_ENOMEM); | 446 | IGRAPH_ERROR("Cannot resize string vector", IGRAPH_ENOMEM); |
349 | 447 | } | 447 | } |
350 | 448 | } | 448 | } |
351 | 449 | v->len = newsize; | 449 | v->len = newsize; |
352 | 450 | 450 | ||
353 | === modified file 'src/igraph_trie.c' | |||
354 | --- src/igraph_trie.c 2009-05-07 17:49:52 +0000 | |||
355 | +++ src/igraph_trie.c 2011-09-12 16:01:36 +0000 | |||
356 | @@ -338,7 +338,7 @@ | |||
357 | 338 | char *tmp=igraph_Calloc(length+1, char); | 338 | char *tmp=igraph_Calloc(length+1, char); |
358 | 339 | 339 | ||
359 | 340 | if (tmp==0) { | 340 | if (tmp==0) { |
361 | 341 | IGRAPH_ERROR("canot get from trie", IGRAPH_ENOMEM); | 341 | IGRAPH_ERROR("Cannot get from trie", IGRAPH_ENOMEM); |
362 | 342 | } | 342 | } |
363 | 343 | 343 | ||
364 | 344 | strncpy(tmp, key, length); | 344 | strncpy(tmp, key, length); |
365 | 345 | 345 | ||
366 | === modified file 'src/lapack.c' | |||
367 | --- src/lapack.c 2011-03-01 20:27:49 +0000 | |||
368 | +++ src/lapack.c 2011-09-12 16:01:36 +0000 | |||
369 | @@ -367,7 +367,7 @@ | |||
370 | 367 | "between 1 and n", IGRAPH_EINVAL); | 367 | "between 1 and n", IGRAPH_EINVAL); |
371 | 368 | } | 368 | } |
372 | 369 | if (which==IGRAPH_LAPACK_DSYEV_SELECT && iu-il < 0) { | 369 | if (which==IGRAPH_LAPACK_DSYEV_SELECT && iu-il < 0) { |
374 | 370 | IGRAPH_ERROR("Invalied 'il' and/or 'iu' values", IGRAPH_EINVAL); | 370 | IGRAPH_ERROR("Invalid 'il' and/or 'iu' values", IGRAPH_EINVAL); |
375 | 371 | } | 371 | } |
376 | 372 | 372 | ||
377 | 373 | IGRAPH_CHECK(igraph_matrix_copy(&Acopy, A)); | 373 | IGRAPH_CHECK(igraph_matrix_copy(&Acopy, A)); |
378 | @@ -598,7 +598,7 @@ | |||
379 | 598 | * Eigenvalues/vectors of nonsymmetric matrices, expert mode | 598 | * Eigenvalues/vectors of nonsymmetric matrices, expert mode |
380 | 599 | * | 599 | * |
381 | 600 | * This function calculates the eigenvalues and optionally the left | 600 | * This function calculates the eigenvalues and optionally the left |
383 | 601 | * and/or right eigenvectors of a nonsymmetrix N-by-N real matrix. | 601 | * and/or right eigenvectors of a nonsymmetric N-by-N real matrix. |
384 | 602 | * | 602 | * |
385 | 603 | * </para><para> | 603 | * </para><para> |
386 | 604 | * Optionally also, it computes a balancing transformation to improve | 604 | * Optionally also, it computes a balancing transformation to improve |
387 | 605 | 605 | ||
388 | === modified file 'src/layout.c' | |||
389 | --- src/layout.c 2011-05-02 15:42:15 +0000 | |||
390 | +++ src/layout.c 2011-09-12 16:01:36 +0000 | |||
391 | @@ -968,7 +968,7 @@ | |||
392 | 968 | * algorithm and program | 968 | * algorithm and program |
393 | 969 | * (http://bioinformatics.icmb.utexas.edu/lgl/). But unlike LGL, this | 969 | * (http://bioinformatics.icmb.utexas.edu/lgl/). But unlike LGL, this |
394 | 970 | * version uses a Fruchterman-Reingold style simulated annealing | 970 | * version uses a Fruchterman-Reingold style simulated annealing |
396 | 971 | * algorithm for placing the vertices. The speedup is achived by | 971 | * algorithm for placing the vertices. The speedup is achieved by |
397 | 972 | * placing the vertices on a grid and calculating the repulsion only | 972 | * placing the vertices on a grid and calculating the repulsion only |
398 | 973 | * for vertices which are closer to each other than a limit. | 973 | * for vertices which are closer to each other than a limit. |
399 | 974 | * | 974 | * |
400 | @@ -986,7 +986,7 @@ | |||
401 | 986 | * \param coolexp The cooling exponent. A reasonable default value is | 986 | * \param coolexp The cooling exponent. A reasonable default value is |
402 | 987 | * 1.5. | 987 | * 1.5. |
403 | 988 | * \param repulserad Determines the radius at which vertex-vertex | 988 | * \param repulserad Determines the radius at which vertex-vertex |
405 | 989 | * repulsion cancels out attraction of adjacenct vertices. A | 989 | * repulsion cancels out attraction of adjacent vertices. A |
406 | 990 | * reasonable default value is \p area times the number of vertices. | 990 | * reasonable default value is \p area times the number of vertices. |
407 | 991 | * \param cellsize The size of the grid cells, one side of the | 991 | * \param cellsize The size of the grid cells, one side of the |
408 | 992 | * square. A reasonable default value is the fourth root of | 992 | * square. A reasonable default value is the fourth root of |
409 | @@ -1999,7 +1999,7 @@ | |||
410 | 1999 | long int this_node) { | 1999 | long int this_node) { |
411 | 2000 | 2000 | ||
412 | 2001 | // We know what the directed force is. We now need to translate it | 2001 | // We know what the directed force is. We now need to translate it |
414 | 2002 | // into the appropriate x and y componenets. | 2002 | // into the appropriate x and y components. |
415 | 2003 | // First, assume: | 2003 | // First, assume: |
416 | 2004 | // other_node | 2004 | // other_node |
417 | 2005 | // /| | 2005 | // /| |
418 | @@ -2201,7 +2201,7 @@ | |||
419 | 2201 | * This is a port of the graphopt layout algorithm by Michael Schmuhl. | 2201 | * This is a port of the graphopt layout algorithm by Michael Schmuhl. |
420 | 2202 | * graphopt version 0.4.1 was rewritten in C and the support for | 2202 | * graphopt version 0.4.1 was rewritten in C and the support for |
421 | 2203 | * layers was removed (might be added later) and a code was a bit | 2203 | * layers was removed (might be added later) and a code was a bit |
423 | 2204 | * reorganized to avoid some unneccessary steps is the node charge (see below) | 2204 | * reorganized to avoid some unnecessary steps is the node charge (see below) |
424 | 2205 | * is zero. | 2205 | * is zero. |
425 | 2206 | * | 2206 | * |
426 | 2207 | * </para><para> | 2207 | * </para><para> |
427 | @@ -2304,7 +2304,7 @@ | |||
428 | 2304 | // will only happen in extremely rare circumstances, and when | 2304 | // will only happen in extremely rare circumstances, and when |
429 | 2305 | // it does, springs will probably pull them apart anyway. | 2305 | // it does, springs will probably pull them apart anyway. |
430 | 2306 | // also, if we are more than 50 away, the electric force | 2306 | // also, if we are more than 50 away, the electric force |
432 | 2307 | // will be negligable. | 2307 | // will be negligible. |
433 | 2308 | // ***** may not always be desirable **** | 2308 | // ***** may not always be desirable **** |
434 | 2309 | if ((distance != 0.0) && (distance < 500.0)) { | 2309 | if ((distance != 0.0) && (distance < 500.0)) { |
435 | 2310 | // if (distance != 0.0) { | 2310 | // if (distance != 0.0) { |
436 | 2311 | 2311 | ||
437 | === modified file 'src/mixing.c' | |||
438 | --- src/mixing.c 2011-03-29 02:53:16 +0000 | |||
439 | +++ src/mixing.c 2011-09-12 16:01:36 +0000 | |||
440 | @@ -29,8 +29,8 @@ | |||
441 | 29 | * Assortativity of a graph based on vertex categories | 29 | * Assortativity of a graph based on vertex categories |
442 | 30 | * | 30 | * |
443 | 31 | * Assuming the vertices of the input graph belong to different | 31 | * Assuming the vertices of the input graph belong to different |
446 | 32 | * categories, this function calculates the assortativity coeffient of | 32 | * categories, this function calculates the assortativity coefficient of |
447 | 33 | * the graph. The assortativity coeffient is between minus one and one | 33 | * the graph. The assortativity coefficient is between minus one and one |
448 | 34 | * and it is one if all connections stay within categories, it is | 34 | * and it is one if all connections stay within categories, it is |
449 | 35 | * minus one, if the network is perfectly disassortative. For a | 35 | * minus one, if the network is perfectly disassortative. For a |
450 | 36 | * randomly connected network it is (asymptotically) zero. | 36 | * randomly connected network it is (asymptotically) zero. |
451 | @@ -49,7 +49,7 @@ | |||
452 | 49 | * graphs. | 49 | * graphs. |
453 | 50 | * \return Error code. | 50 | * \return Error code. |
454 | 51 | * | 51 | * |
456 | 52 | * Time complecity: O(|E|+t), |E| is the number of edges, t is the | 52 | * Time complexity: O(|E|+t), |E| is the number of edges, t is the |
457 | 53 | * number of vertex types. | 53 | * number of vertex types. |
458 | 54 | * | 54 | * |
459 | 55 | * \sa \ref igraph_assortativity if the vertex types are defines by | 55 | * \sa \ref igraph_assortativity if the vertex types are defines by |
460 | 56 | 56 | ||
461 | === modified file 'src/operators.c' | |||
462 | --- src/operators.c 2011-03-01 20:27:49 +0000 | |||
463 | +++ src/operators.c 2011-09-12 16:01:36 +0000 | |||
464 | @@ -108,7 +108,7 @@ | |||
465 | 108 | * \brief The disjint union of many graphs. | 108 | * \brief The disjint union of many graphs. |
466 | 109 | * | 109 | * |
467 | 110 | * </para><para> | 110 | * </para><para> |
469 | 111 | * First the vertices in the graphs will be relabed with new vertex | 111 | * First the vertices in the graphs will be relabeled with new vertex |
470 | 112 | * ids to have pairwise disjoint vertex id sets and then the union of | 112 | * ids to have pairwise disjoint vertex id sets and then the union of |
471 | 113 | * the graphs is formed. | 113 | * the graphs is formed. |
472 | 114 | * The number of vertices and edges in the result is the total number | 114 | * The number of vertices and edges in the result is the total number |
473 | @@ -544,7 +544,7 @@ | |||
474 | 544 | * | 544 | * |
475 | 545 | * </para><para> | 545 | * </para><para> |
476 | 546 | * The result graph will contain as many vertices as the largest graph | 546 | * The result graph will contain as many vertices as the largest graph |
478 | 547 | * among the agruments does, and an edge will be included in it if it | 547 | * among the arguments does, and an edge will be included in it if it |
479 | 548 | * is part of at least one operand graph. | 548 | * is part of at least one operand graph. |
480 | 549 | * | 549 | * |
481 | 550 | * </para><para> | 550 | * </para><para> |
482 | @@ -916,7 +916,7 @@ | |||
483 | 916 | * | 916 | * |
484 | 917 | * \param res Pointer to an uninitialized graph object, the result | 917 | * \param res Pointer to an uninitialized graph object, the result |
485 | 918 | * will be stored here. | 918 | * will be stored here. |
487 | 919 | * \param g1 The firs operarand, a graph object. | 919 | * \param g1 The firs operand, a graph object. |
488 | 920 | * \param g2 The second operand, another graph object. | 920 | * \param g2 The second operand, another graph object. |
489 | 921 | * \return Error code. | 921 | * \return Error code. |
490 | 922 | * | 922 | * |
491 | 923 | 923 | ||
492 | === modified file 'src/revolver_cit.c' | |||
493 | --- src/revolver_cit.c 2009-05-07 15:43:54 +0000 | |||
494 | +++ src/revolver_cit.c 2011-09-12 16:01:36 +0000 | |||
495 | @@ -1024,7 +1024,7 @@ | |||
496 | 1024 | maxdegree, agebins)); | 1024 | maxdegree, agebins)); |
497 | 1025 | } | 1025 | } |
498 | 1026 | 1026 | ||
500 | 1027 | /* error calculattion */ | 1027 | /* error calculation */ |
501 | 1028 | if (logprob || lognull) { | 1028 | if (logprob || lognull) { |
502 | 1029 | IGRAPH_CHECK(igraph_revolver_error_ade(graph, kernel, &st, | 1029 | IGRAPH_CHECK(igraph_revolver_error_ade(graph, kernel, &st, |
503 | 1030 | cats, nocats, maxdegree, | 1030 | cats, nocats, maxdegree, |
504 | 1031 | 1031 | ||
505 | === modified file 'src/revolver_ml_cit.c' | |||
506 | --- src/revolver_ml_cit.c 2010-10-04 15:57:08 +0000 | |||
507 | +++ src/revolver_ml_cit.c 2011-09-12 16:01:36 +0000 | |||
508 | @@ -163,7 +163,7 @@ | |||
509 | 163 | return data->lastf; | 163 | return data->lastf; |
510 | 164 | } | 164 | } |
511 | 165 | 165 | ||
513 | 166 | /* This function gievs the gradient of the objective function at | 166 | /* This function gives the gradient of the objective function at |
514 | 167 | the supplied parameter vector. Called by the optimizer. | 167 | the supplied parameter vector. Called by the optimizer. |
515 | 168 | */ | 168 | */ |
516 | 169 | 169 | ||
517 | 170 | 170 | ||
518 | === modified file 'src/sparsemat.c' | |||
519 | --- src/sparsemat.c 2011-05-03 14:54:09 +0000 | |||
520 | +++ src/sparsemat.c 2011-09-12 16:01:36 +0000 | |||
521 | @@ -91,7 +91,7 @@ | |||
522 | 91 | * \param rows The number of rows in the matrix. | 91 | * \param rows The number of rows in the matrix. |
523 | 92 | * \param cols The number of columns. | 92 | * \param cols The number of columns. |
524 | 93 | * \param nzmax The maximum number of non-zero elements in the | 93 | * \param nzmax The maximum number of non-zero elements in the |
526 | 94 | * matrix. It is not compulsary to get this right, but it is | 94 | * matrix. It is not compulsory to get this right, but it is |
527 | 95 | * useful for the allocation of the proper amount of memory. | 95 | * useful for the allocation of the proper amount of memory. |
528 | 96 | * \return Error code. | 96 | * \return Error code. |
529 | 97 | * | 97 | * |
530 | @@ -220,7 +220,7 @@ | |||
531 | 220 | 220 | ||
532 | 221 | /** | 221 | /** |
533 | 222 | * \function igraph_sparsemat_type | 222 | * \function igraph_sparsemat_type |
535 | 223 | * Type of a sprase matrix (triplet or column-compressed) | 223 | * Type of a sparse matrix (triplet or column-compressed) |
536 | 224 | * | 224 | * |
537 | 225 | * Gives whether a sparse matrix is stored in the triplet format or in | 225 | * Gives whether a sparse matrix is stored in the triplet format or in |
538 | 226 | * column-compressed format. | 226 | * column-compressed format. |
539 | @@ -295,7 +295,7 @@ | |||
540 | 295 | IGRAPH_ERROR("Invalid row permutation length", IGRAPH_FAILURE); | 295 | IGRAPH_ERROR("Invalid row permutation length", IGRAPH_FAILURE); |
541 | 296 | } | 296 | } |
542 | 297 | if (ncol != igraph_vector_int_size(q)) { | 297 | if (ncol != igraph_vector_int_size(q)) { |
544 | 298 | IGRAPH_ERROR("Invalud column permutation length", IGRAPH_FAILURE); | 298 | IGRAPH_ERROR("Invalid column permutation length", IGRAPH_FAILURE); |
545 | 299 | } | 299 | } |
546 | 300 | 300 | ||
547 | 301 | /* We invert the permutation by hand */ | 301 | /* We invert the permutation by hand */ |
548 | @@ -669,7 +669,7 @@ | |||
549 | 669 | int igraph_sparsemat_droptol(igraph_sparsemat_t *A, igraph_real_t tol) { | 669 | int igraph_sparsemat_droptol(igraph_sparsemat_t *A, igraph_real_t tol) { |
550 | 670 | 670 | ||
551 | 671 | if (!cs_droptol(A->cs, tol)) { | 671 | if (!cs_droptol(A->cs, tol)) { |
553 | 672 | IGRAPH_ERROR("Cannor drop (almost) zeros from sparse matrix", | 672 | IGRAPH_ERROR("Cannot drop (almost) zeros from sparse matrix", |
554 | 673 | IGRAPH_FAILURE); | 673 | IGRAPH_FAILURE); |
555 | 674 | } | 674 | } |
556 | 675 | 675 | ||
557 | @@ -1319,7 +1319,7 @@ | |||
558 | 1319 | 1319 | ||
559 | 1320 | /** | 1320 | /** |
560 | 1321 | * \function igraph_sparsemat_arpack_rssolve | 1321 | * \function igraph_sparsemat_arpack_rssolve |
562 | 1322 | * Eigenvalues and eigenvectors of a symmetrix sparse matrix via ARPACK | 1322 | * Eigenvalues and eigenvectors of a symmetric sparse matrix via ARPACK |
563 | 1323 | * | 1323 | * |
564 | 1324 | * \param The input matrix, must be column-compressed. | 1324 | * \param The input matrix, must be column-compressed. |
565 | 1325 | * \param options It is passed to \ref igraph_arpack_rssolve(). See | 1325 | * \param options It is passed to \ref igraph_arpack_rssolve(). See |
566 | @@ -1642,7 +1642,7 @@ | |||
567 | 1642 | * | 1642 | * |
568 | 1643 | * Solves a linear system using a QR decomposition of its coefficient | 1643 | * Solves a linear system using a QR decomposition of its coefficient |
569 | 1644 | * matrix. | 1644 | * matrix. |
571 | 1645 | * \param dis Symbolic analyis of the coefficient matrix, the result | 1645 | * \param dis Symbolic analysis of the coefficient matrix, the result |
572 | 1646 | * of \ref igraph_sparsemat_symbqr(). | 1646 | * of \ref igraph_sparsemat_symbqr(). |
573 | 1647 | * \param din The QR decomposition of the coefficient matrix, the | 1647 | * \param din The QR decomposition of the coefficient matrix, the |
574 | 1648 | * result of \ref igraph_sparsemat_qr(). | 1648 | * result of \ref igraph_sparsemat_qr(). |
575 | @@ -1968,7 +1968,7 @@ | |||
576 | 1968 | * \function igraph_sparsemat_count_nonzerotol | 1968 | * \function igraph_sparsemat_count_nonzerotol |
577 | 1969 | * Count nonzero elements of a sparse matrix, ignoring elements close to zero | 1969 | * Count nonzero elements of a sparse matrix, ignoring elements close to zero |
578 | 1970 | * | 1970 | * |
580 | 1971 | * Count the number of matric entries that are closer to zero than \p | 1971 | * Count the number of matrix entries that are closer to zero than \p |
581 | 1972 | * tol. | 1972 | * tol. |
582 | 1973 | * \param The input matrix, column-compressed. | 1973 | * \param The input matrix, column-compressed. |
583 | 1974 | * \param Real scalar, the tolerance. | 1974 | * \param Real scalar, the tolerance. |
584 | 1975 | 1975 | ||
585 | === modified file 'src/st-cuts.c' | |||
586 | --- src/st-cuts.c 2011-03-01 20:27:49 +0000 | |||
587 | +++ src/st-cuts.c 2011-09-12 16:01:36 +0000 | |||
588 | @@ -865,7 +865,7 @@ | |||
589 | 865 | return 0; | 865 | return 0; |
590 | 866 | } | 866 | } |
591 | 867 | 867 | ||
593 | 868 | /* TODO: This is a temporary resursive version, without proper error | 868 | /* TODO: This is a temporary recursive version, without proper error |
594 | 869 | handling */ | 869 | handling */ |
595 | 870 | 870 | ||
596 | 871 | int igraph_provan_shier_list(const igraph_t *graph, | 871 | int igraph_provan_shier_list(const igraph_t *graph, |
597 | 872 | 872 | ||
598 | === modified file 'src/topology.c' | |||
599 | --- src/topology.c 2011-03-01 20:27:49 +0000 | |||
600 | +++ src/topology.c 2011-09-12 16:01:36 +0000 | |||
601 | @@ -665,7 +665,7 @@ | |||
602 | 665 | * | 665 | * |
603 | 666 | * </para><para> | 666 | * </para><para> |
604 | 667 | * All graphs with a given number of vertices belong to a number of | 667 | * All graphs with a given number of vertices belong to a number of |
606 | 668 | * isomorpism classes, with every graph in a given class being | 668 | * isomorphism classes, with every graph in a given class being |
607 | 669 | * isomorphic to each other. | 669 | * isomorphic to each other. |
608 | 670 | * | 670 | * |
609 | 671 | * </para><para> | 671 | * </para><para> |
610 | @@ -1016,7 +1016,7 @@ | |||
611 | 1016 | * matching large graphs, Proc. of the 3rd IAPR-TC-15 International | 1016 | * matching large graphs, Proc. of the 3rd IAPR-TC-15 International |
612 | 1017 | * Workshop on Graph-based Representations, Italy, 2001.</para> | 1017 | * Workshop on Graph-based Representations, Italy, 2001.</para> |
613 | 1018 | * | 1018 | * |
615 | 1019 | * <para>For using it you need to define a calback function of type | 1019 | * <para>For using it you need to define a callback function of type |
616 | 1020 | * \ref igraph_isohandler_t. This function will be called whenever VF2 | 1020 | * \ref igraph_isohandler_t. This function will be called whenever VF2 |
617 | 1021 | * finds an isomorphism between the two graphs. The mapping between | 1021 | * finds an isomorphism between the two graphs. The mapping between |
618 | 1022 | * the two graphs will be also provided to this function. If the | 1022 | * the two graphs will be also provided to this function. If the |
619 | 1023 | 1023 | ||
620 | === modified file 'src/vector_ptr.c' | |||
621 | --- src/vector_ptr.c 2010-08-11 07:50:53 +0000 | |||
622 | +++ src/vector_ptr.c 2011-09-12 16:01:36 +0000 | |||
623 | @@ -127,7 +127,7 @@ | |||
624 | 127 | * | 127 | * |
625 | 128 | * Time complexity: operating system dependent, the \quote time | 128 | * Time complexity: operating system dependent, the \quote time |
626 | 129 | * \endquote required to deallocate O(n) bytes, n is the number of | 129 | * \endquote required to deallocate O(n) bytes, n is the number of |
628 | 130 | * elements allocated for the pointer vector (not neccessarily the | 130 | * elements allocated for the pointer vector (not necessarily the |
629 | 131 | * number of elements in the vector). | 131 | * number of elements in the vector). |
630 | 132 | */ | 132 | */ |
631 | 133 | 133 | ||
632 | @@ -293,7 +293,7 @@ | |||
633 | 293 | /** | 293 | /** |
634 | 294 | * \ingroup vectorptr | 294 | * \ingroup vectorptr |
635 | 295 | * \function igraph_vector_ptr_push_back | 295 | * \function igraph_vector_ptr_push_back |
637 | 296 | * \brief Appends an elements to the back of a pointer vector. | 296 | * \brief Appends an element to the back of a pointer vector. |
638 | 297 | * | 297 | * |
639 | 298 | * \param v The pointer vector. | 298 | * \param v The pointer vector. |
640 | 299 | * \param e The new element to include in the pointer vector. | 299 | * \param e The new element to include in the pointer vector. |
641 | @@ -474,7 +474,7 @@ | |||
642 | 474 | * | 474 | * |
643 | 475 | * </para><para> | 475 | * </para><para> |
644 | 476 | * This function creates a pointer vector by copying another one. This | 476 | * This function creates a pointer vector by copying another one. This |
646 | 477 | * is shallow copy, only the pointers in the vector will be copyed. | 477 | * is shallow copy, only the pointers in the vector will be copied. |
647 | 478 | * | 478 | * |
648 | 479 | * </para><para> | 479 | * </para><para> |
649 | 480 | * It is potentially dangerous to copy a pointer vector with an associated | 480 | * It is potentially dangerous to copy a pointer vector with an associated |
Thanks a lot!