Merge lp:~mvngu/igraph/doc into lp:~igraph/igraph/0.6-main-old

Proposed by Minh Van Nguyen
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
Reviewer Review Type Date Requested Status
Gábor Csárdi Approve
Review via email: mp+75031@code.launchpad.net

Description of the change

A bunch of typo fixes.

To post a comment you must log in.
Revision history for this message
Gábor Csárdi (gabor.csardi) wrote :

Thanks a lot!

review: Approve
lp:~mvngu/igraph/doc updated
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.

Revision history for this message
Gábor Csárdi (gabor.csardi) wrote :

Added in revision #2565 (0.6-main).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 * <para>Sometimes it is easier to work with a graph which is in
6 * adjacency list format: a list of vectors; each vector contains the
7 * neighbor vertices or incident edges of a given vertex. Typically,
8- * this representation is good if we need to iterate over the neigbors
9+ * this representation is good if we need to iterate over the neighbors
10 * of all vertices many times. E.g. when finding the shortest paths
11 * between every pairs of vertices or calculating closeness centrality
12 * for all the vertices.</para>
13@@ -515,7 +515,7 @@
14 * (<code>IGRAPH_ALL</code>) are considered. It is ignored for
15 * undirected graphs.
16 * \param simplify Constant, it gives whether to simplify the vectors
17- * in the adjacency list (<code>IGRAPH_SIMPLIFY</code>) ot not
18+ * in the adjacency list (<code>IGRAPH_SIMPLIFY</code>) or not
19 * (<code>IGRAPH_DONT_SIMPLIFY</code>).
20 * \return Error code.
21 *
22
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 * the graph is indeed bipartite with respect to the given \p types
28 * vector. If there is an edge connecting two vertices of the same
29 * kind, then an error is reported.
30- * \param graph Pointer to an uninitlized graph object, the result is
31+ * \param graph Pointer to an uninitialized graph object, the result is
32 * created here.
33 * \param types Boolean vector giving the vertex types. The length of
34 * the vector defines the number of vertices in the graph.
35
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 igraph_i_cattribute_free_rec(VECTOR(*gal)[j]);
41 igraph_vector_ptr_remove(gal, j);
42 } else {
43- IGRAPH_WARNING("Cannot remove non-existant graph attribute");
44+ IGRAPH_WARNING("Cannot remove non-existent graph attribute");
45 }
46 }
47
48@@ -3060,7 +3060,7 @@
49 igraph_i_cattribute_free_rec(VECTOR(*val)[j]);
50 igraph_vector_ptr_remove(val, j);
51 } else {
52- IGRAPH_WARNING("Cannot remove non-existant graph attribute");
53+ IGRAPH_WARNING("Cannot remove non-existent graph attribute");
54 }
55 }
56
57@@ -3085,7 +3085,7 @@
58 igraph_i_cattribute_free_rec(VECTOR(*eal)[j]);
59 igraph_vector_ptr_remove(eal, j);
60 } else {
61- IGRAPH_WARNING("Cannot remove non-existant graph attribute");
62+ IGRAPH_WARNING("Cannot remove non-existent graph attribute");
63 }
64 }
65
66
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
72 /**
73 * \function igraph_eigenvector_centrality
74- * Eigenvector centrality of the verices
75+ * Eigenvector centrality of the vertices
76 *
77 * Eigenvector centrality is a measure of the importance of a node in a
78 * network. It assigns relative scores to all nodes in the network based
79
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 * in the graph which contains more vertices.
85 *
86 * </para><para>
87- * Note that this is not neccessarily the same as a maximal clique,
88+ * Note that this is not necessarily the same as a maximal clique,
89 * ie. the largest cliques are always maximal but a maximal clique is
90 * not always largest.
91 *
92
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 * \endclist
98 *
99 * Time complexity: O(nd), n is the number of pairs in the given vector, d is
100- * the (maximum) degree of the vertices in the grpah.
101+ * the (maximum) degree of the vertices in the graph.
102 *
103 * \sa \ref igraph_similarity_jaccard() to calculate the Jaccard similarity
104 * between all pairs of a vertex set, or \ref igraph_similarity_dice() and
105@@ -524,7 +524,7 @@
106 * \endclist
107 *
108 * Time complexity: O(nd), n is the number of edges in the edge selector, d is
109- * the (maximum) degree of the vertices in the grpah.
110+ * the (maximum) degree of the vertices in the graph.
111 *
112 * \sa \ref igraph_similarity_jaccard() and \ref igraph_similarity_jaccard_pairs()
113 * to calculate the Jaccard similarity between all pairs of a vertex set or
114@@ -669,7 +669,7 @@
115 * \endclist
116 *
117 * Time complexity: O(nd), n is the number of pairs in the given vector, d is
118- * the (maximum) degree of the vertices in the grpah.
119+ * the (maximum) degree of the vertices in the graph.
120 *
121 * \sa \ref igraph_similarity_dice() to calculate the Dice similarity
122 * between all pairs of a vertex set, or \ref igraph_similarity_jaccard(),
123@@ -733,7 +733,7 @@
124 * \endclist
125 *
126 * Time complexity: O(nd), n is the number of pairs in the given vector, d is
127- * the (maximum) degree of the vertices in the grpah.
128+ * the (maximum) degree of the vertices in the graph.
129 *
130 * \sa \ref igraph_similarity_dice() and \ref igraph_similarity_dice_pairs()
131 * to calculate the Dice similarity between all pairs of a vertex set or
132
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 * - sum (n(*,j) choose 2)
138 * + 2 * sum (n(i,j) choose 2).
139 *
140- * Since a+b+c+d = (n choose 2) and this goes in the denumerator, we can
141+ * Since a+b+c+d = (n choose 2) and this goes in the denominator, we can
142 * just as well start dividing each term in a+d by (n choose 2), which
143 * yields:
144 *
145
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 * If the supplied graph is undirected, this function does nothing.
151 * \param graph The graph object to convert.
152 * \param mode Constant, specifies the details of how exactly the
153- * convesion is done. Possible values: \c
154+ * conversion is done. Possible values: \c
155 * IGRAPH_TO_UNDIRECTED_EACH: the number of edges remains
156 * constant, an undirected edge is created for each directed
157 * one, this version might create graphs with multiple edges;
158
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 VECTOR(prev)[v]=v;
164 }
165 VECTOR(next)[no_of_nodes-1] = 0;
166- /* size is allready all zero */
167+ /* size is already all zero */
168
169 /***************/
170 /* i:=n; j:=0; */
171@@ -222,7 +222,7 @@
172 * chordless cycles have at most three nodes.
173 *
174 * If either \p alpha or \p alpha1 is given, then the other is
175- * calculated by taking simply the inverse. If neighter are given,
176+ * calculated by taking simply the inverse. If neither are given,
177 * then \ref igraph_maximum_cardinality_search() is called to calculate
178 * them.
179 * \param graph The input graph, it might be directed, but edge
180
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 * (15) edge connectivity, directed graph
186 * (16) edge connectivity, undirected graph
187 * (17) s-t vertex connectivity, directed graph
188- * (18) s-t vertex connectivity, undireced graph
189+ * (18) s-t vertex connectivity, undirected graph
190 * (19) vertex connectivity, directed graph
191- * (20) vertex connectivity, undireced graph
192+ * (20) vertex connectivity, undirected graph
193 * (21) s-t number of edge disjoint paths, directed graph
194 * (22) s-t number of edge disjoint paths, undirected graph
195 * (23) s-t number of vertex disjoint paths, directed graph
196@@ -885,7 +885,7 @@
197 * target vertex. The maximum flow is the flow with the maximum
198 * value. </para>
199 *
200- * <para> According to a theorem by Ford and Furkelson
201+ * <para> According to a theorem by Ford and Fulkerson
202 * (L. R. Ford Jr. and D. R. Fulkerson. Maximal flow through a
203 * network. Canadian J. Math., 8:399-404, 1956.) the maximum flow
204 * between two vertices is the same as the
205@@ -985,7 +985,7 @@
206 * vertices in the first partition of the cut are stored
207 * here. This argument is ignored if it is a null pointer.
208 * \param partition2 Pointer to a real vector, the vertex ids of the
209- * vertices in the second partinio of the cut are stored here.
210+ * vertices in the second partition of the cut are stored here.
211 * This argument is ignored if it is a null pointer.
212 * \param source Integer, the id of the source vertex.
213 * \param target Integer, the id of the target vertex.
214@@ -996,7 +996,7 @@
215 *
216 * \sa \ref igraph_maxflow().
217 *
218- * Time complecity: see \ref igraph_maxflow().
219+ * Time complexity: see \ref igraph_maxflow().
220 */
221
222 int igraph_st_mincut(const igraph_t *graph, igraph_real_t *value,
223@@ -1054,7 +1054,7 @@
224 /* } */
225
226 /*
227- * This is the Stoer-Wagner algorithm, it works for calcuating the
228+ * This is the Stoer-Wagner algorithm, it works for calculating the
229 * minimum cut for undirected graphs, for the whole graph.
230 * I.e. this is basically the edge-connectivity of the graph.
231 * It can also calculate the cut itself, not just the cut value.
232@@ -1219,7 +1219,7 @@
233 char *mark;
234 mark=igraph_Calloc(no_of_nodes, char);
235 if (!mark) {
236- IGRAPH_ERROR("Not enough memory for minumum cut", IGRAPH_ENOMEM);
237+ IGRAPH_ERROR("Not enough memory for minimum cut", IGRAPH_ENOMEM);
238 }
239 IGRAPH_FINALLY(igraph_free, mark);
240
241@@ -1401,7 +1401,7 @@
242 * This function calculates the minimum cut in a graph.
243 * The minimum cut is the minimum set of edges which needs to be
244 * removed to disconnect the graph. The minimum is calculated using
245- * the weigths (\p capacity) of the edges, so the cut with the minimum
246+ * the weights (\p capacity) of the edges, so the cut with the minimum
247 * total capacity is calculated.
248 *
249 * </para><para> For directed graphs an implementation based on
250@@ -1717,7 +1717,7 @@
251 * \c IGRAPH_VCONN_NUMBER_OF_NODES, return the number of nodes.
252 * \c IGRAPH_VCONN_IGNORE, ignore the fact that the two vertices
253 * are connected and calculated the number of vertices needed
254- * to aliminate all paths except for the trivial (direct) paths
255+ * to eliminate all paths except for the trivial (direct) paths
256 * between \c source and \c vertex. TOOD: what about neighbors?
257 * \return Error code.
258 *
259@@ -1862,7 +1862,7 @@
260 * They were suggested by Peter McMahan, thanks Peter.
261 * \return Error code.
262 *
263- * Time complecity: O(|V|^5).
264+ * Time complexity: O(|V|^5).
265 *
266 * \sa \ref igraph_st_vertex_connectivity(), \ref igraph_maxflow_value(),
267 * and \ref igraph_edge_connectivity().
268@@ -1997,7 +1997,7 @@
269 * \param target The id of the target vertex.
270 * \return Error code.
271 *
272- * Time complecity: O(|V|^3), but see the discussion at \ref
273+ * Time complexity: O(|V|^3), but see the discussion at \ref
274 * igraph_maxflow_value().
275 *
276 * \sa \ref igraph_vertex_disjoint_paths(), \ref
277
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 * \param instream Pointer to a stream, it should be readable.
283 * \param predefnames Pointer to the symbolic names of the vertices in
284 * the file. If \c NULL is given here then vertex ids will be
285- * assigned to vertex names in the order of their appearence in
286+ * assigned to vertex names in the order of their appearance in
287 * the \c .ncol file. If it is not \c NULL and some unknown
288 * vertex names are found in the \c .ncol file then new vertex
289 * ids will be assigned to them.
290@@ -1367,7 +1367,7 @@
291 snprintf(name, sizeof(name)/sizeof(char)-1, "%li", to);
292 IGRAPH_CHECK(igraph_trie_get(&trie, name, &to));
293 if (igraph_trie_size(&trie) != no_of_nodes) {
294- IGRAPH_ERROR("Unkown node id found at an edge", IGRAPH_PARSEERROR);
295+ IGRAPH_ERROR("Unknown node id found at an edge", IGRAPH_PARSEERROR);
296 }
297 VECTOR(edges)[edgeptr++]=from;
298 VECTOR(edges)[edgeptr++]=to;
299@@ -2339,7 +2339,7 @@
300 * file as well, if they are numeric of string.
301 *
302 * </para><para> As igraph is more forgiving about attribute names, it might
303- * be neccessary to simplify the them before writing to the GML file.
304+ * be necessary to simplify the them before writing to the GML file.
305 * This way we'll have a syntactically correct GML file. The following
306 * simple procedure is performed on each attribute name: first the alphanumeric
307 * characters are extracted, the others are ignored. Then if the first character
308
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 igraph_strvector_destroy(&ht->defaults);
314 }
315
316-/* Note: may leave the hashtable in an inconsistent state if a new
317+/* Note: may leave the hash table in an inconsistent state if a new
318 element is added, but this is not a big problem, since while the
319 defaults, or the defaults plus the elements may contain more elements
320 than the keys trie, but the data is always retrieved based on the trie
321
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 * The current implementation is very simple and not too efficient. It
327 * works fine for not too many strings, e.g. the list of attribute
328 * names is returned in a string vector by \ref
329- * igraph_cattribute_list(). Do not expect great performace from this
330+ * igraph_cattribute_list(). Do not expect great performance from this
331 * type.</para>
332 *
333 * <para>
334@@ -323,7 +323,7 @@
335 * Concatenate two string vectors.
336 *
337 * \param to The first string vector, the result is stored here.
338- * \param from The second string vector, it is kep unchanged.
339+ * \param from The second string vector, it is kept unchanged.
340 * \return Error code.
341 *
342 * Time complexity: O(n+l2), n is the number of strings in the new
343@@ -443,7 +443,7 @@
344 if (tmp != 0) {
345 v->data=tmp;
346 }
347- IGRAPH_ERROR("canot resize string vector", IGRAPH_ENOMEM);
348+ IGRAPH_ERROR("Cannot resize string vector", IGRAPH_ENOMEM);
349 }
350 }
351 v->len = newsize;
352
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 char *tmp=igraph_Calloc(length+1, char);
358
359 if (tmp==0) {
360- IGRAPH_ERROR("canot get from trie", IGRAPH_ENOMEM);
361+ IGRAPH_ERROR("Cannot get from trie", IGRAPH_ENOMEM);
362 }
363
364 strncpy(tmp, key, length);
365
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 "between 1 and n", IGRAPH_EINVAL);
371 }
372 if (which==IGRAPH_LAPACK_DSYEV_SELECT && iu-il < 0) {
373- IGRAPH_ERROR("Invalied 'il' and/or 'iu' values", IGRAPH_EINVAL);
374+ IGRAPH_ERROR("Invalid 'il' and/or 'iu' values", IGRAPH_EINVAL);
375 }
376
377 IGRAPH_CHECK(igraph_matrix_copy(&Acopy, A));
378@@ -598,7 +598,7 @@
379 * Eigenvalues/vectors of nonsymmetric matrices, expert mode
380 *
381 * This function calculates the eigenvalues and optionally the left
382- * and/or right eigenvectors of a nonsymmetrix N-by-N real matrix.
383+ * and/or right eigenvectors of a nonsymmetric N-by-N real matrix.
384 *
385 * </para><para>
386 * Optionally also, it computes a balancing transformation to improve
387
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 * algorithm and program
393 * (http://bioinformatics.icmb.utexas.edu/lgl/). But unlike LGL, this
394 * version uses a Fruchterman-Reingold style simulated annealing
395- * algorithm for placing the vertices. The speedup is achived by
396+ * algorithm for placing the vertices. The speedup is achieved by
397 * placing the vertices on a grid and calculating the repulsion only
398 * for vertices which are closer to each other than a limit.
399 *
400@@ -986,7 +986,7 @@
401 * \param coolexp The cooling exponent. A reasonable default value is
402 * 1.5.
403 * \param repulserad Determines the radius at which vertex-vertex
404- * repulsion cancels out attraction of adjacenct vertices. A
405+ * repulsion cancels out attraction of adjacent vertices. A
406 * reasonable default value is \p area times the number of vertices.
407 * \param cellsize The size of the grid cells, one side of the
408 * square. A reasonable default value is the fourth root of
409@@ -1999,7 +1999,7 @@
410 long int this_node) {
411
412 // We know what the directed force is. We now need to translate it
413- // into the appropriate x and y componenets.
414+ // into the appropriate x and y components.
415 // First, assume:
416 // other_node
417 // /|
418@@ -2201,7 +2201,7 @@
419 * This is a port of the graphopt layout algorithm by Michael Schmuhl.
420 * graphopt version 0.4.1 was rewritten in C and the support for
421 * layers was removed (might be added later) and a code was a bit
422- * reorganized to avoid some unneccessary steps is the node charge (see below)
423+ * reorganized to avoid some unnecessary steps is the node charge (see below)
424 * is zero.
425 *
426 * </para><para>
427@@ -2304,7 +2304,7 @@
428 // will only happen in extremely rare circumstances, and when
429 // it does, springs will probably pull them apart anyway.
430 // also, if we are more than 50 away, the electric force
431- // will be negligable.
432+ // will be negligible.
433 // ***** may not always be desirable ****
434 if ((distance != 0.0) && (distance < 500.0)) {
435 // if (distance != 0.0) {
436
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 * Assortativity of a graph based on vertex categories
442 *
443 * Assuming the vertices of the input graph belong to different
444- * categories, this function calculates the assortativity coeffient of
445- * the graph. The assortativity coeffient is between minus one and one
446+ * categories, this function calculates the assortativity coefficient of
447+ * the graph. The assortativity coefficient is between minus one and one
448 * and it is one if all connections stay within categories, it is
449 * minus one, if the network is perfectly disassortative. For a
450 * randomly connected network it is (asymptotically) zero.
451@@ -49,7 +49,7 @@
452 * graphs.
453 * \return Error code.
454 *
455- * Time complecity: O(|E|+t), |E| is the number of edges, t is the
456+ * Time complexity: O(|E|+t), |E| is the number of edges, t is the
457 * number of vertex types.
458 *
459 * \sa \ref igraph_assortativity if the vertex types are defines by
460
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 * \brief The disjint union of many graphs.
466 *
467 * </para><para>
468- * First the vertices in the graphs will be relabed with new vertex
469+ * First the vertices in the graphs will be relabeled with new vertex
470 * ids to have pairwise disjoint vertex id sets and then the union of
471 * the graphs is formed.
472 * The number of vertices and edges in the result is the total number
473@@ -544,7 +544,7 @@
474 *
475 * </para><para>
476 * The result graph will contain as many vertices as the largest graph
477- * among the agruments does, and an edge will be included in it if it
478+ * among the arguments does, and an edge will be included in it if it
479 * is part of at least one operand graph.
480 *
481 * </para><para>
482@@ -916,7 +916,7 @@
483 *
484 * \param res Pointer to an uninitialized graph object, the result
485 * will be stored here.
486- * \param g1 The firs operarand, a graph object.
487+ * \param g1 The firs operand, a graph object.
488 * \param g2 The second operand, another graph object.
489 * \return Error code.
490 *
491
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 maxdegree, agebins));
497 }
498
499- /* error calculattion */
500+ /* error calculation */
501 if (logprob || lognull) {
502 IGRAPH_CHECK(igraph_revolver_error_ade(graph, kernel, &st,
503 cats, nocats, maxdegree,
504
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 return data->lastf;
510 }
511
512-/* This function gievs the gradient of the objective function at
513+/* This function gives the gradient of the objective function at
514 the supplied parameter vector. Called by the optimizer.
515 */
516
517
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 * \param rows The number of rows in the matrix.
523 * \param cols The number of columns.
524 * \param nzmax The maximum number of non-zero elements in the
525- * matrix. It is not compulsary to get this right, but it is
526+ * matrix. It is not compulsory to get this right, but it is
527 * useful for the allocation of the proper amount of memory.
528 * \return Error code.
529 *
530@@ -220,7 +220,7 @@
531
532 /**
533 * \function igraph_sparsemat_type
534- * Type of a sprase matrix (triplet or column-compressed)
535+ * Type of a sparse matrix (triplet or column-compressed)
536 *
537 * Gives whether a sparse matrix is stored in the triplet format or in
538 * column-compressed format.
539@@ -295,7 +295,7 @@
540 IGRAPH_ERROR("Invalid row permutation length", IGRAPH_FAILURE);
541 }
542 if (ncol != igraph_vector_int_size(q)) {
543- IGRAPH_ERROR("Invalud column permutation length", IGRAPH_FAILURE);
544+ IGRAPH_ERROR("Invalid column permutation length", IGRAPH_FAILURE);
545 }
546
547 /* We invert the permutation by hand */
548@@ -669,7 +669,7 @@
549 int igraph_sparsemat_droptol(igraph_sparsemat_t *A, igraph_real_t tol) {
550
551 if (!cs_droptol(A->cs, tol)) {
552- IGRAPH_ERROR("Cannor drop (almost) zeros from sparse matrix",
553+ IGRAPH_ERROR("Cannot drop (almost) zeros from sparse matrix",
554 IGRAPH_FAILURE);
555 }
556
557@@ -1319,7 +1319,7 @@
558
559 /**
560 * \function igraph_sparsemat_arpack_rssolve
561- * Eigenvalues and eigenvectors of a symmetrix sparse matrix via ARPACK
562+ * Eigenvalues and eigenvectors of a symmetric sparse matrix via ARPACK
563 *
564 * \param The input matrix, must be column-compressed.
565 * \param options It is passed to \ref igraph_arpack_rssolve(). See
566@@ -1642,7 +1642,7 @@
567 *
568 * Solves a linear system using a QR decomposition of its coefficient
569 * matrix.
570- * \param dis Symbolic analyis of the coefficient matrix, the result
571+ * \param dis Symbolic analysis of the coefficient matrix, the result
572 * of \ref igraph_sparsemat_symbqr().
573 * \param din The QR decomposition of the coefficient matrix, the
574 * result of \ref igraph_sparsemat_qr().
575@@ -1968,7 +1968,7 @@
576 * \function igraph_sparsemat_count_nonzerotol
577 * Count nonzero elements of a sparse matrix, ignoring elements close to zero
578 *
579- * Count the number of matric entries that are closer to zero than \p
580+ * Count the number of matrix entries that are closer to zero than \p
581 * tol.
582 * \param The input matrix, column-compressed.
583 * \param Real scalar, the tolerance.
584
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 return 0;
590 }
591
592-/* TODO: This is a temporary resursive version, without proper error
593+/* TODO: This is a temporary recursive version, without proper error
594 handling */
595
596 int igraph_provan_shier_list(const igraph_t *graph,
597
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 *
603 * </para><para>
604 * All graphs with a given number of vertices belong to a number of
605- * isomorpism classes, with every graph in a given class being
606+ * isomorphism classes, with every graph in a given class being
607 * isomorphic to each other.
608 *
609 * </para><para>
610@@ -1016,7 +1016,7 @@
611 * matching large graphs, Proc. of the 3rd IAPR-TC-15 International
612 * Workshop on Graph-based Representations, Italy, 2001.</para>
613 *
614- * <para>For using it you need to define a calback function of type
615+ * <para>For using it you need to define a callback function of type
616 * \ref igraph_isohandler_t. This function will be called whenever VF2
617 * finds an isomorphism between the two graphs. The mapping between
618 * the two graphs will be also provided to this function. If the
619
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 *
625 * Time complexity: operating system dependent, the \quote time
626 * \endquote required to deallocate O(n) bytes, n is the number of
627- * elements allocated for the pointer vector (not neccessarily the
628+ * elements allocated for the pointer vector (not necessarily the
629 * number of elements in the vector).
630 */
631
632@@ -293,7 +293,7 @@
633 /**
634 * \ingroup vectorptr
635 * \function igraph_vector_ptr_push_back
636- * \brief Appends an elements to the back of a pointer vector.
637+ * \brief Appends an element to the back of a pointer vector.
638 *
639 * \param v The pointer vector.
640 * \param e The new element to include in the pointer vector.
641@@ -474,7 +474,7 @@
642 *
643 * </para><para>
644 * This function creates a pointer vector by copying another one. This
645- * is shallow copy, only the pointers in the vector will be copyed.
646+ * is shallow copy, only the pointers in the vector will be copied.
647 *
648 * </para><para>
649 * It is potentially dangerous to copy a pointer vector with an associated

Subscribers

People subscribed via source and target branches