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
=== modified file 'src/adjlist.c'
--- src/adjlist.c 2011-07-15 09:34:29 +0000
+++ src/adjlist.c 2011-09-12 16:01:36 +0000
@@ -35,7 +35,7 @@
35 * <para>Sometimes it is easier to work with a graph which is in35 * <para>Sometimes it is easier to work with a graph which is in
36 * adjacency list format: a list of vectors; each vector contains the36 * adjacency list format: a list of vectors; each vector contains the
37 * neighbor vertices or incident edges of a given vertex. Typically,37 * neighbor vertices or incident edges of a given vertex. Typically,
38 * this representation is good if we need to iterate over the neigbors38 * this representation is good if we need to iterate over the neighbors
39 * of all vertices many times. E.g. when finding the shortest paths39 * of all vertices many times. E.g. when finding the shortest paths
40 * between every pairs of vertices or calculating closeness centrality40 * between every pairs of vertices or calculating closeness centrality
41 * for all the vertices.</para>41 * for all the vertices.</para>
@@ -515,7 +515,7 @@
515 * (<code>IGRAPH_ALL</code>) are considered. It is ignored for515 * (<code>IGRAPH_ALL</code>) are considered. It is ignored for
516 * undirected graphs.516 * undirected graphs.
517 * \param simplify Constant, it gives whether to simplify the vectors517 * \param simplify Constant, it gives whether to simplify the vectors
518 * in the adjacency list (<code>IGRAPH_SIMPLIFY</code>) ot not518 * in the adjacency list (<code>IGRAPH_SIMPLIFY</code>) or not
519 * (<code>IGRAPH_DONT_SIMPLIFY</code>).519 * (<code>IGRAPH_DONT_SIMPLIFY</code>).
520 * \return Error code.520 * \return Error code.
521 * 521 *
522522
=== modified file 'src/bipartite.c'
--- src/bipartite.c 2011-03-01 20:27:49 +0000
+++ src/bipartite.c 2011-09-12 16:01:36 +0000
@@ -454,7 +454,7 @@
454 * the graph is indeed bipartite with respect to the given \p types454 * the graph is indeed bipartite with respect to the given \p types
455 * vector. If there is an edge connecting two vertices of the same455 * vector. If there is an edge connecting two vertices of the same
456 * kind, then an error is reported.456 * kind, then an error is reported.
457 * \param graph Pointer to an uninitlized graph object, the result is457 * \param graph Pointer to an uninitialized graph object, the result is
458 * created here.458 * created here.
459 * \param types Boolean vector giving the vertex types. The length of459 * \param types Boolean vector giving the vertex types. The length of
460 * the vector defines the number of vertices in the graph.460 * the vector defines the number of vertices in the graph.
461461
=== modified file 'src/cattributes.c'
--- src/cattributes.c 2011-05-02 15:42:15 +0000
+++ src/cattributes.c 2011-09-12 16:01:36 +0000
@@ -3035,7 +3035,7 @@
3035 igraph_i_cattribute_free_rec(VECTOR(*gal)[j]);3035 igraph_i_cattribute_free_rec(VECTOR(*gal)[j]);
3036 igraph_vector_ptr_remove(gal, j);3036 igraph_vector_ptr_remove(gal, j);
3037 } else {3037 } else {
3038 IGRAPH_WARNING("Cannot remove non-existant graph attribute");3038 IGRAPH_WARNING("Cannot remove non-existent graph attribute");
3039 } 3039 }
3040}3040}
30413041
@@ -3060,7 +3060,7 @@
3060 igraph_i_cattribute_free_rec(VECTOR(*val)[j]);3060 igraph_i_cattribute_free_rec(VECTOR(*val)[j]);
3061 igraph_vector_ptr_remove(val, j);3061 igraph_vector_ptr_remove(val, j);
3062 } else {3062 } else {
3063 IGRAPH_WARNING("Cannot remove non-existant graph attribute");3063 IGRAPH_WARNING("Cannot remove non-existent graph attribute");
3064 } 3064 }
3065}3065}
30663066
@@ -3085,7 +3085,7 @@
3085 igraph_i_cattribute_free_rec(VECTOR(*eal)[j]);3085 igraph_i_cattribute_free_rec(VECTOR(*eal)[j]);
3086 igraph_vector_ptr_remove(eal, j);3086 igraph_vector_ptr_remove(eal, j);
3087 } else {3087 } else {
3088 IGRAPH_WARNING("Cannot remove non-existant graph attribute");3088 IGRAPH_WARNING("Cannot remove non-existent graph attribute");
3089 } 3089 }
3090}3090}
30913091
30923092
=== modified file 'src/centrality.c'
--- src/centrality.c 2011-07-07 11:07:36 +0000
+++ src/centrality.c 2011-09-12 16:01:36 +0000
@@ -454,7 +454,7 @@
454454
455/**455/**
456 * \function igraph_eigenvector_centrality456 * \function igraph_eigenvector_centrality
457 * Eigenvector centrality of the verices457 * Eigenvector centrality of the vertices
458 * 458 *
459 * Eigenvector centrality is a measure of the importance of a node in a459 * Eigenvector centrality is a measure of the importance of a node in a
460 * network. It assigns relative scores to all nodes in the network based460 * network. It assigns relative scores to all nodes in the network based
461461
=== modified file 'src/cliques.c'
--- src/cliques.c 2011-03-01 20:27:49 +0000
+++ src/cliques.c 2011-09-12 16:01:36 +0000
@@ -799,7 +799,7 @@
799 * in the graph which contains more vertices. 799 * in the graph which contains more vertices.
800 * 800 *
801 * </para><para>801 * </para><para>
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,
803 * ie. the largest cliques are always maximal but a maximal clique is803 * ie. the largest cliques are always maximal but a maximal clique is
804 * not always largest.804 * not always largest.
805 *805 *
806806
=== modified file 'src/cocitation.c'
--- src/cocitation.c 2011-07-15 08:42:15 +0000
+++ src/cocitation.c 2011-09-12 16:01:36 +0000
@@ -411,7 +411,7 @@
411 * \endclist411 * \endclist
412 * 412 *
413 * Time complexity: O(nd), n is the number of pairs in the given vector, d is413 * Time complexity: O(nd), n is the number of pairs in the given vector, d is
414 * the (maximum) degree of the vertices in the grpah.414 * the (maximum) degree of the vertices in the graph.
415 *415 *
416 * \sa \ref igraph_similarity_jaccard() to calculate the Jaccard similarity416 * \sa \ref igraph_similarity_jaccard() to calculate the Jaccard similarity
417 * between all pairs of a vertex set, or \ref igraph_similarity_dice() and417 * between all pairs of a vertex set, or \ref igraph_similarity_dice() and
@@ -524,7 +524,7 @@
524 * \endclist524 * \endclist
525 * 525 *
526 * Time complexity: O(nd), n is the number of edges in the edge selector, d is526 * Time complexity: O(nd), n is the number of edges in the edge selector, d is
527 * the (maximum) degree of the vertices in the grpah.527 * the (maximum) degree of the vertices in the graph.
528 *528 *
529 * \sa \ref igraph_similarity_jaccard() and \ref igraph_similarity_jaccard_pairs()529 * \sa \ref igraph_similarity_jaccard() and \ref igraph_similarity_jaccard_pairs()
530 * to calculate the Jaccard similarity between all pairs of a vertex set or530 * to calculate the Jaccard similarity between all pairs of a vertex set or
@@ -669,7 +669,7 @@
669 * \endclist669 * \endclist
670 * 670 *
671 * Time complexity: O(nd), n is the number of pairs in the given vector, d is671 * Time complexity: O(nd), n is the number of pairs in the given vector, d is
672 * the (maximum) degree of the vertices in the grpah.672 * the (maximum) degree of the vertices in the graph.
673 *673 *
674 * \sa \ref igraph_similarity_dice() to calculate the Dice similarity674 * \sa \ref igraph_similarity_dice() to calculate the Dice similarity
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(),
@@ -733,7 +733,7 @@
733 * \endclist733 * \endclist
734 * 734 *
735 * Time complexity: O(nd), n is the number of pairs in the given vector, d is735 * Time complexity: O(nd), n is the number of pairs in the given vector, d is
736 * the (maximum) degree of the vertices in the grpah.736 * the (maximum) degree of the vertices in the graph.
737 *737 *
738 * \sa \ref igraph_similarity_dice() and \ref igraph_similarity_dice_pairs()738 * \sa \ref igraph_similarity_dice() and \ref igraph_similarity_dice_pairs()
739 * to calculate the Dice similarity between all pairs of a vertex set or739 * to calculate the Dice similarity between all pairs of a vertex set or
740740
=== modified file 'src/community.c'
--- src/community.c 2011-08-12 13:05:58 +0000
+++ src/community.c 2011-09-12 16:01:36 +0000
@@ -3006,7 +3006,7 @@
3006 * - sum (n(*,j) choose 2)3006 * - sum (n(*,j) choose 2)
3007 * + 2 * sum (n(i,j) choose 2).3007 * + 2 * sum (n(i,j) choose 2).
3008 *3008 *
3009 * Since a+b+c+d = (n choose 2) and this goes in the denumerator, we can3009 * Since a+b+c+d = (n choose 2) and this goes in the denominator, we can
3010 * just as well start dividing each term in a+d by (n choose 2), which3010 * just as well start dividing each term in a+d by (n choose 2), which
3011 * yields:3011 * yields:
3012 *3012 *
30133013
=== modified file 'src/conversion.c'
--- src/conversion.c 2011-03-01 20:27:49 +0000
+++ src/conversion.c 2011-09-12 16:01:36 +0000
@@ -410,7 +410,7 @@
410 * If the supplied graph is undirected, this function does nothing.410 * If the supplied graph is undirected, this function does nothing.
411 * \param graph The graph object to convert.411 * \param graph The graph object to convert.
412 * \param mode Constant, specifies the details of how exactly the412 * \param mode Constant, specifies the details of how exactly the
413 * convesion is done. Possible values: \c 413 * conversion is done. Possible values: \c
414 * IGRAPH_TO_UNDIRECTED_EACH: the number of edges remains414 * IGRAPH_TO_UNDIRECTED_EACH: the number of edges remains
415 * constant, an undirected edge is created for each directed415 * constant, an undirected edge is created for each directed
416 * one, this version might create graphs with multiple edges; 416 * one, this version might create graphs with multiple edges;
417417
=== modified file 'src/decomposition.c'
--- src/decomposition.c 2010-06-28 10:30:37 +0000
+++ src/decomposition.c 2011-09-12 16:01:36 +0000
@@ -102,7 +102,7 @@
102 VECTOR(prev)[v]=v;102 VECTOR(prev)[v]=v;
103 }103 }
104 VECTOR(next)[no_of_nodes-1] = 0;104 VECTOR(next)[no_of_nodes-1] = 0;
105 /* size is allready all zero */105 /* size is already all zero */
106106
107 /***************/107 /***************/
108 /* i:=n; j:=0; */108 /* i:=n; j:=0; */
@@ -222,7 +222,7 @@
222 * chordless cycles have at most three nodes.222 * chordless cycles have at most three nodes.
223 *223 *
224 * If either \p alpha or \p alpha1 is given, then the other is224 * If either \p alpha or \p alpha1 is given, then the other is
225 * calculated by taking simply the inverse. If neighter are given,225 * calculated by taking simply the inverse. If neither are given,
226 * then \ref igraph_maximum_cardinality_search() is called to calculate226 * then \ref igraph_maximum_cardinality_search() is called to calculate
227 * them.227 * them.
228 * \param graph The input graph, it might be directed, but edge228 * \param graph The input graph, it might be directed, but edge
229229
=== modified file 'src/flow.c'
--- src/flow.c 2011-03-23 05:34:22 +0000
+++ src/flow.c 2011-09-12 16:01:36 +0000
@@ -63,9 +63,9 @@
63 * (15) edge connectivity, directed graph63 * (15) edge connectivity, directed graph
64 * (16) edge connectivity, undirected graph64 * (16) edge connectivity, undirected graph
65 * (17) s-t vertex connectivity, directed graph65 * (17) s-t vertex connectivity, directed graph
66 * (18) s-t vertex connectivity, undireced graph66 * (18) s-t vertex connectivity, undirected graph
67 * (19) vertex connectivity, directed graph67 * (19) vertex connectivity, directed graph
68 * (20) vertex connectivity, undireced graph68 * (20) vertex connectivity, undirected graph
69 * (21) s-t number of edge disjoint paths, directed graph69 * (21) s-t number of edge disjoint paths, directed graph
70 * (22) s-t number of edge disjoint paths, undirected graph70 * (22) s-t number of edge disjoint paths, undirected graph
71 * (23) s-t number of vertex disjoint paths, directed graph71 * (23) s-t number of vertex disjoint paths, directed graph
@@ -885,7 +885,7 @@
885 * target vertex. The maximum flow is the flow with the maximum885 * target vertex. The maximum flow is the flow with the maximum
886 * value. </para>886 * value. </para>
887 * 887 *
888 * <para> According to a theorem by Ford and Furkelson 888 * <para> According to a theorem by Ford and Fulkerson
889 * (L. R. Ford Jr. and D. R. Fulkerson. Maximal flow through a889 * (L. R. Ford Jr. and D. R. Fulkerson. Maximal flow through a
890 * network. Canadian J. Math., 8:399-404, 1956.) the maximum flow890 * network. Canadian J. Math., 8:399-404, 1956.) the maximum flow
891 * between two vertices is the same as the 891 * between two vertices is the same as the
@@ -985,7 +985,7 @@
985 * vertices in the first partition of the cut are stored985 * vertices in the first partition of the cut are stored
986 * here. This argument is ignored if it is a null pointer.986 * here. This argument is ignored if it is a null pointer.
987 * \param partition2 Pointer to a real vector, the vertex ids of the987 * \param partition2 Pointer to a real vector, the vertex ids of the
988 * vertices in the second partinio of the cut are stored here.988 * vertices in the second partition of the cut are stored here.
989 * This argument is ignored if it is a null pointer.989 * This argument is ignored if it is a null pointer.
990 * \param source Integer, the id of the source vertex.990 * \param source Integer, the id of the source vertex.
991 * \param target Integer, the id of the target vertex.991 * \param target Integer, the id of the target vertex.
@@ -996,7 +996,7 @@
996 * 996 *
997 * \sa \ref igraph_maxflow().997 * \sa \ref igraph_maxflow().
998 * 998 *
999 * Time complecity: see \ref igraph_maxflow().999 * Time complexity: see \ref igraph_maxflow().
1000 */1000 */
10011001
1002int igraph_st_mincut(const igraph_t *graph, igraph_real_t *value,1002int igraph_st_mincut(const igraph_t *graph, igraph_real_t *value,
@@ -1054,7 +1054,7 @@
1054/* } */1054/* } */
10551055
1056/*1056/*
1057 * This is the Stoer-Wagner algorithm, it works for calcuating the1057 * This is the Stoer-Wagner algorithm, it works for calculating the
1058 * minimum cut for undirected graphs, for the whole graph. 1058 * minimum cut for undirected graphs, for the whole graph.
1059 * I.e. this is basically the edge-connectivity of the graph. 1059 * I.e. this is basically the edge-connectivity of the graph.
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.
@@ -1219,7 +1219,7 @@
1219 char *mark;1219 char *mark;
1220 mark=igraph_Calloc(no_of_nodes, char);1220 mark=igraph_Calloc(no_of_nodes, char);
1221 if (!mark) { 1221 if (!mark) {
1222 IGRAPH_ERROR("Not enough memory for minumum cut", IGRAPH_ENOMEM);1222 IGRAPH_ERROR("Not enough memory for minimum cut", IGRAPH_ENOMEM);
1223 }1223 }
1224 IGRAPH_FINALLY(igraph_free, mark);1224 IGRAPH_FINALLY(igraph_free, mark);
1225 1225
@@ -1401,7 +1401,7 @@
1401 * This function calculates the minimum cut in a graph. 1401 * This function calculates the minimum cut in a graph.
1402 * The minimum cut is the minimum set of edges which needs to be1402 * The minimum cut is the minimum set of edges which needs to be
1403 * removed to disconnect the graph. The minimum is calculated using1403 * removed to disconnect the graph. The minimum is calculated using
1404 * the weigths (\p capacity) of the edges, so the cut with the minimum1404 * the weights (\p capacity) of the edges, so the cut with the minimum
1405 * total capacity is calculated. 1405 * total capacity is calculated.
1406 * 1406 *
1407 * </para><para> For directed graphs an implementation based on1407 * </para><para> For directed graphs an implementation based on
@@ -1717,7 +1717,7 @@
1717 * \c IGRAPH_VCONN_NUMBER_OF_NODES, return the number of nodes.1717 * \c IGRAPH_VCONN_NUMBER_OF_NODES, return the number of nodes.
1718 * \c IGRAPH_VCONN_IGNORE, ignore the fact that the two vertices1718 * \c IGRAPH_VCONN_IGNORE, ignore the fact that the two vertices
1719 * are connected and calculated the number of vertices needed1719 * are connected and calculated the number of vertices needed
1720 * to aliminate all paths except for the trivial (direct) paths1720 * to eliminate all paths except for the trivial (direct) paths
1721 * between \c source and \c vertex. TOOD: what about neighbors?1721 * between \c source and \c vertex. TOOD: what about neighbors?
1722 * \return Error code.1722 * \return Error code.
1723 * 1723 *
@@ -1862,7 +1862,7 @@
1862 * They were suggested by Peter McMahan, thanks Peter.1862 * They were suggested by Peter McMahan, thanks Peter.
1863 * \return Error code.1863 * \return Error code.
1864 * 1864 *
1865 * Time complecity: O(|V|^5).1865 * Time complexity: O(|V|^5).
1866 * 1866 *
1867 * \sa \ref igraph_st_vertex_connectivity(), \ref igraph_maxflow_value(),1867 * \sa \ref igraph_st_vertex_connectivity(), \ref igraph_maxflow_value(),
1868 * and \ref igraph_edge_connectivity(). 1868 * and \ref igraph_edge_connectivity().
@@ -1997,7 +1997,7 @@
1997 * \param target The id of the target vertex.1997 * \param target The id of the target vertex.
1998 * \return Error code.1998 * \return Error code.
1999 * 1999 *
2000 * Time complecity: O(|V|^3), but see the discussion at \ref2000 * Time complexity: O(|V|^3), but see the discussion at \ref
2001 * igraph_maxflow_value().2001 * igraph_maxflow_value().
2002 * 2002 *
2003 * \sa \ref igraph_vertex_disjoint_paths(), \ref2003 * \sa \ref igraph_vertex_disjoint_paths(), \ref
20042004
=== modified file 'src/foreign.c'
--- src/foreign.c 2011-05-02 15:42:15 +0000
+++ src/foreign.c 2011-09-12 16:01:36 +0000
@@ -158,7 +158,7 @@
158 * \param instream Pointer to a stream, it should be readable.158 * \param instream Pointer to a stream, it should be readable.
159 * \param predefnames Pointer to the symbolic names of the vertices in159 * \param predefnames Pointer to the symbolic names of the vertices in
160 * the file. If \c NULL is given here then vertex ids will be160 * the file. If \c NULL is given here then vertex ids will be
161 * assigned to vertex names in the order of their appearence in161 * assigned to vertex names in the order of their appearance in
162 * the \c .ncol file. If it is not \c NULL and some unknown162 * the \c .ncol file. If it is not \c NULL and some unknown
163 * vertex names are found in the \c .ncol file then new vertex163 * vertex names are found in the \c .ncol file then new vertex
164 * ids will be assigned to them. 164 * ids will be assigned to them.
@@ -1367,7 +1367,7 @@
1367 snprintf(name, sizeof(name)/sizeof(char)-1, "%li", to);1367 snprintf(name, sizeof(name)/sizeof(char)-1, "%li", to);
1368 IGRAPH_CHECK(igraph_trie_get(&trie, name, &to));1368 IGRAPH_CHECK(igraph_trie_get(&trie, name, &to));
1369 if (igraph_trie_size(&trie) != no_of_nodes) {1369 if (igraph_trie_size(&trie) != no_of_nodes) {
1370 IGRAPH_ERROR("Unkown node id found at an edge", IGRAPH_PARSEERROR);1370 IGRAPH_ERROR("Unknown node id found at an edge", IGRAPH_PARSEERROR);
1371 }1371 }
1372 VECTOR(edges)[edgeptr++]=from;1372 VECTOR(edges)[edgeptr++]=from;
1373 VECTOR(edges)[edgeptr++]=to;1373 VECTOR(edges)[edgeptr++]=to;
@@ -2339,7 +2339,7 @@
2339 * file as well, if they are numeric of string.2339 * file as well, if they are numeric of string.
2340 * 2340 *
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
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.
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
2344 * simple procedure is performed on each attribute name: first the alphanumeric 2344 * simple procedure is performed on each attribute name: first the alphanumeric
2345 * characters are extracted, the others are ignored. Then if the first character2345 * characters are extracted, the others are ignored. Then if the first character
23462346
=== modified file 'src/igraph_hashtable.c'
--- src/igraph_hashtable.c 2009-05-07 17:49:52 +0000
+++ src/igraph_hashtable.c 2011-09-12 16:01:36 +0000
@@ -45,7 +45,7 @@
45 igraph_strvector_destroy(&ht->defaults);45 igraph_strvector_destroy(&ht->defaults);
46}46}
4747
48/* Note: may leave the hashtable in an inconsistent state if a new48/* Note: may leave the hash table in an inconsistent state if a new
49 element is added, but this is not a big problem, since while the49 element is added, but this is not a big problem, since while the
50 defaults, or the defaults plus the elements may contain more elements50 defaults, or the defaults plus the elements may contain more elements
51 than the keys trie, but the data is always retrieved based on the trie51 than the keys trie, but the data is always retrieved based on the trie
5252
=== modified file 'src/igraph_strvector.c'
--- src/igraph_strvector.c 2011-05-02 15:42:15 +0000
+++ src/igraph_strvector.c 2011-09-12 16:01:36 +0000
@@ -38,7 +38,7 @@
38 * The current implementation is very simple and not too efficient. It38 * The current implementation is very simple and not too efficient. It
39 * works fine for not too many strings, e.g. the list of attribute39 * works fine for not too many strings, e.g. the list of attribute
40 * names is returned in a string vector by \ref40 * names is returned in a string vector by \ref
41 * igraph_cattribute_list(). Do not expect great performace from this41 * igraph_cattribute_list(). Do not expect great performance from this
42 * type.</para>42 * type.</para>
43 * 43 *
44 * <para>44 * <para>
@@ -323,7 +323,7 @@
323 * Concatenate two string vectors.323 * Concatenate two string vectors.
324 * 324 *
325 * \param to The first string vector, the result is stored here.325 * \param to The first string vector, the result is stored here.
326 * \param from The second string vector, it is kep unchanged.326 * \param from The second string vector, it is kept unchanged.
327 * \return Error code.327 * \return Error code.
328 * 328 *
329 * Time complexity: O(n+l2), n is the number of strings in the new329 * Time complexity: O(n+l2), n is the number of strings in the new
@@ -443,7 +443,7 @@
443 if (tmp != 0) {443 if (tmp != 0) {
444 v->data=tmp;444 v->data=tmp;
445 }445 }
446 IGRAPH_ERROR("canot resize string vector", IGRAPH_ENOMEM);446 IGRAPH_ERROR("Cannot resize string vector", IGRAPH_ENOMEM);
447 }447 }
448 }448 }
449 v->len = newsize;449 v->len = newsize;
450450
=== modified file 'src/igraph_trie.c'
--- src/igraph_trie.c 2009-05-07 17:49:52 +0000
+++ src/igraph_trie.c 2011-09-12 16:01:36 +0000
@@ -338,7 +338,7 @@
338 char *tmp=igraph_Calloc(length+1, char);338 char *tmp=igraph_Calloc(length+1, char);
339339
340 if (tmp==0) {340 if (tmp==0) {
341 IGRAPH_ERROR("canot get from trie", IGRAPH_ENOMEM);341 IGRAPH_ERROR("Cannot get from trie", IGRAPH_ENOMEM);
342 }342 }
343 343
344 strncpy(tmp, key, length);344 strncpy(tmp, key, length);
345345
=== modified file 'src/lapack.c'
--- src/lapack.c 2011-03-01 20:27:49 +0000
+++ src/lapack.c 2011-09-12 16:01:36 +0000
@@ -367,7 +367,7 @@
367 "between 1 and n", IGRAPH_EINVAL);367 "between 1 and n", IGRAPH_EINVAL);
368 }368 }
369 if (which==IGRAPH_LAPACK_DSYEV_SELECT && iu-il < 0) {369 if (which==IGRAPH_LAPACK_DSYEV_SELECT && iu-il < 0) {
370 IGRAPH_ERROR("Invalied 'il' and/or 'iu' values", IGRAPH_EINVAL);370 IGRAPH_ERROR("Invalid 'il' and/or 'iu' values", IGRAPH_EINVAL);
371 }371 }
372372
373 IGRAPH_CHECK(igraph_matrix_copy(&Acopy, A));373 IGRAPH_CHECK(igraph_matrix_copy(&Acopy, A));
@@ -598,7 +598,7 @@
598 * Eigenvalues/vectors of nonsymmetric matrices, expert mode598 * Eigenvalues/vectors of nonsymmetric matrices, expert mode
599 * 599 *
600 * This function calculates the eigenvalues and optionally the left600 * This function calculates the eigenvalues and optionally the left
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.
602 * 602 *
603 * </para><para>603 * </para><para>
604 * Optionally also, it computes a balancing transformation to improve 604 * Optionally also, it computes a balancing transformation to improve
605605
=== modified file 'src/layout.c'
--- src/layout.c 2011-05-02 15:42:15 +0000
+++ src/layout.c 2011-09-12 16:01:36 +0000
@@ -968,7 +968,7 @@
968 * algorithm and program968 * algorithm and program
969 * (http://bioinformatics.icmb.utexas.edu/lgl/). But unlike LGL, this969 * (http://bioinformatics.icmb.utexas.edu/lgl/). But unlike LGL, this
970 * version uses a Fruchterman-Reingold style simulated annealing970 * version uses a Fruchterman-Reingold style simulated annealing
971 * algorithm for placing the vertices. The speedup is achived by971 * algorithm for placing the vertices. The speedup is achieved by
972 * placing the vertices on a grid and calculating the repulsion only972 * placing the vertices on a grid and calculating the repulsion only
973 * for vertices which are closer to each other than a limit. 973 * for vertices which are closer to each other than a limit.
974 * 974 *
@@ -986,7 +986,7 @@
986 * \param coolexp The cooling exponent. A reasonable default value is986 * \param coolexp The cooling exponent. A reasonable default value is
987 * 1.5.987 * 1.5.
988 * \param repulserad Determines the radius at which vertex-vertex 988 * \param repulserad Determines the radius at which vertex-vertex
989 * repulsion cancels out attraction of adjacenct vertices. A989 * repulsion cancels out attraction of adjacent vertices. A
990 * reasonable default value is \p area times the number of vertices.990 * reasonable default value is \p area times the number of vertices.
991 * \param cellsize The size of the grid cells, one side of the991 * \param cellsize The size of the grid cells, one side of the
992 * square. A reasonable default value is the fourth root of992 * square. A reasonable default value is the fourth root of
@@ -1999,7 +1999,7 @@
1999 long int this_node) {1999 long int this_node) {
2000 2000
2001 // We know what the directed force is. We now need to translate it2001 // We know what the directed force is. We now need to translate it
2002 // into the appropriate x and y componenets.2002 // into the appropriate x and y components.
2003 // First, assume: 2003 // First, assume:
2004 // other_node2004 // other_node
2005 // /|2005 // /|
@@ -2201,7 +2201,7 @@
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.
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
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
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)
2205 * is zero.2205 * is zero.
2206 * 2206 *
2207 * </para><para>2207 * </para><para>
@@ -2304,7 +2304,7 @@
2304 // will only happen in extremely rare circumstances, and when2304 // will only happen in extremely rare circumstances, and when
2305 // it does, springs will probably pull them apart anyway.2305 // it does, springs will probably pull them apart anyway.
2306 // also, if we are more than 50 away, the electric force 2306 // also, if we are more than 50 away, the electric force
2307 // will be negligable. 2307 // will be negligible.
2308 // ***** may not always be desirable ****2308 // ***** may not always be desirable ****
2309 if ((distance != 0.0) && (distance < 500.0)) {2309 if ((distance != 0.0) && (distance < 500.0)) {
2310 // if (distance != 0.0) {2310 // if (distance != 0.0) {
23112311
=== modified file 'src/mixing.c'
--- src/mixing.c 2011-03-29 02:53:16 +0000
+++ src/mixing.c 2011-09-12 16:01:36 +0000
@@ -29,8 +29,8 @@
29 * Assortativity of a graph based on vertex categories29 * Assortativity of a graph based on vertex categories
30 * 30 *
31 * Assuming the vertices of the input graph belong to different31 * Assuming the vertices of the input graph belong to different
32 * categories, this function calculates the assortativity coeffient of32 * categories, this function calculates the assortativity coefficient of
33 * the graph. The assortativity coeffient is between minus one and one33 * the graph. The assortativity coefficient is between minus one and one
34 * and it is one if all connections stay within categories, it is34 * and it is one if all connections stay within categories, it is
35 * minus one, if the network is perfectly disassortative. For a35 * minus one, if the network is perfectly disassortative. For a
36 * randomly connected network it is (asymptotically) zero.36 * randomly connected network it is (asymptotically) zero.
@@ -49,7 +49,7 @@
49 * graphs.49 * graphs.
50 * \return Error code.50 * \return Error code.
51 * 51 *
52 * Time complecity: O(|E|+t), |E| is the number of edges, t is the52 * Time complexity: O(|E|+t), |E| is the number of edges, t is the
53 * number of vertex types.53 * number of vertex types.
54 * 54 *
55 * \sa \ref igraph_assortativity if the vertex types are defines by55 * \sa \ref igraph_assortativity if the vertex types are defines by
5656
=== modified file 'src/operators.c'
--- src/operators.c 2011-03-01 20:27:49 +0000
+++ src/operators.c 2011-09-12 16:01:36 +0000
@@ -108,7 +108,7 @@
108 * \brief The disjint union of many graphs.108 * \brief The disjint union of many graphs.
109 *109 *
110 * </para><para>110 * </para><para>
111 * First the vertices in the graphs will be relabed with new vertex111 * First the vertices in the graphs will be relabeled with new vertex
112 * ids to have pairwise disjoint vertex id sets and then the union of112 * ids to have pairwise disjoint vertex id sets and then the union of
113 * the graphs is formed.113 * the graphs is formed.
114 * The number of vertices and edges in the result is the total number114 * The number of vertices and edges in the result is the total number
@@ -544,7 +544,7 @@
544 * 544 *
545 * </para><para> 545 * </para><para>
546 * The result graph will contain as many vertices as the largest graph546 * The result graph will contain as many vertices as the largest graph
547 * among the agruments does, and an edge will be included in it if it547 * among the arguments does, and an edge will be included in it if it
548 * is part of at least one operand graph.548 * is part of at least one operand graph.
549 * 549 *
550 * </para><para>550 * </para><para>
@@ -916,7 +916,7 @@
916 * 916 *
917 * \param res Pointer to an uninitialized graph object, the result917 * \param res Pointer to an uninitialized graph object, the result
918 * will be stored here.918 * will be stored here.
919 * \param g1 The firs operarand, a graph object.919 * \param g1 The firs operand, a graph object.
920 * \param g2 The second operand, another graph object.920 * \param g2 The second operand, another graph object.
921 * \return Error code.921 * \return Error code.
922 * 922 *
923923
=== modified file 'src/revolver_cit.c'
--- src/revolver_cit.c 2009-05-07 15:43:54 +0000
+++ src/revolver_cit.c 2011-09-12 16:01:36 +0000
@@ -1024,7 +1024,7 @@
1024 maxdegree, agebins));1024 maxdegree, agebins));
1025 }1025 }
1026 1026
1027 /* error calculattion */1027 /* error calculation */
1028 if (logprob || lognull) {1028 if (logprob || lognull) {
1029 IGRAPH_CHECK(igraph_revolver_error_ade(graph, kernel, &st,1029 IGRAPH_CHECK(igraph_revolver_error_ade(graph, kernel, &st,
1030 cats, nocats, maxdegree, 1030 cats, nocats, maxdegree,
10311031
=== modified file 'src/revolver_ml_cit.c'
--- src/revolver_ml_cit.c 2010-10-04 15:57:08 +0000
+++ src/revolver_ml_cit.c 2011-09-12 16:01:36 +0000
@@ -163,7 +163,7 @@
163 return data->lastf;163 return data->lastf;
164}164}
165165
166/* This function gievs the gradient of the objective function at166/* This function gives the gradient of the objective function at
167 the supplied parameter vector. Called by the optimizer.167 the supplied parameter vector. Called by the optimizer.
168*/168*/
169169
170170
=== modified file 'src/sparsemat.c'
--- src/sparsemat.c 2011-05-03 14:54:09 +0000
+++ src/sparsemat.c 2011-09-12 16:01:36 +0000
@@ -91,7 +91,7 @@
91 * \param rows The number of rows in the matrix.91 * \param rows The number of rows in the matrix.
92 * \param cols The number of columns.92 * \param cols The number of columns.
93 * \param nzmax The maximum number of non-zero elements in the93 * \param nzmax The maximum number of non-zero elements in the
94 * matrix. It is not compulsary to get this right, but it is94 * matrix. It is not compulsory to get this right, but it is
95 * useful for the allocation of the proper amount of memory.95 * useful for the allocation of the proper amount of memory.
96 * \return Error code.96 * \return Error code.
97 * 97 *
@@ -220,7 +220,7 @@
220220
221/**221/**
222 * \function igraph_sparsemat_type222 * \function igraph_sparsemat_type
223 * Type of a sprase matrix (triplet or column-compressed)223 * Type of a sparse matrix (triplet or column-compressed)
224 * 224 *
225 * Gives whether a sparse matrix is stored in the triplet format or in225 * Gives whether a sparse matrix is stored in the triplet format or in
226 * column-compressed format.226 * column-compressed format.
@@ -295,7 +295,7 @@
295 IGRAPH_ERROR("Invalid row permutation length", IGRAPH_FAILURE);295 IGRAPH_ERROR("Invalid row permutation length", IGRAPH_FAILURE);
296 }296 }
297 if (ncol != igraph_vector_int_size(q)) {297 if (ncol != igraph_vector_int_size(q)) {
298 IGRAPH_ERROR("Invalud column permutation length", IGRAPH_FAILURE);298 IGRAPH_ERROR("Invalid column permutation length", IGRAPH_FAILURE);
299 }299 }
300300
301 /* We invert the permutation by hand */301 /* We invert the permutation by hand */
@@ -669,7 +669,7 @@
669int igraph_sparsemat_droptol(igraph_sparsemat_t *A, igraph_real_t tol) {669int igraph_sparsemat_droptol(igraph_sparsemat_t *A, igraph_real_t tol) {
670 670
671 if (!cs_droptol(A->cs, tol)) {671 if (!cs_droptol(A->cs, tol)) {
672 IGRAPH_ERROR("Cannor drop (almost) zeros from sparse matrix", 672 IGRAPH_ERROR("Cannot drop (almost) zeros from sparse matrix",
673 IGRAPH_FAILURE);673 IGRAPH_FAILURE);
674 }674 }
675 675
@@ -1319,7 +1319,7 @@
13191319
1320/**1320/**
1321 * \function igraph_sparsemat_arpack_rssolve1321 * \function igraph_sparsemat_arpack_rssolve
1322 * Eigenvalues and eigenvectors of a symmetrix sparse matrix via ARPACK1322 * Eigenvalues and eigenvectors of a symmetric sparse matrix via ARPACK
1323 * 1323 *
1324 * \param The input matrix, must be column-compressed.1324 * \param The input matrix, must be column-compressed.
1325 * \param options It is passed to \ref igraph_arpack_rssolve(). See1325 * \param options It is passed to \ref igraph_arpack_rssolve(). See
@@ -1642,7 +1642,7 @@
1642 * 1642 *
1643 * Solves a linear system using a QR decomposition of its coefficient1643 * Solves a linear system using a QR decomposition of its coefficient
1644 * matrix.1644 * matrix.
1645 * \param dis Symbolic analyis of the coefficient matrix, the result1645 * \param dis Symbolic analysis of the coefficient matrix, the result
1646 * of \ref igraph_sparsemat_symbqr().1646 * of \ref igraph_sparsemat_symbqr().
1647 * \param din The QR decomposition of the coefficient matrix, the1647 * \param din The QR decomposition of the coefficient matrix, the
1648 * result of \ref igraph_sparsemat_qr().1648 * result of \ref igraph_sparsemat_qr().
@@ -1968,7 +1968,7 @@
1968 * \function igraph_sparsemat_count_nonzerotol1968 * \function igraph_sparsemat_count_nonzerotol
1969 * Count nonzero elements of a sparse matrix, ignoring elements close to zero1969 * Count nonzero elements of a sparse matrix, ignoring elements close to zero
1970 * 1970 *
1971 * Count the number of matric entries that are closer to zero than \p1971 * Count the number of matrix entries that are closer to zero than \p
1972 * tol.1972 * tol.
1973 * \param The input matrix, column-compressed.1973 * \param The input matrix, column-compressed.
1974 * \param Real scalar, the tolerance. 1974 * \param Real scalar, the tolerance.
19751975
=== modified file 'src/st-cuts.c'
--- src/st-cuts.c 2011-03-01 20:27:49 +0000
+++ src/st-cuts.c 2011-09-12 16:01:36 +0000
@@ -865,7 +865,7 @@
865 return 0;865 return 0;
866}866}
867867
868/* TODO: This is a temporary resursive version, without proper error868/* TODO: This is a temporary recursive version, without proper error
869 handling */869 handling */
870870
871int igraph_provan_shier_list(const igraph_t *graph,871int igraph_provan_shier_list(const igraph_t *graph,
872872
=== modified file 'src/topology.c'
--- src/topology.c 2011-03-01 20:27:49 +0000
+++ src/topology.c 2011-09-12 16:01:36 +0000
@@ -665,7 +665,7 @@
665 * 665 *
666 * </para><para>666 * </para><para>
667 * All graphs with a given number of vertices belong to a number of667 * All graphs with a given number of vertices belong to a number of
668 * isomorpism classes, with every graph in a given class being668 * isomorphism classes, with every graph in a given class being
669 * isomorphic to each other.669 * isomorphic to each other.
670 * 670 *
671 * </para><para>671 * </para><para>
@@ -1016,7 +1016,7 @@
1016 * matching large graphs, Proc. of the 3rd IAPR-TC-15 International1016 * matching large graphs, Proc. of the 3rd IAPR-TC-15 International
1017 * Workshop on Graph-based Representations, Italy, 2001.</para>1017 * Workshop on Graph-based Representations, Italy, 2001.</para>
1018 * 1018 *
1019 * <para>For using it you need to define a calback function of type1019 * <para>For using it you need to define a callback function of type
1020 * \ref igraph_isohandler_t. This function will be called whenever VF21020 * \ref igraph_isohandler_t. This function will be called whenever VF2
1021 * finds an isomorphism between the two graphs. The mapping between1021 * finds an isomorphism between the two graphs. The mapping between
1022 * the two graphs will be also provided to this function. If the1022 * the two graphs will be also provided to this function. If the
10231023
=== modified file 'src/vector_ptr.c'
--- src/vector_ptr.c 2010-08-11 07:50:53 +0000
+++ src/vector_ptr.c 2011-09-12 16:01:36 +0000
@@ -127,7 +127,7 @@
127 * 127 *
128 * Time complexity: operating system dependent, the \quote time128 * Time complexity: operating system dependent, the \quote time
129 * \endquote required to deallocate O(n) bytes, n is the number of129 * \endquote required to deallocate O(n) bytes, n is the number of
130 * elements allocated for the pointer vector (not neccessarily the130 * elements allocated for the pointer vector (not necessarily the
131 * number of elements in the vector).131 * number of elements in the vector).
132 */132 */
133133
@@ -293,7 +293,7 @@
293/**293/**
294 * \ingroup vectorptr294 * \ingroup vectorptr
295 * \function igraph_vector_ptr_push_back295 * \function igraph_vector_ptr_push_back
296 * \brief Appends an elements to the back of a pointer vector.296 * \brief Appends an element to the back of a pointer vector.
297 * 297 *
298 * \param v The pointer vector.298 * \param v The pointer vector.
299 * \param e The new element to include in the pointer vector.299 * \param e The new element to include in the pointer vector.
@@ -474,7 +474,7 @@
474 *474 *
475 * </para><para>475 * </para><para>
476 * This function creates a pointer vector by copying another one. This476 * This function creates a pointer vector by copying another one. This
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.
478 *478 *
479 * </para><para>479 * </para><para>
480 * It is potentially dangerous to copy a pointer vector with an associated480 * It is potentially dangerous to copy a pointer vector with an associated

Subscribers

People subscribed via source and target branches