Skip to content

Commit

Permalink
rename dw to kernel_degree
Browse files Browse the repository at this point in the history
  • Loading branch information
scottgigante committed Jan 9, 2020
1 parent c73bcad commit 6be99e3
Showing 1 changed file with 7 additions and 21 deletions.
28 changes: 7 additions & 21 deletions graphtools/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -659,22 +659,22 @@ def P(self):
return self._diff_op

@property
def dw(self):
def kernel_degree(self):
"""Weighted degree vector (cached)
Return or calculate the degree vector
Return or calculate the degree vector from the affinity matrix
Returns
-------
dw : array-like, shape=[n_samples]
degrees : array-like, shape=[n_samples]
Row sums of graph kernel
"""
try:
return self._dw
return self._kernel_degree
except AttributeError:
self._dw = utils.to_array(self.kernel.sum(axis=1))
return self._dw
self._kernel_degree = utils.to_array(self.kernel.sum(axis=1))
return self._kernel_degree

@property
def diff_aff(self):
Expand All @@ -693,7 +693,7 @@ def diff_aff(self):
symmetric diffusion affinity matrix defined as a
doubly-stochastic form of the kernel matrix
"""
row_degrees = self.dw
row_degrees = self.kernel_degree
if sparse.issparse(self.kernel):
# diagonal matrix
degrees = sparse.csr_matrix(
Expand Down Expand Up @@ -958,20 +958,6 @@ def K():
"""
raise NotImplementedError

@property
def dw(self):
"""Weighted degree vector (cached)
Return or calculate the degree vector
Returns
-------
dw : array-like, shape=[n_samples]
Row sums of graph kernel
"""
return pygsp.graphs.Graph.dw(self)

def _build_weight_from_kernel(self, kernel):
"""Private method to build an adjacency matrix from
a kernel matrix
Expand Down

0 comments on commit 6be99e3

Please sign in to comment.