Commit 695f2149 authored by Andreas Tille's avatar Andreas Tille

New upstream version 1.2.4.1

parent 75045db8
Package: igraph
Version: 1.2.3
Version: 1.2.4.1
Title: Network Analysis and Visualization
Author: See AUTHORS file.
Maintainer: Gábor Csárdi <csardi.gabor@gmail.com>
Description: Routines for simple graphs and network analysis. It can
handle large graphs very well and provides functions for generating random
and regular graphs, graph visualization, centrality methods and much more.
handle large graphs very well and provides functions for generating random
and regular graphs, graph visualization, centrality methods and much more.
Depends: methods
Imports: graphics, grDevices, magrittr, Matrix, pkgconfig (>= 2.0.0),
stats, utils
......@@ -16,6 +16,7 @@ URL: http://igraph.org
SystemRequirements: gmp (optional), libxml2 (optional), glpk (optional)
BugReports: https://github.com/igraph/igraph/issues
Encoding: UTF-8
RoxygenNote: 6.1.1
Collate: 'adjacency.R' 'auto.R' 'assortativity.R' 'attributes.R'
'basic.R' 'bipartite.R' 'centrality.R' 'centralization.R'
'cliques.R' 'cocitation.R' 'cohesive.blocks.R' 'community.R'
......@@ -32,8 +33,7 @@ Collate: 'adjacency.R' 'auto.R' 'assortativity.R' 'attributes.R'
'structural.properties.R' 'structure.info.R' 'test.R'
'tkplot.R' 'topology.R' 'triangles.R' 'utils.R' 'uuid.R'
'versions.R' 'weakref.R' 'zzz-deprecate.R'
RoxygenNote: 6.1.1
NeedsCompilation: yes
Packaged: 2019-02-04 10:32:21 UTC; gaborcsardi
Packaged: 2019-04-21 07:44:54 UTC; ripley
Repository: CRAN
Date/Publication: 2019-02-10 14:43:10 UTC
Date/Publication: 2019-04-22 06:57:32 UTC
a97c69c1785df267c9a8bdf9cfa5e431 *DESCRIPTION
b05c335fa34805d0ed7decbb1ef28724 *DESCRIPTION
229efae9effacda32f9f057513f0c875 *NAMESPACE
638a4ff2bbdff1f6ba877d42da9f8da7 *R/adjacency.R
ba96cdf262f284a91629bcc81958464a *R/assortativity.R
......@@ -73,8 +73,8 @@ c6ff94955e31c10166da5704574ee664 *R/topology.R
dedeede120a8f6b67ac214934ec34b3d *R/versions.R
986ffd9c0f8b6ff1c1144a6710954914 *R/weakref.R
82be9ebc0900c63b2ffff118e8e81f9f *R/zzz-deprecate.R
b9a0f40f24ee6008a0a7ceb66dd64b89 *configure
2359fc2534718b80483d04f0570ec744 *configure.ac
e7a874fe428f9d5ac2393e15625c4ff0 *configure
266f2d042cb2da57fa4f34394c399df8 *configure.ac
d41d8cd98f00b204e9800998ecf8427e *configure.win
f6d91efbe9a92d9da367b19ae2b77d48 *demo/00Index
594342a01208503fbaac63fa9b1f24fa *demo/centrality.R
......@@ -85,7 +85,7 @@ faf3ffd01e590fd13b34efb775f173eb *demo/hrg.R
771ca356197ee2b54c40ceccb4c2419c *demo/smallworld.R
63f74b06a17d02a00dac03fb54a07b54 *inst/AUTHORS
5cc5f3e2c4239fe9a47bfefdbb923dd0 *inst/CITATION
7b56d0723e1d7b542f058322731a2791 *inst/NEWS.md
61b5d73c53881e4256ee8b46a82d4984 *inst/NEWS.md
27e30ac7130f81f5207760f3ef59161c *inst/README.md
9318bc2aeb60f4f79eac2357da0d9b84 *inst/benchmarks/correlated.R
4f938e92ca259e3259a5223e87e51bb0 *inst/benchmarks/local.scan.R
......@@ -581,7 +581,7 @@ c784fda1171706a403d08b06eb5c243e *src/DensityGrid.cpp
5ed39a98531aa791d2815b4c5e78d255 *src/DensityGrid_3d.cpp
5cfb53cff37ca7d43a52db4f8e44ba94 *src/DensityGrid_3d.h
9861ee6d9df86db6b973b8d8a72d4856 *src/Makevars.in
5468a6ec548c7123b58cab129d5245f6 *src/Makevars.win
3e5c857042b7a0f128583c1075674c84 *src/Makevars.win
47ce39714f6f9d6ec3bd7c91624d87f4 *src/NetDataTypes.cpp
69166cb2f393e3ab50bebc72b16d3f7e *src/NetDataTypes.h
19c564585ab9700eb4356ee8eeb32403 *src/NetRoutines.cpp
......@@ -613,8 +613,8 @@ edcf3afe464ddbeb584a664159dd8e64 *src/bliss.cc
d68ac2b15e73f41afa201255b00180cc *src/bliss/bliss_heap.cc
a908d17c67a15f1630dca13d3251548a *src/bliss/defs.cc
909a84d005b4e83406e715606b6fb737 *src/bliss/defs.hh
d9739297bcd67a4f49bc1d3d95a71eed *src/bliss/graph.cc
6e18bc268db869be993132d19604c5fc *src/bliss/graph.hh
f1905552a7f3b28221a1481e0b300f5e *src/bliss/graph.cc
c11809c42634a8bf957f016ceb2078ac *src/bliss/graph.hh
1f71a985781852d2472d3a5cfb17fd53 *src/bliss/heap.hh
7e3eefe8a41743d132c7e1faf9d7d491 *src/bliss/igraph-changes.md
cb75c3b12e2091449199f2620618b9d3 *src/bliss/kqueue.hh
......@@ -848,7 +848,7 @@ d45e5264e0d3d4938d079599356bc688 *src/igraph_stack.c
b5c3cdfed8c984310dae4ee4e3008ee3 *src/igraph_threading.h
78c519533ba34d958b11a20b183c3dfb *src/igraph_trie.c
4aa482a23cfc790fe9de29e1f8867038 *src/igraph_types_internal.h
056b6ced8bfe6256eb01d08d3df7a67d *src/igraph_version.h
e64695174d95af9bd48fc48220438fcc *src/igraph_version.h
4244465fd1a0df2470e06a0c10df3e9e *src/include/igraph.h
6716e5369613ded97a4199ba1023c05b *src/include/igraph_adjlist.h
2947ecbc2e4cfd62b210777d1769a492 *src/include/igraph_arpack.h
......@@ -944,7 +944,7 @@ a4d2a269bb68cd053e9346dddf368584 *src/layout_dh.c
1e43eb788e8bafae353dd0f127609418 *src/layout_fr.c
13624439921d6e2b5a0c72731f0cec17 *src/layout_gem.c
9fa436dd96c8eaccf4f2a3a6f219b5e2 *src/layout_kk.c
7881243c282b5f14b81c3a652e02d111 *src/lazyeval.c
ef9170b9e7c2d1bedf611cedcc79fd20 *src/lazyeval.c
201a9c70e7ebac764daf2578e9753397 *src/lsap.c
14545fd5a7696734b84b8c7277347ff3 *src/matching.c
2237e2aefeecfa2a00061eb8d8dfd8fd *src/math.c
......@@ -1012,9 +1012,9 @@ d8e4562102dd19aa2b0ebb8b9ffc761a *src/prpack/prpack_utils.h
f9a82bcf4a3a750ab39528bc8d304053 *src/qsort_r.c
20fe91e8c46a4b2471a02b3446712ff2 *src/random.c
84c0c4371f2bcc046dc328374260c71c *src/random_walk.c
e5d9d6d104a2f86afb0bc56d9ce0c9ff *src/rinterface.c
cb60dc5bcb6213bb7b0e94167d5301d8 *src/rinterface.c
55c344dc2daf18e33b5e11a248013759 *src/rinterface.h
63b9199bb474d623e913a480111ece06 *src/rinterface_extra.c
9bd640fc620ccde39a84b4f481c9a267 *src/rinterface_extra.c
9ff59160d545d276ac2419396cd07b77 *src/sbm.c
57c6afe96c89270e09ba578385afcca1 *src/scan.c
aea038197b2d7bf291ffae04eb916e1e *src/scg.c
......@@ -1097,7 +1097,7 @@ d4677977768e0f15fb39a1d42bb4a7e7 *src/walktrap_communities.h
4708174b9d0a7ad332731d356b1f51fd *src/walktrap_heap.cpp
50c30f2b5e618bc971622ee539994586 *src/walktrap_heap.h
5125d305fe99bd9f8a0f550eb758a30f *src/zeroin.c
69ac2fe32f6046d4f6bb82ac12d76d42 *tests/testthat.R
3ac491440c081055587468834ef456e0 *tests/testthat.R
3a5ec4e3cc8d87587b31237c5541f86e *tests/testthat/celegansneural.gml.gz
28cd0567bf26075c39c14d11c4c829aa *tests/testthat/dyad.census.R
34d03342fd57be47bdcf3079baea1efa *tests/testthat/football.gml.gz
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for igraph 1.2.2.
# Generated by GNU Autoconf 2.69 for igraph 1.2.4.
#
# Report bugs to <csardi.gabor@gmail.com>.
#
......@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='igraph'
PACKAGE_TARNAME='igraph'
PACKAGE_VERSION='1.2.2'
PACKAGE_STRING='igraph 1.2.2'
PACKAGE_VERSION='1.2.4'
PACKAGE_STRING='igraph 1.2.4'
PACKAGE_BUGREPORT='csardi.gabor@gmail.com'
PACKAGE_URL=''
......@@ -1249,7 +1249,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures igraph 1.2.2 to adapt to many kinds of systems.
\`configure' configures igraph 1.2.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1310,7 +1310,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of igraph 1.2.2:";;
short | recursive ) echo "Configuration of igraph 1.2.4:";;
esac
cat <<\_ACEOF
......@@ -1403,7 +1403,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
igraph configure 1.2.2
igraph configure 1.2.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2125,7 +2125,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by igraph $as_me 1.2.2, which was
It was created by igraph $as_me 1.2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -5207,7 +5207,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by igraph $as_me 1.2.2, which was
This file was extended by igraph $as_me 1.2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -5269,7 +5269,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
igraph config.status 1.2.2
igraph config.status 1.2.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
AC_INIT(igraph, 1.2.2, csardi.gabor@gmail.com)
AC_INIT(igraph, 1.2.4, csardi.gabor@gmail.com)
AC_CONFIG_SRCDIR(src/rinterface.c)
AC_CONFIG_HEADERS(src/config.h)
......
# igraph 1.2.4
Feb 13, 2019
No user visible changes.
# igraph 1.2.3
Jan 27, 2019
......
PKG_CPPFLAGS= -I${LIB_XML}/include/libxml2 -I${LIB_XML}/include -DLIBXML_STATIC -DUSING_R -DHAVE_FMEMOPEN=0 -DHAVE_OPEN_MEMSTREAM=0 -DHAVE_RINTF -DWin32 -DHAVE_LIBXML -Wall -DPACKAGE_VERSION=\"1.2.2\" -DHAVE_FMIN=1 -DHAVE_LOG2=1 -DHAVE_SNPRINTF -Ics -I${GLPK_HOME}/include -DHAVE_GLPK=1 -Iplfit -Iprpack -DIGRAPH_THREAD_LOCAL= -DPRPACK_IGRAPH_SUPPORT -I. -Iinclude -ICHOLMOD/Include -IAMD/Include -ICOLAMD/Include -ISuiteSparse_config -DNDEBUG -DNPARTITION -DNTIMER -DNCAMD -DNPRINT -I$(LIB_GMP)/include
PKG_CPPFLAGS= -I${LIB_XML}/include/libxml2 -I${LIB_XML}/include -DLIBXML_STATIC -DUSING_R -DHAVE_FMEMOPEN=0 -DHAVE_OPEN_MEMSTREAM=0 -DHAVE_RINTF -DWin32 -DHAVE_LIBXML -Wall -DPACKAGE_VERSION=\"1.2.4\" -DHAVE_FMIN=1 -DHAVE_LOG2=1 -DHAVE_SNPRINTF -Ics -I${GLPK_HOME}/include -DHAVE_GLPK=1 -Iplfit -Iprpack -DIGRAPH_THREAD_LOCAL= -DPRPACK_IGRAPH_SUPPORT -I. -Iinclude -ICHOLMOD/Include -IAMD/Include -ICOLAMD/Include -ISuiteSparse_config -DNDEBUG -DNPARTITION -DNTIMER -DNCAMD -DNPRINT -I$(LIB_GMP)/include
PKG_CFLAGS = -DINTERNAL_ARPACK -I. -I$(LIB_GMP)/include -DHAVE_GFORTRAN
......
......@@ -608,7 +608,7 @@ public:
unsigned int cr_cep_index;
unsigned int cr_level;
bool needs_long_prune;
bool needs_long_prune = false;
unsigned int long_prune_begin;
std::set<unsigned int, std::less<unsigned int> > long_prune_redundant;
......
......@@ -323,7 +323,7 @@ protected:
unsigned int refine_current_path_certificate_index;
bool refine_compare_certificate;
bool refine_equal_to_first;
bool refine_equal_to_first = false;
unsigned int refine_first_path_subcertificate_end;
int refine_cmp_to_best;
unsigned int refine_best_path_subcertificate_end;
......
......@@ -28,7 +28,7 @@
__BEGIN_DECLS
#define IGRAPH_VERSION "1.2.2"
#define IGRAPH_VERSION "1.2.4"
#define IGRAPH_VERSION_MAJOR @PACKAGE_VERSION_MAJOR@
#define IGRAPH_VERSION_MINOR @PACKAGE_VERSION_MINOR@
#define IGRAPH_VERSION_PATCH @PACKAGE_VERSION_PATCH@
......
......@@ -38,14 +38,15 @@ SEXP promise_as_lazy(SEXP promise, SEXP env, int follow_symbols) {
}
SEXP make_lazy(SEXP name, SEXP env, SEXP follow_symbols_) {
SEXP promise = findVar(name, env);
SEXP promise = PROTECT(findVar(name, env));
int follow_symbols = asLogical(follow_symbols_);
return promise_as_lazy(promise, env, follow_symbols);
SEXP ret = promise_as_lazy(promise, env, follow_symbols);
UNPROTECT(1);
return ret;
}
SEXP make_lazy_dots(SEXP env, SEXP follow_symbols_) {
SEXP dots = findVar(install("..."), env);
SEXP dots = PROTECT(findVar(install("..."), env));
int follow_symbols = asLogical(follow_symbols_);
// Figure out how many elements in dots
......@@ -75,7 +76,7 @@ SEXP make_lazy_dots(SEXP env, SEXP follow_symbols_) {
setAttrib(lazy_dots, install("names"), names);
setAttrib(lazy_dots, install("class"), PROTECT(mkString("lazy_dots")));
UNPROTECT(3);
UNPROTECT(4);
return lazy_dots;
}
......
This diff is collapsed.
......@@ -281,9 +281,14 @@ SEXP R_igraph_add_version_to_env(SEXP graph) {
uuid_generate(my_id);
uuid_unparse_lower(my_id, my_id_chr);
defineVar(install("myid"), mkString(my_id_chr), VECTOR_ELT(graph, 9));
defineVar(install(R_IGRAPH_VERSION_VAR), mkString(R_IGRAPH_TYPE_VERSION),
VECTOR_ELT(graph, 9));
SEXP l1 = PROTECT(install("myid"));
SEXP l2 = PROTECT(mkString(my_id_chr));
defineVar(l1, l2, VECTOR_ELT(graph, 9));
UNPROTECT(2);
l1 = PROTECT(install(R_IGRAPH_VERSION_VAR));
l2 = PROTECT(mkString(R_IGRAPH_TYPE_VERSION));
defineVar(l1, l2, VECTOR_ELT(graph, 9));
UNPROTECT(2);
UNPROTECT(1);
return graph;
......@@ -294,24 +299,32 @@ SEXP R_igraph_add_env(SEXP graph) {
int i;
uuid_t my_id;
char my_id_chr[40];
int px = 0;
if (GET_LENGTH(result) != 10) {
PROTECT(result = NEW_LIST(10));
if (GET_LENGTH(graph) != 10) {
PROTECT(result = NEW_LIST(10)); px++;
for (i = 0; i < 9; i++) {
SET_VECTOR_ELT(result, i, duplicate(VECTOR_ELT(graph, i)));
}
SET_ATTRIB(result, duplicate(ATTRIB(graph)));
SET_CLASS(result, duplicate(GET_CLASS(graph)));
}
SET_VECTOR_ELT(result, 9, allocSExp(ENVSXP));
uuid_generate(my_id);
uuid_unparse_lower(my_id, my_id_chr);
defineVar(install("myid"), mkString(my_id_chr), VECTOR_ELT(result, 9));
defineVar(install(R_IGRAPH_VERSION_VAR), mkString(R_IGRAPH_TYPE_VERSION),
VECTOR_ELT(result, 9));
if (result != graph) { UNPROTECT(1); }
SEXP l1 = PROTECT(install("myid")); px++;
SEXP l2 = PROTECT(mkString(my_id_chr)); px++;
defineVar(l1, l2, VECTOR_ELT(result, 9));
l1 = PROTECT(install(R_IGRAPH_VERSION_VAR)); px++;
l2 = PROTECT(mkString(R_IGRAPH_TYPE_VERSION)); px++;
defineVar(l1, l2, VECTOR_ELT(result, 9));
UNPROTECT(px);
return result;
}
......
library(testthat)
library(igraph)
suppressWarnings(RNGversion("3.5.0"))
test_check("igraph")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment