Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion R/assortativity.R
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ assortativity_legacy <- function(

#' @param types Vector giving the vertex types. They as assumed to be integer
#' numbers, starting with one. Non-integer values are converted to integers
#' with [as.integer()].
#' with [as.integer()]. Character vectors are converted to integers using
#' [as.factor()].
#' @rdname assortativity
#' @export
#' @cdocs igraph_assortativity_nominal
Expand All @@ -247,6 +248,11 @@ assortativity_nominal <- function(
directed = TRUE,
normalized = TRUE
) {
# Convert character types to factor then to integer for categorical data
if (is.character(types)) {
types <- as.integer(as.factor(types))
}

assortativity_nominal_impl(
graph = graph,
types = types,
Expand Down
3 changes: 2 additions & 1 deletion man/assortativity.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion man/assortativity.nominal.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

252 changes: 252 additions & 0 deletions src/cpp11.dd
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,255 @@
cpp11.o: \
cpp11.cpp \
igraph_types.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/R.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/altrep.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/as.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/attribute_proxy.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/data_frame.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/declarations.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/doubles.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/environment.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/external_pointer.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/function.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/integers.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/list.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/list_of.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/logicals.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/matrix.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/named_arg.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/protect.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/r_bool.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/r_string.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/r_vector.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/raws.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/sexp.hpp \
/home/runner/work/_temp/Library/cpp11/include/cpp11/strings.hpp \
/opt/R/4.5.1/lib/R/include/R_ext/Arith.h \
/opt/R/4.5.1/lib/R/include/R_ext/Boolean.h \
/opt/R/4.5.1/lib/R/include/R_ext/Complex.h \
/opt/R/4.5.1/lib/R/include/R_ext/Error.h \
/opt/R/4.5.1/lib/R/include/R_ext/Memory.h \
/opt/R/4.5.1/lib/R/include/R_ext/Print.h \
/opt/R/4.5.1/lib/R/include/R_ext/Rdynload.h \
/opt/R/4.5.1/lib/R/include/R_ext/Utils.h \
/opt/R/4.5.1/lib/R/include/R_ext/Visibility.h \
/opt/R/4.5.1/lib/R/include/R_ext/libextern.h \
/opt/R/4.5.1/lib/R/include/Rconfig.h \
/opt/R/4.5.1/lib/R/include/Rinternals.h \
/opt/R/4.5.1/lib/R/include/Rversion.h \
/usr/include/asm-generic/errno.h \
/usr/include/c++/13/algorithm \
/usr/include/c++/13/backward/auto_ptr.h \
/usr/include/c++/13/backward/binders.h \
/usr/include/c++/13/bits/algorithmfwd.h \
/usr/include/c++/13/bits/align.h \
/usr/include/c++/13/bits/alloc_traits.h \
/usr/include/c++/13/bits/allocated_ptr.h \
/usr/include/c++/13/bits/allocator.h \
/usr/include/c++/13/bits/atomic_base.h \
/usr/include/c++/13/bits/atomic_lockfree_defines.h \
/usr/include/c++/13/bits/basic_ios.h \
/usr/include/c++/13/bits/basic_ios.tcc \
/usr/include/c++/13/bits/basic_string.h \
/usr/include/c++/13/bits/basic_string.tcc \
/usr/include/c++/13/bits/char_traits.h \
/usr/include/c++/13/bits/charconv.h \
/usr/include/c++/13/bits/concept_check.h \
/usr/include/c++/13/bits/cpp_type_traits.h \
/usr/include/c++/13/bits/cxxabi_forced.h \
/usr/include/c++/13/bits/cxxabi_init_exception.h \
/usr/include/c++/13/bits/exception.h \
/usr/include/c++/13/bits/exception_defines.h \
/usr/include/c++/13/bits/exception_ptr.h \
/usr/include/c++/13/bits/functexcept.h \
/usr/include/c++/13/bits/functional_hash.h \
/usr/include/c++/13/bits/hash_bytes.h \
/usr/include/c++/13/bits/locale_classes.h \
/usr/include/c++/13/bits/locale_classes.tcc \
/usr/include/c++/13/bits/locale_facets.h \
/usr/include/c++/13/bits/locale_facets.tcc \
/usr/include/c++/13/bits/localefwd.h \
/usr/include/c++/13/bits/memory_resource.h \
/usr/include/c++/13/bits/memoryfwd.h \
/usr/include/c++/13/bits/move.h \
/usr/include/c++/13/bits/nested_exception.h \
/usr/include/c++/13/bits/new_allocator.h \
/usr/include/c++/13/bits/ostream.tcc \
/usr/include/c++/13/bits/ostream_insert.h \
/usr/include/c++/13/bits/postypes.h \
/usr/include/c++/13/bits/predefined_ops.h \
/usr/include/c++/13/bits/ptr_traits.h \
/usr/include/c++/13/bits/range_access.h \
/usr/include/c++/13/bits/refwrap.h \
/usr/include/c++/13/bits/requires_hosted.h \
/usr/include/c++/13/bits/shared_ptr.h \
/usr/include/c++/13/bits/shared_ptr_atomic.h \
/usr/include/c++/13/bits/shared_ptr_base.h \
/usr/include/c++/13/bits/specfun.h \
/usr/include/c++/13/bits/std_abs.h \
/usr/include/c++/13/bits/stl_algobase.h \
/usr/include/c++/13/bits/stl_bvector.h \
/usr/include/c++/13/bits/stl_construct.h \
/usr/include/c++/13/bits/stl_function.h \
/usr/include/c++/13/bits/stl_heap.h \
/usr/include/c++/13/bits/stl_iterator.h \
/usr/include/c++/13/bits/stl_iterator_base_funcs.h \
/usr/include/c++/13/bits/stl_iterator_base_types.h \
/usr/include/c++/13/bits/stl_pair.h \
/usr/include/c++/13/bits/stl_raw_storage_iter.h \
/usr/include/c++/13/bits/stl_vector.h \
/usr/include/c++/13/bits/stream_iterator.h \
/usr/include/c++/13/bits/streambuf.tcc \
/usr/include/c++/13/bits/streambuf_iterator.h \
/usr/include/c++/13/bits/string_view.tcc \
/usr/include/c++/13/bits/uniform_int_dist.h \
/usr/include/c++/13/bits/uses_allocator.h \
/usr/include/c++/13/bits/uses_allocator_args.h \
/usr/include/c++/13/bits/vector.tcc \
/usr/include/c++/13/cctype \
/usr/include/c++/13/clocale \
/usr/include/c++/13/compare \
/usr/include/c++/13/csetjmp \
/usr/include/c++/13/cstdint \
/usr/include/c++/13/cstdio \
/usr/include/c++/13/cstring \
/usr/include/c++/13/debug/assertions.h \
/usr/include/c++/13/ext/aligned_buffer.h \
/usr/include/c++/13/ext/alloc_traits.h \
/usr/include/c++/13/ext/atomicity.h \
/usr/include/c++/13/ext/concurrence.h \
/usr/include/c++/13/ext/numeric_traits.h \
/usr/include/c++/13/ext/string_conversions.h \
/usr/include/c++/13/ext/type_traits.h \
/usr/include/c++/13/initializer_list \
/usr/include/c++/13/limits \
/usr/include/c++/13/math.h \
/usr/include/c++/13/memory \
/usr/include/c++/13/ostream \
/usr/include/c++/13/pstl/execution_defs.h \
/usr/include/c++/13/pstl/glue_algorithm_defs.h \
/usr/include/c++/13/pstl/glue_memory_defs.h \
/usr/include/c++/13/pstl/pstl_config.h \
/usr/include/c++/13/streambuf \
/usr/include/c++/13/string \
/usr/include/c++/13/system_error \
/usr/include/c++/13/tr1/bessel_function.tcc \
/usr/include/c++/13/tr1/beta_function.tcc \
/usr/include/c++/13/tr1/ell_integral.tcc \
/usr/include/c++/13/tr1/exp_integral.tcc \
/usr/include/c++/13/tr1/hypergeometric.tcc \
/usr/include/c++/13/tr1/legendre_function.tcc \
/usr/include/c++/13/tr1/modified_bessel_func.tcc \
/usr/include/c++/13/tr1/poly_hermite.tcc \
/usr/include/c++/13/tr1/poly_laguerre.tcc \
/usr/include/c++/13/tr1/riemann_zeta.tcc \
/usr/include/c++/13/tr1/special_function_util.h \
/usr/include/c++/13/utility \
/usr/include/c++/13/vector \
/usr/include/errno.h \
/usr/include/features-time64.h \
/usr/include/inttypes.h \
/usr/include/limits.h \
/usr/include/linux/errno.h \
/usr/include/linux/limits.h \
/usr/include/pthread.h \
/usr/include/wchar.h \
/usr/include/wctype.h \
/usr/include/x86_64-linux-gnu/bits/atomic_wide_counter.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h \
/usr/include/x86_64-linux-gnu/bits/cpu-set.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/endianness.h \
/usr/include/x86_64-linux-gnu/bits/floatn-common.h \
/usr/include/x86_64-linux-gnu/bits/floatn.h \
/usr/include/x86_64-linux-gnu/bits/flt-eval-method.h \
/usr/include/x86_64-linux-gnu/bits/fp-fast.h \
/usr/include/x86_64-linux-gnu/bits/fp-logb.h \
/usr/include/x86_64-linux-gnu/bits/iscanonical.h \
/usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
/usr/include/x86_64-linux-gnu/bits/libm-simd-decl-stubs.h \
/usr/include/x86_64-linux-gnu/bits/local_lim.h \
/usr/include/x86_64-linux-gnu/bits/locale.h \
/usr/include/x86_64-linux-gnu/bits/long-double.h \
/usr/include/x86_64-linux-gnu/bits/math-vector.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-helper-functions.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-narrow.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls.h \
/usr/include/x86_64-linux-gnu/bits/posix2_lim.h \
/usr/include/x86_64-linux-gnu/bits/pthread_stack_min-dynamic.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes-arch.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h \
/usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
/usr/include/x86_64-linux-gnu/bits/stdint-least.h \
/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/stdlib-float.h \
/usr/include/x86_64-linux-gnu/bits/struct_mutex.h \
/usr/include/x86_64-linux-gnu/bits/struct_rwlock.h \
/usr/include/x86_64-linux-gnu/bits/thread-shared-types.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/time64.h \
/usr/include/x86_64-linux-gnu/bits/timesize.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/types/FILE.h \
/usr/include/x86_64-linux-gnu/bits/types/__FILE.h \
/usr/include/x86_64-linux-gnu/bits/types/__fpos64_t.h \
/usr/include/x86_64-linux-gnu/bits/types/__fpos_t.h \
/usr/include/x86_64-linux-gnu/bits/types/__locale_t.h \
/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h \
/usr/include/x86_64-linux-gnu/bits/types/__sigset_t.h \
/usr/include/x86_64-linux-gnu/bits/types/clock_t.h \
/usr/include/x86_64-linux-gnu/bits/types/clockid_t.h \
/usr/include/x86_64-linux-gnu/bits/types/cookie_io_functions_t.h \
/usr/include/x86_64-linux-gnu/bits/types/error_t.h \
/usr/include/x86_64-linux-gnu/bits/types/locale_t.h \
/usr/include/x86_64-linux-gnu/bits/types/mbstate_t.h \
/usr/include/x86_64-linux-gnu/bits/types/sigset_t.h \
/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h \
/usr/include/x86_64-linux-gnu/bits/types/struct___jmp_buf_tag.h \
/usr/include/x86_64-linux-gnu/bits/types/struct_itimerspec.h \
/usr/include/x86_64-linux-gnu/bits/types/struct_sched_param.h \
/usr/include/x86_64-linux-gnu/bits/types/struct_timespec.h \
/usr/include/x86_64-linux-gnu/bits/types/struct_timeval.h \
/usr/include/x86_64-linux-gnu/bits/types/struct_tm.h \
/usr/include/x86_64-linux-gnu/bits/types/time_t.h \
/usr/include/x86_64-linux-gnu/bits/types/timer_t.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h \
/usr/include/x86_64-linux-gnu/bits/uintn-identity.h \
/usr/include/x86_64-linux-gnu/bits/uio_lim.h \
/usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h \
/usr/include/x86_64-linux-gnu/bits/wchar.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
/usr/include/x86_64-linux-gnu/bits/xopen_lim.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/atomic_word.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/c++allocator.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/c++config.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/c++locale.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/cpu_defines.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/ctype_base.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/ctype_inline.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/error_constants.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/gthr-default.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/gthr.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/os_defines.h \
/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
/usr/include/x86_64-linux-gnu/gnu/stubs.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/sys/single_threaded.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/lib/gcc/x86_64-linux-gnu/13/include/limits.h \
/usr/lib/gcc/x86_64-linux-gnu/13/include/stdarg.h \
/usr/lib/gcc/x86_64-linux-gnu/13/include/stdbool.h \
/usr/lib/gcc/x86_64-linux-gnu/13/include/stddef.h \
/usr/lib/gcc/x86_64-linux-gnu/13/include/stdint.h \
/usr/lib/gcc/x86_64-linux-gnu/13/include/syslimits.h \
vendor/cigraph/include/igraph_decls.h \
vendor/cigraph/include/igraph_types.h \
vendor/igraph_config.h \
Loading