From 339fc41003907329ded752d89212ff2aad27421e Mon Sep 17 00:00:00 2001 From: krlmlr Date: Mon, 1 Jul 2024 02:37:01 +0000 Subject: [PATCH] chore: Update vendored sources to igraph/igraph@766238c85a16ebd896d788567c1f61fec3ac7bc8 --- src/vendor/cigraph/CHANGELOG.md | 1 + .../cigraph/src/community/spinglass/pottsmodel_2.cpp | 8 +++++--- src/vendor/igraph_version.h | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vendor/cigraph/CHANGELOG.md b/src/vendor/cigraph/CHANGELOG.md index 8c56e8f486..c1af9b9034 100644 --- a/src/vendor/cigraph/CHANGELOG.md +++ b/src/vendor/cigraph/CHANGELOG.md @@ -5,6 +5,7 @@ ### Fixed - `igraph_layout_drl()` and `igraph_layout_drl_3d()` would crash with an assertion failure when interrupted. This is now fixed. + - Removed broken interruption support from `igraph_community_spinglass_single()`. ## [0.10.13] diff --git a/src/vendor/cigraph/src/community/spinglass/pottsmodel_2.cpp b/src/vendor/cigraph/src/community/spinglass/pottsmodel_2.cpp index f454154e4d..355f19a608 100644 --- a/src/vendor/cigraph/src/community/spinglass/pottsmodel_2.cpp +++ b/src/vendor/cigraph/src/community/spinglass/pottsmodel_2.cpp @@ -45,7 +45,7 @@ #include "pottsmodel_2.h" #include "igraph_random.h" -#include "core/interruption.h" +// #include "core/interruption.h" #include #include @@ -838,7 +838,8 @@ double PottsModel::FindCommunityFromStart( //calculate the affinity changes of all nodes for adding every node in the to_do list to the community //############################## - IGRAPH_ALLOW_INTERRUPTION(); /* This is not clean.... */ + // TODO + // IGRAPH_ALLOW_INTERRUPTION(); /* This is not clean.... */ max_delta_aff = 0.0; max_aff_node = nullptr; @@ -956,7 +957,8 @@ double PottsModel::FindCommunityFromStart( //add the node to to_do again to_do.Push(max_aff_node); } - IGRAPH_ALLOW_INTERRUPTION(); /* This is not clean.... */ + // TODO + // IGRAPH_ALLOW_INTERRUPTION(); /* This is not clean.... */ } //################### //write the node in the community to a file diff --git a/src/vendor/igraph_version.h b/src/vendor/igraph_version.h index 800010329b..40bf73ba4e 100644 --- a/src/vendor/igraph_version.h +++ b/src/vendor/igraph_version.h @@ -28,11 +28,11 @@ __BEGIN_DECLS -#define IGRAPH_VERSION "0.10.13-9-g1be914d61" +#define IGRAPH_VERSION "0.10.13-10-g766238c85" #define IGRAPH_VERSION_MAJOR 0 #define IGRAPH_VERSION_MINOR 10 #define IGRAPH_VERSION_PATCH 13 -#define IGRAPH_VERSION_PRERELEASE "9-g1be914d61" +#define IGRAPH_VERSION_PRERELEASE "10-g766238c85" IGRAPH_EXPORT void igraph_version(const char **version_string, int *major,