Browse Source

add trim_dataset() method to class Dataset.

v0.2.x
jajupmochi 5 years ago
parent
commit
9fc8fbfeb9
5 changed files with 17 additions and 5 deletions
  1. +1
    -1
      .travis.yml
  2. +1
    -1
      README.md
  3. +1
    -1
      gklearn/kernels/untilHPathKernel.py
  4. +13
    -1
      gklearn/utils/dataset.py
  5. +1
    -1
      gklearn/utils/utils.py

+ 1
- 1
.travis.yml View File

@@ -1,6 +1,6 @@
language: python
python:
- '3.6.5'
- '3.6.9'
- '3.5'
- '3.6'
- '3.7'


+ 1
- 1
README.md View File

@@ -4,7 +4,7 @@
[![Documentation Status](https://readthedocs.org/projects/graphkit-learn/badge/?version=master)](https://graphkit-learn.readthedocs.io/en/master/?badge=master)
[![PyPI version](https://badge.fury.io/py/graphkit-learn.svg)](https://badge.fury.io/py/graphkit-learn)

A python package for graph kernels, graph edit distances and graph pre-image problem.
A Python package for graph kernels, graph edit distances and graph pre-image problem.

## Requirements



+ 1
- 1
gklearn/kernels/untilHPathKernel.py View File

@@ -634,7 +634,7 @@ def paths2labelseqs(plist, G, ds_attrs, node_label, edge_label):
tuple(
list(
chain.from_iterable(
(G.node[node][node_label],
(G.nodes[node][node_label],
G[node][path[idx + 1]][edge_label])
for idx, node in enumerate(path[:-1]))) +
[G.nodes[path[-1]][node_label]]) for path in plist


+ 13
- 1
gklearn/utils/dataset.py View File

@@ -407,7 +407,19 @@ class Dataset(object):
self.__targets = [self.__targets[i] for i in range_]
# @todo
# self.set_labels_attrs()


def trim_dataset(self, edge_required=False):
if edge_required:
trimed_pairs = [(idx, g) for idx, g in enumerate(self.__graphs) if (nx.number_of_nodes(g) != 0 and nx.number_of_edges(g) != 0)]
else:
trimed_pairs = [(idx, g) for idx, g in enumerate(self.__graphs) if nx.number_of_nodes(g) != 0]
idx = [p[0] for p in trimed_pairs]
self.__graphs = [p[1] for p in trimed_pairs]
self.__targets = [self.__targets[i] for i in idx]
# @todo
# self.set_labels_attrs()
def __get_dataset_size(self):
return len(self.__graphs)


+ 1
- 1
gklearn/utils/utils.py View File

@@ -134,7 +134,7 @@ def untotterTransformation(G, node_label, edge_label):
gt.add_nodes_from(G.nodes(data=True))
for edge in G.edges():
gt.add_node(edge)
gt.nodes[edge].update({node_label: G.node[edge[1]][node_label]})
gt.nodes[edge].update({node_label: G.nodes[edge[1]][node_label]})
gt.add_edge(edge[0], edge)
gt.edges[edge[0], edge].update({
edge_label:


Loading…
Cancel
Save