Skip to content

Commit 64b3e20

Browse files
ntamasntamas
committed
chore: replace deprecated igraph_integer_t with igraph_int_t
1 parent 9215b9d commit 64b3e20

File tree

18 files changed

+207
-207
lines changed

18 files changed

+207
-207
lines changed

‎src/_igraph/arpackobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static PyObject* igraphmodule_ARPACKOptions_getattr(
115115
static int igraphmodule_ARPACKOptions_setattr(
116116
igraphmodule_ARPACKOptionsObject* self, char* attrname,
117117
PyObject* value) {
118-
igraph_integer_t igraph_int;
118+
igraph_int_t igraph_int;
119119

120120
if (value == 0) {
121121
PyErr_SetString(PyExc_TypeError, "attribute can not be deleted");

‎src/_igraph/attributes.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ int igraphmodule_PyObject_matches_attribute_record(PyObject* object, igraph_attr
183183
return 0;
184184
}
185185

186-
int igraphmodule_get_vertex_id_by_name(igraph_t *graph, PyObject* o, igraph_integer_t* vid) {
186+
int igraphmodule_get_vertex_id_by_name(igraph_t *graph, PyObject* o, igraph_int_t* vid) {
187187
igraphmodule_i_attribute_struct* attrs = ATTR_STRUCT(graph);
188188
PyObject* o_vid = NULL;
189189

@@ -351,7 +351,7 @@ static igraph_error_t igraphmodule_i_attribute_init(
351351
igraph_t *graph, const igraph_attribute_record_list_t *attr
352352
) {
353353
igraphmodule_i_attribute_struct* attrs;
354-
igraph_integer_t i, n;
354+
igraph_int_t i, n;
355355

356356
attrs = (igraphmodule_i_attribute_struct*)calloc(1, sizeof(igraphmodule_i_attribute_struct));
357357
if (!attrs) {
@@ -517,11 +517,11 @@ static igraph_error_t igraphmodule_i_attribute_copy(igraph_t *to, const igraph_t
517517

518518
/* Adding vertices */
519519
static igraph_error_t igraphmodule_i_attribute_add_vertices(
520-
igraph_t *graph, igraph_integer_t nv, const igraph_attribute_record_list_t *attr
520+
igraph_t *graph, igraph_int_t nv, const igraph_attribute_record_list_t *attr
521521
) {
522522
/* Extend the end of every value in the vertex hash with nv pieces of None */
523523
PyObject *key, *value, *dict;
524-
igraph_integer_t i, j, k, num_attr_entries;
524+
igraph_int_t i, j, k, num_attr_entries;
525525
igraph_attribute_record_t *attr_rec;
526526
igraph_vector_bool_t added_attrs;
527527
Py_ssize_t pos = 0;
@@ -690,7 +690,7 @@ static igraph_error_t igraphmodule_i_attribute_add_vertices(
690690
/* Permuting vertices */
691691
static igraph_error_t igraphmodule_i_attribute_permute_vertices(const igraph_t *graph,
692692
igraph_t *newgraph, const igraph_vector_int_t *idx) {
693-
igraph_integer_t i, n;
693+
igraph_int_t i, n;
694694
PyObject *key, *value, *dict, *newdict, *newlist, *o;
695695
Py_ssize_t pos = 0;
696696

@@ -748,7 +748,7 @@ static igraph_error_t igraphmodule_i_attribute_add_edges(
748748
/* Extend the end of every value in the edge hash with ne pieces of None */
749749
PyObject *key, *value, *dict;
750750
Py_ssize_t pos = 0;
751-
igraph_integer_t i, j, k, ne, num_attr_entries;
751+
igraph_int_t i, j, k, ne, num_attr_entries;
752752
igraph_vector_bool_t added_attrs;
753753
igraph_attribute_record_t *attr_rec;
754754

@@ -904,7 +904,7 @@ static igraph_error_t igraphmodule_i_attribute_add_edges(
904904
/* Permuting edges */
905905
static igraph_error_t igraphmodule_i_attribute_permute_edges(const igraph_t *graph,
906906
igraph_t *newgraph, const igraph_vector_int_t *idx) {
907-
igraph_integer_t i, n;
907+
igraph_int_t i, n;
908908
PyObject *key, *value, *dict, *newdict, *newlist, *o;
909909
Py_ssize_t pos=0;
910910

@@ -961,14 +961,14 @@ static igraph_error_t igraphmodule_i_attribute_permute_edges(const igraph_t *gra
961961
*/
962962
static PyObject* igraphmodule_i_ac_func(PyObject* values,
963963
const igraph_vector_int_list_t *merges, PyObject* func) {
964-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
964+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
965965
PyObject *res, *list, *item;
966966

967967
res = PyList_New(len);
968968

969969
for (i = 0; i < len; i++) {
970970
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
971-
igraph_integer_t j, n = igraph_vector_int_size(v);
971+
igraph_int_t j, n = igraph_vector_int_size(v);
972972

973973
list = PyList_New(n);
974974
for (j = 0; j < n; j++) {
@@ -1044,14 +1044,14 @@ static PyObject* igraphmodule_i_ac_builtin_func(PyObject* values,
10441044
*/
10451045
static PyObject* igraphmodule_i_ac_sum(PyObject* values,
10461046
const igraph_vector_int_list_t *merges) {
1047-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
1047+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
10481048
PyObject *res, *item;
10491049

10501050
res = PyList_New(len);
10511051
for (i = 0; i < len; i++) {
10521052
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
10531053
igraph_real_t num = 0.0, sum = 0.0;
1054-
igraph_integer_t j, n = igraph_vector_int_size(v);
1054+
igraph_int_t j, n = igraph_vector_int_size(v);
10551055

10561056
for (j = 0; j < n; j++) {
10571057
item = PyList_GetItem(values, (Py_ssize_t)VECTOR(*v)[j]);
@@ -1087,14 +1087,14 @@ static PyObject* igraphmodule_i_ac_sum(PyObject* values,
10871087
*/
10881088
static PyObject* igraphmodule_i_ac_prod(PyObject* values,
10891089
const igraph_vector_int_list_t *merges) {
1090-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
1090+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
10911091
PyObject *res, *item;
10921092

10931093
res = PyList_New(len);
10941094
for (i = 0; i < len; i++) {
10951095
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
10961096
igraph_real_t num = 1.0, prod = 1.0;
1097-
igraph_integer_t j, n = igraph_vector_int_size(v);
1097+
igraph_int_t j, n = igraph_vector_int_size(v);
10981098

10991099
for (j = 0; j < n; j++) {
11001100
item = PyList_GetItem(values, (Py_ssize_t)VECTOR(*v)[j]);
@@ -1131,13 +1131,13 @@ static PyObject* igraphmodule_i_ac_prod(PyObject* values,
11311131
*/
11321132
static PyObject* igraphmodule_i_ac_first(PyObject* values,
11331133
const igraph_vector_int_list_t *merges) {
1134-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
1134+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
11351135
PyObject *res, *item;
11361136

11371137
res = PyList_New(len);
11381138
for (i = 0; i < len; i++) {
11391139
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
1140-
igraph_integer_t n = igraph_vector_int_size(v);
1140+
igraph_int_t n = igraph_vector_int_size(v);
11411141

11421142
item = n > 0 ? PyList_GetItem(values, (Py_ssize_t)VECTOR(*v)[0]) : Py_None;
11431143
if (item == 0) {
@@ -1164,7 +1164,7 @@ static PyObject* igraphmodule_i_ac_first(PyObject* values,
11641164
*/
11651165
static PyObject* igraphmodule_i_ac_random(PyObject* values,
11661166
const igraph_vector_int_list_t *merges) {
1167-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
1167+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
11681168
PyObject *res, *item, *num;
11691169
PyObject *random_module = PyImport_ImportModule("random");
11701170
PyObject *random_func;
@@ -1181,7 +1181,7 @@ static PyObject* igraphmodule_i_ac_random(PyObject* values,
11811181
res = PyList_New(len);
11821182
for (i = 0; i < len; i++) {
11831183
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
1184-
igraph_integer_t n = igraph_vector_int_size(v);
1184+
igraph_int_t n = igraph_vector_int_size(v);
11851185

11861186
if (n > 0) {
11871187
num = PyObject_CallObject(random_func, 0);
@@ -1192,7 +1192,7 @@ static PyObject* igraphmodule_i_ac_random(PyObject* values,
11921192
}
11931193

11941194
item = PyList_GetItem(
1195-
values, VECTOR(*v)[(igraph_integer_t)(n * PyFloat_AsDouble(num))]
1195+
values, VECTOR(*v)[(igraph_int_t)(n * PyFloat_AsDouble(num))]
11961196
);
11971197
if (item == 0) {
11981198
Py_DECREF(random_func);
@@ -1227,13 +1227,13 @@ static PyObject* igraphmodule_i_ac_random(PyObject* values,
12271227
*/
12281228
static PyObject* igraphmodule_i_ac_last(PyObject* values,
12291229
const igraph_vector_int_list_t *merges) {
1230-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
1230+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
12311231
PyObject *res, *item;
12321232

12331233
res = PyList_New(len);
12341234
for (i = 0; i < len; i++) {
12351235
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
1236-
igraph_integer_t n = igraph_vector_int_size(v);
1236+
igraph_int_t n = igraph_vector_int_size(v);
12371237

12381238
item = (n > 0) ? PyList_GetItem(values, (Py_ssize_t)VECTOR(*v)[n-1]) : Py_None;
12391239
if (item == 0) {
@@ -1261,14 +1261,14 @@ static PyObject* igraphmodule_i_ac_last(PyObject* values,
12611261
*/
12621262
static PyObject* igraphmodule_i_ac_mean(PyObject* values,
12631263
const igraph_vector_int_list_t *merges) {
1264-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
1264+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
12651265
PyObject *res, *item;
12661266

12671267
res = PyList_New(len);
12681268
for (i = 0; i < len; i++) {
12691269
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
12701270
igraph_real_t num = 0.0, mean = 0.0;
1271-
igraph_integer_t j, n = igraph_vector_int_size(v);
1271+
igraph_int_t j, n = igraph_vector_int_size(v);
12721272

12731273
for (j = 0; j < n; ) {
12741274
item = PyList_GetItem(values, (Py_ssize_t)VECTOR(*v)[j]);
@@ -1307,13 +1307,13 @@ static PyObject* igraphmodule_i_ac_mean(PyObject* values,
13071307
*/
13081308
static PyObject* igraphmodule_i_ac_median(PyObject* values,
13091309
const igraph_vector_int_list_t *merges) {
1310-
igraph_integer_t i, len = igraph_vector_int_list_size(merges);
1310+
igraph_int_t i, len = igraph_vector_int_list_size(merges);
13111311
PyObject *res, *list, *item;
13121312

13131313
res = PyList_New(len);
13141314
for (i = 0; i < len; i++) {
13151315
igraph_vector_int_t *v = igraph_vector_int_list_get_ptr(merges, i);
1316-
igraph_integer_t j, n = igraph_vector_int_size(v);
1316+
igraph_int_t j, n = igraph_vector_int_size(v);
13171317
list = PyList_New(n);
13181318
for (j = 0; j < n; j++) {
13191319
item = PyList_GetItem(values, (Py_ssize_t)VECTOR(*v)[j]);
@@ -1874,7 +1874,7 @@ igraph_error_t igraphmodule_i_get_numeric_vertex_attr(const igraph_t *graph,
18741874
igraph_vector_destroy(&newvalue);
18751875
} else {
18761876
igraph_vit_t it;
1877-
igraph_integer_t i = igraph_vector_size(value);
1877+
igraph_int_t i = igraph_vector_size(value);
18781878
IGRAPH_CHECK(igraph_vit_create(graph, vs, &it));
18791879
IGRAPH_FINALLY(igraph_vit_destroy, &it);
18801880
IGRAPH_CHECK(igraph_vector_resize(value, i + IGRAPH_VIT_SIZE(it)));
@@ -1921,12 +1921,12 @@ igraph_error_t igraphmodule_i_get_string_vertex_attr(const igraph_t *graph,
19211921
igraph_strvector_destroy(&newvalue);
19221922
} else {
19231923
igraph_vit_t it;
1924-
igraph_integer_t i = igraph_strvector_size(value);
1924+
igraph_int_t i = igraph_strvector_size(value);
19251925
IGRAPH_CHECK(igraph_vit_create(graph, vs, &it));
19261926
IGRAPH_FINALLY(igraph_vit_destroy, &it);
19271927
IGRAPH_CHECK(igraph_strvector_resize(value, i + IGRAPH_VIT_SIZE(it)));
19281928
while (!IGRAPH_VIT_END(it)) {
1929-
igraph_integer_t v = IGRAPH_VIT_GET(it);
1929+
igraph_int_t v = IGRAPH_VIT_GET(it);
19301930
char* str;
19311931

19321932
result = PyList_GetItem(list, v);
@@ -1982,7 +1982,7 @@ igraph_error_t igraphmodule_i_get_boolean_vertex_attr(const igraph_t *graph,
19821982
igraph_vector_bool_destroy(&newvalue);
19831983
} else {
19841984
igraph_vit_t it;
1985-
igraph_integer_t i = igraph_vector_bool_size(value);
1985+
igraph_int_t i = igraph_vector_bool_size(value);
19861986
IGRAPH_CHECK(igraph_vit_create(graph, vs, &it));
19871987
IGRAPH_FINALLY(igraph_vit_destroy, &it);
19881988
IGRAPH_CHECK(igraph_vector_bool_resize(value, i + IGRAPH_VIT_SIZE(it)));
@@ -2023,7 +2023,7 @@ igraph_error_t igraphmodule_i_get_numeric_edge_attr(const igraph_t *graph,
20232023
igraph_vector_destroy(&newvalue);
20242024
} else {
20252025
igraph_eit_t it;
2026-
igraph_integer_t i = igraph_vector_size(value);
2026+
igraph_int_t i = igraph_vector_size(value);
20272027
IGRAPH_CHECK(igraph_eit_create(graph, es, &it));
20282028
IGRAPH_FINALLY(igraph_eit_destroy, &it);
20292029
IGRAPH_CHECK(igraph_vector_resize(value, i + IGRAPH_EIT_SIZE(it)));
@@ -2074,7 +2074,7 @@ igraph_error_t igraphmodule_i_get_string_edge_attr(const igraph_t *graph,
20742074
igraph_strvector_destroy(&newvalue);
20752075
} else {
20762076
igraph_eit_t it;
2077-
igraph_integer_t i = igraph_strvector_size(value);
2077+
igraph_int_t i = igraph_strvector_size(value);
20782078
IGRAPH_CHECK(igraph_eit_create(graph, es, &it));
20792079
IGRAPH_FINALLY(igraph_eit_destroy, &it);
20802080
IGRAPH_CHECK(igraph_strvector_resize(value, IGRAPH_EIT_SIZE(it)));
@@ -2133,7 +2133,7 @@ igraph_error_t igraphmodule_i_get_boolean_edge_attr(const igraph_t *graph,
21332133
igraph_vector_bool_destroy(&newvalue);
21342134
} else {
21352135
igraph_eit_t it;
2136-
igraph_integer_t i = igraph_vector_bool_size(value);
2136+
igraph_int_t i = igraph_vector_bool_size(value);
21372137
IGRAPH_CHECK(igraph_eit_create(graph, es, &it));
21382138
IGRAPH_FINALLY(igraph_eit_destroy, &it);
21392139
IGRAPH_CHECK(igraph_vector_bool_resize(value, i + IGRAPH_EIT_SIZE(it)));

‎src/_igraph/attributes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ int igraphmodule_attribute_name_check(PyObject* obj);
8383
void igraphmodule_initialize_attribute_handler(void);
8484
void igraphmodule_index_vertex_names(igraph_t *graph, igraph_bool_t force);
8585
void igraphmodule_invalidate_vertex_name_index(igraph_t *graph);
86-
int igraphmodule_get_vertex_id_by_name(igraph_t *graph, PyObject* o, igraph_integer_t* id);
86+
int igraphmodule_get_vertex_id_by_name(igraph_t *graph, PyObject* o, igraph_int_t* id);
8787

8888
PyObject* igraphmodule_create_or_get_edge_attribute_values(const igraph_t* graph,
8989
const char* name);

‎src/_igraph/bfsiter.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ PyTypeObject* igraphmodule_BFSIterType;
4444
*/
4545
PyObject* igraphmodule_BFSIter_new(igraphmodule_GraphObject *g, PyObject *root, igraph_neimode_t mode, igraph_bool_t advanced) {
4646
igraphmodule_BFSIterObject* self;
47-
igraph_integer_t no_of_nodes, r;
47+
igraph_int_t no_of_nodes, r;
4848

4949
self = (igraphmodule_BFSIterObject*) PyType_GenericNew(igraphmodule_BFSIterType, 0, 0);
5050
if (!self) {
@@ -162,10 +162,10 @@ static PyObject* igraphmodule_BFSIter_iter(igraphmodule_BFSIterObject* self) {
162162

163163
static PyObject* igraphmodule_BFSIter_iternext(igraphmodule_BFSIterObject* self) {
164164
if (!igraph_dqueue_int_empty(&self->queue)) {
165-
igraph_integer_t vid = igraph_dqueue_int_pop(&self->queue);
166-
igraph_integer_t dist = igraph_dqueue_int_pop(&self->queue);
167-
igraph_integer_t parent = igraph_dqueue_int_pop(&self->queue);
168-
igraph_integer_t i, n;
165+
igraph_int_t vid = igraph_dqueue_int_pop(&self->queue);
166+
igraph_int_t dist = igraph_dqueue_int_pop(&self->queue);
167+
igraph_int_t parent = igraph_dqueue_int_pop(&self->queue);
168+
igraph_int_t i, n;
169169

170170
if (igraph_neighbors(self->graph, &self->neis, vid, self->mode, /* loops = */ 0, /* multiple = */ 0)) {
171171
igraphmodule_handle_igraph_error();
@@ -174,7 +174,7 @@ static PyObject* igraphmodule_BFSIter_iternext(igraphmodule_BFSIterObject* self)
174174

175175
n = igraph_vector_int_size(&self->neis);
176176
for (i = 0; i < n; i++) {
177-
igraph_integer_t neighbor = VECTOR(self->neis)[i];
177+
igraph_int_t neighbor = VECTOR(self->neis)[i];
178178
if (self->visited[neighbor] == 0) {
179179
self->visited[neighbor] = 1;
180180
if (igraph_dqueue_int_push(&self->queue, neighbor) ||

0 commit comments

Comments
 (0)