| @@ -1,6 +1,6 @@ | |||||
| language: python | language: python | ||||
| python: | python: | ||||
| - '3.6.5' | |||||
| - '3.6.9' | |||||
| - '3.5' | - '3.5' | ||||
| - '3.6' | - '3.6' | ||||
| - '3.7' | - '3.7' | ||||
| @@ -4,7 +4,7 @@ | |||||
| [](https://graphkit-learn.readthedocs.io/en/master/?badge=master) | [](https://graphkit-learn.readthedocs.io/en/master/?badge=master) | ||||
| [](https://badge.fury.io/py/graphkit-learn) | [](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 | ## Requirements | ||||
| @@ -634,7 +634,7 @@ def paths2labelseqs(plist, G, ds_attrs, node_label, edge_label): | |||||
| tuple( | tuple( | ||||
| list( | list( | ||||
| chain.from_iterable( | chain.from_iterable( | ||||
| (G.node[node][node_label], | |||||
| (G.nodes[node][node_label], | |||||
| G[node][path[idx + 1]][edge_label]) | G[node][path[idx + 1]][edge_label]) | ||||
| for idx, node in enumerate(path[:-1]))) + | for idx, node in enumerate(path[:-1]))) + | ||||
| [G.nodes[path[-1]][node_label]]) for path in plist | [G.nodes[path[-1]][node_label]]) for path in plist | ||||
| @@ -407,7 +407,19 @@ class Dataset(object): | |||||
| self.__targets = [self.__targets[i] for i in range_] | self.__targets = [self.__targets[i] for i in range_] | ||||
| # @todo | # @todo | ||||
| # self.set_labels_attrs() | # 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): | def __get_dataset_size(self): | ||||
| return len(self.__graphs) | return len(self.__graphs) | ||||
| @@ -134,7 +134,7 @@ def untotterTransformation(G, node_label, edge_label): | |||||
| gt.add_nodes_from(G.nodes(data=True)) | gt.add_nodes_from(G.nodes(data=True)) | ||||
| for edge in G.edges(): | for edge in G.edges(): | ||||
| gt.add_node(edge) | 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.add_edge(edge[0], edge) | ||||
| gt.edges[edge[0], edge].update({ | gt.edges[edge[0], edge].update({ | ||||
| edge_label: | edge_label: | ||||