Skip to content

Commit 4ae3527

Browse files
committed
vendor: Update vendored sources to igraph/igraph@0878f57
doc: more documentation improvements
1 parent 7f7bdd6 commit 4ae3527

File tree

16 files changed

+49
-50
lines changed

16 files changed

+49
-50
lines changed

src/vendor/cigraph/src/centrality/centralization.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ igraph_error_t igraph_centralization_degree(const igraph_t *graph, igraph_vector
200200
* or total degree (\c IGRAPH_ALL). This is ignored if
201201
* the \p graph argument is not a null pointer and the
202202
* given graph is undirected.
203-
* \param loops Boolean scalar, whether to consider loop edges in the
203+
* \param loops Boolean, whether to consider loop edges in the
204204
* calculation.
205205
* \param res Pointer to a real variable, the result is stored here.
206206
* \return Error code.
@@ -358,7 +358,7 @@ igraph_error_t igraph_centralization_betweenness(const igraph_t *graph,
358358
* above.
359359
* \param nodes The number of nodes. This is ignored if the
360360
* \p graph argument is not a null pointer.
361-
* \param directed Boolean scalar, whether to use directed paths in
361+
* \param directed Boolean, whether to use directed paths in
362362
* the betweenness calculation. This argument is ignored if
363363
* \p graph is not a null pointer and it is undirected.
364364
* \param res Pointer to a real variable, the result is stored here.
@@ -695,7 +695,7 @@ igraph_error_t igraph_centralization_eigenvector_centrality(
695695
* above.
696696
* \param nodes The number of nodes. This is ignored if the
697697
* \p graph argument is not a null pointer.
698-
* \param directed Boolean scalar, whether to consider edge
698+
* \param directed Boolean, whether to consider edge
699699
* directions. This argument is ignored if
700700
* \p graph is not a null pointer and it is undirected.
701701
* \param scale This parameter is deprecated and ignored since igraph 0.10.14.

src/vendor/cigraph/src/cliques/glet.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -785,12 +785,13 @@ igraph_error_t igraph_i_graphlets_project(
785785

786786
/**
787787
* \function igraph_graphlets_project
788-
* Project a graph on a graphlets basis
788+
* \brief Project a graph on a graphlets basis.
789789
*
790790
* Note that the graph projected does not have to be the same that
791791
* was used to calculate the graphlet basis, but it is assumed that
792792
* it has the same number of vertices, and the vertex IDs of the two
793793
* graphs match.
794+
*
794795
* \param graph The input graph, it must be a simple graph, edge directions are
795796
* ignored.
796797
* \param weights Weights of the edges in the input graph, a vector.
@@ -804,7 +805,7 @@ igraph_error_t igraph_i_graphlets_project(
804805
* \param startMu If true, then the supplied Mu vector is
805806
* used as the starting point of the iteration. Otherwise a
806807
* constant 1 vector is used.
807-
* \param niter Integer scalar, the number of iterations to perform.
808+
* \param niter The number of iterations to perform.
808809
* \return Error code.
809810
*
810811
* See also: \ref igraph_graphlets() and
@@ -844,11 +845,12 @@ static int igraph_i_graphlets_order_cmp(void *data, const void *a, const void *b
844845

845846
/**
846847
* \function igraph_graphlets
847-
* Calculate graphlets basis and project the graph on it
848+
* \brief Calculate graphlets basis and project the graph on it.
848849
*
849850
* This function simply calls \ref igraph_graphlets_candidate_basis()
850851
* and \ref igraph_graphlets_project(), and then orders the graphlets
851852
* according to decreasing weights.
853+
*
852854
* \param graph The input graph, it must be a simple graph, edge directions are
853855
* ignored.
854856
* \param weights Weights of the edges, a vector.
@@ -857,8 +859,7 @@ static int igraph_i_graphlets_order_cmp(void *data, const void *a, const void *b
857859
* vertex IDs, encoding a single basis subgraph.
858860
* \param Mu An initialized vector, the weights of the graphlets will
859861
* be stored here.
860-
* \param niter Integer scalar, the number of iterations to perform
861-
* for the projection step.
862+
* \param niter The number of iterations to perform for the projection step.
862863
* \return Error code.
863864
*
864865
* See also: \ref igraph_graphlets_candidate_basis() and

src/vendor/cigraph/src/connectivity/components.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ static igraph_error_t igraph_i_decompose_strong(const igraph_t *graph,
625625
* want to limit the number of components.
626626
* \param minelements The minimum number of vertices a component
627627
* should contain in order to place it in the \p components
628-
* vector. For example, supplying 2 here ignored isolated vertices.
628+
* vector. For example, supplying 2 here ignores isolated vertices.
629629
* \return Error code, \c IGRAPH_ENOMEM if there is not enough memory
630630
* to perform the operation.
631631
*

src/vendor/cigraph/src/core/sparsemat.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -933,9 +933,9 @@ igraph_error_t igraph_sparsemat_multiply(const igraph_sparsemat_t *A,
933933
*
934934
* \param A The first input matrix, in column-compressed format.
935935
* \param B The second input matrix, in column-compressed format.
936-
* \param alpha Real scalar, \p A is multiplied by \p alpha before the
936+
* \param alpha Real value, \p A is multiplied by \p alpha before the
937937
* addition.
938-
* \param beta Real scalar, \p B is multiplied by \p beta before the
938+
* \param beta Real value, \p B is multiplied by \p beta before the
939939
* addition.
940940
* \param res Pointer to an uninitialized sparse matrix, the result
941941
* is stored here.
@@ -1291,8 +1291,7 @@ static igraph_error_t igraph_i_sparsemat_triplet(igraph_t *graph, const igraph_s
12911291
* \param graph Pointer to an uninitialized igraph_t object, the
12921292
* graphs is stored here.
12931293
* \param A The input matrix, in triplet or column-compressed format.
1294-
* \param directed Boolean scalar, whether to create a directed
1295-
* graph.
1294+
* \param directed Whether to create a directed graph.
12961295
* \return Error code.
12971296
*
12981297
* Time complexity: TODO.
@@ -2104,9 +2103,9 @@ void igraph_sparsemat_numeric_destroy(igraph_sparsemat_numeric_t *din) {
21042103
* \param res An uninitialized sparse matrix, the result is stored
21052104
* here.
21062105
* \param mat The dense input matrix.
2107-
* \param tol Real scalar, the tolerance. Values closer than \p tol to
2108-
* zero are considered as zero, and will not be included in the
2109-
* sparse matrix.
2106+
* \param tol The tolerance for zero comparisons. Values closer than
2107+
* \p tol to zero are considered as zero, and will not be included
2108+
* in the sparse matrix.
21102109
* \return Error code.
21112110
*
21122111
* \sa \ref igraph_sparsemat_as_matrix() for the reverse conversion.
@@ -2358,10 +2357,10 @@ igraph_integer_t igraph_sparsemat_count_nonzero(igraph_sparsemat_t *A) {
23582357
* \function igraph_sparsemat_count_nonzerotol
23592358
* \brief Counts nonzero elements of a sparse matrix, ignoring elements close to zero.
23602359
*
2361-
* Count the number of matrix entries that are closer to zero than \p
2362-
* tol.
2360+
* Count the number of matrix entries that are closer to zero than \p tol.
2361+
*
23632362
* \param The input matrix, column-compressed.
2364-
* \param Real scalar, the tolerance.
2363+
* \param The tolerance for zero comparisons.
23652364
* \return Error code.
23662365
*
23672366
* Time complexity: TODO.
@@ -2850,7 +2849,8 @@ igraph_error_t igraph_sparsemat_colsums(const igraph_sparsemat_t *A,
28502849
* \function igraph_sparsemat_scale
28512850
* \brief Scales a sparse matrix.
28522851
*
2853-
* Multiplies all elements of a sparse matrix, by the given scalar.
2852+
* Multiplies all elements of a sparse matrix, by the given factor.
2853+
*
28542854
* \param A The input matrix.
28552855
* \param by The scaling factor.
28562856
* \return Error code.

src/vendor/cigraph/src/games/correlated.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,11 @@ static void sort_edges(igraph_vector_int_t *edges, const igraph_t *graph) {
7373
*
7474
* \param old_graph The original graph, it must be simple.
7575
* \param new_graph The new graph will be stored here.
76-
* \param corr A scalar in the unit interval [0,1], the target Pearson
76+
* \param corr A value in the unit interval [0,1], the target Pearson
7777
* correlation between the adjacency matrices of the original and the
7878
* generated graph (the adjacency matrix being used as a vector).
79-
* \param p A numeric scalar, the probability of an edge between two
80-
* vertices, it must in the open (0,1) interval. Typically,
81-
* the density of \p old_graph.
79+
* \param p The probability of an edge between two vertices. It must in the
80+
* open (0,1) interval. Typically, the density of \p old_graph.
8281
* \param permutation A permutation to apply to the vertices of the
8382
* generated graph. It can also be a null pointer, in which case
8483
* the vertices will not be permuted.

src/vendor/cigraph/src/graph/type_indexededgelist.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,9 +1391,9 @@ igraph_error_t igraph_degree(const igraph_t *graph, igraph_vector_int_t *res,
13911391
* will be returned.
13921392
* \param from The starting point of the edge.
13931393
* \param to The end point of the edge.
1394-
* \param directed Logical constant, whether to search for directed
1394+
* \param directed Boolean, whether to search for directed
13951395
* edges in a directed graph. Ignored for undirected graphs.
1396-
* \param error Logical scalar, whether to report an error if the edge
1396+
* \param error Boolean, whether to report an error if the edge
13971397
* was not found. If it is false, then <code>-1</code> will be
13981398
* assigned to \p eid. Note that invalid vertex IDs in input
13991399
* arguments (\p from or \p to) always trigger an error,
@@ -1476,9 +1476,9 @@ igraph_error_t igraph_get_eid(const igraph_t *graph, igraph_integer_t *eid,
14761476
* \param eids Pointer to an initialized vector, the result is stored
14771477
* here. It will be resized as needed.
14781478
* \param pairs Vector giving pairs of vertices to fetch the edges for.
1479-
* \param directed Logical scalar, whether to consider edge directions
1479+
* \param directed Boolean, whether to consider edge directions
14801480
* in directed graphs. This is ignored for undirected graphs.
1481-
* \param error Logical scalar, whether it is an error to supply
1481+
* \param error Boolean, whether it is an error to supply
14821482
* non-connected vertices. If false, then -1 is
14831483
* returned for non-connected pairs.
14841484
* \return Error code.
@@ -1597,7 +1597,7 @@ igraph_error_t igraph_get_eids(const igraph_t *graph, igraph_vector_int_t *eids,
15971597
* here. It will be resized as needed.
15981598
* \param source The ID of the source vertex
15991599
* \param target The ID of the target vertex
1600-
* \param directed Logical scalar, whether to consider edge directions
1600+
* \param directed Boolean, whether to consider edge directions
16011601
* in directed graphs. This is ignored for undirected graphs.
16021602
* \return Error code.
16031603
*

src/vendor/cigraph/src/graph/visitors.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
* \c IGRAPH_IN means the opposite, and
5757
* \c IGRAPH_ALL ignores the direction of the edges.
5858
* This parameter is ignored for undirected graphs.
59-
* \param unreachable Logical scalar, whether the search should visit
59+
* \param unreachable Boolean, whether the search should visit
6060
* the vertices that are unreachable from the given root
6161
* node(s). If true, then additional searches are performed
6262
* until all vertices are visited.
@@ -442,7 +442,7 @@ igraph_error_t igraph_bfs_simple(
442442
* \c IGRAPH_IN means the opposite, and
443443
* \c IGRAPH_ALL ignores the direction of the edges.
444444
* This parameter is ignored for undirected graphs.
445-
* \param unreachable Logical scalar, whether the search should visit
445+
* \param unreachable Boolean, whether the search should visit
446446
* the vertices that are unreachable from the given root
447447
* node(s). If true, then additional searches are performed
448448
* until all vertices are visited.

src/vendor/cigraph/src/io/dl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void igraph_dl_yylex_destroy_wrapper (void *scanner ) {
5555
*
5656
* \param graph Pointer to an uninitialized graph object.
5757
* \param instream The stream to read the DL file from.
58-
* \param directed Logical scalar, whether to create a directed file.
58+
* \param directed Boolean, whether to create a directed file.
5959
* \return Error code.
6060
*
6161
* Time complexity: linear in terms of the number of edges and

src/vendor/cigraph/src/io/graphdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static igraph_error_t handle_input_error(FILE *instream) {
8181
* \param graph Pointer to an uninitialized graph object.
8282
* \param instream The stream to read from. It should be opened
8383
* in binary mode.
84-
* \param directed Logical scalar, whether to create a directed graph.
84+
* \param directed Whether to create a directed graph.
8585
* \return Error code.
8686
*
8787
* Time complexity: O(|V|+|E|), the number of vertices plus the

src/vendor/cigraph/src/layout/drl/drl_layout.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ igraph_error_t igraph_layout_drl_options_init(igraph_layout_drl_options_t *optio
420420
* Brown, W.M., Klavans, R., Boyack, K.W., DrL: Distributed Recursive
421421
* (Graph) Layout. SAND Reports, 2008. 2936: p. 1-10.
422422
* \param graph The input graph.
423-
* \param use_seed Logical scalar, if true, then the coordinates
423+
* \param use_seed Boolean, if true, then the coordinates
424424
* supplied in the \p res argument are used as starting points.
425425
* \param res Pointer to a matrix, the result layout is stored
426426
* here. It will be resized as needed.

0 commit comments

Comments
 (0)