Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
graph-tool
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
40
Issues
40
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tiago Peixoto
graph-tool
Commits
bfba6608
Commit
bfba6608
authored
Jun 04, 2019
by
Tiago Peixoto
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scalar_assortativity(): Raise exception for non-scalar properties
parent
b22e65f8
Pipeline
#476
failed with stage
in 504 minutes and 22 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
src/graph_tool/correlations/__init__.py
src/graph_tool/correlations/__init__.py
+3
-1
No files found.
src/graph_tool/correlations/__init__.py
View file @
bfba6608
...
...
@@ -44,7 +44,7 @@ from __future__ import division, absolute_import, print_function
from
..
dl_import
import
dl_import
dl_import
(
"from . import libgraph_tool_correlations"
)
from
..
import
_degree
,
_prop
from
..
import
_degree
,
_prop
,
_check_prop_scalar
,
VertexPropertyMap
from
numpy
import
*
__all__
=
[
"assortativity"
,
"scalar_assortativity"
,
"corr_hist"
,
...
...
@@ -182,6 +182,8 @@ def scalar_assortativity(g, deg, eweight=None):
Phys. Rev. E 67, 026126 (2003), :doi:`10.1103/PhysRevE.67.026126`
.. _jackknife method: http://en.wikipedia.org/wiki/Resampling_%28statistics%29#Jackknife
"""
if
isinstance
(
deg
,
VertexPropertyMap
):
_check_prop_scalar
(
deg
,
name
=
"deg"
)
return
libgraph_tool_correlations
.
\
scalar_assortativity_coefficient
(
g
.
_Graph__graph
,
_degree
(
g
,
deg
),
_prop
(
"e"
,
g
,
eweight
))
...
...
Tiago Peixoto
@count0
mentioned in issue
#583 (closed)
·
Jun 04, 2019
mentioned in issue
#583 (closed)
mentioned in issue #583
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment