From dcfb64cef74cc1f86301b26c4ce6f2c93202601b Mon Sep 17 00:00:00 2001 From: Fernando Zhapa-Camacho Date: Tue, 19 Nov 2024 22:10:04 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Issue=20#37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/source/conf.py | 4 ++-- docs/source/index.rst | 2 +- mowl/projection/edge.py | 11 +++++++---- setup.py | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 3be42f53..0a9e56e3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -22,8 +22,8 @@ copyright = '2023, Bio-Ontology Research Group' author = 'BORG' -release = '1.0.1' -version = '1.0.1' +release = '1.0.2-dev' +version = '1.0.2-dev' # -- General configuration extensions = [ diff --git a/docs/source/index.rst b/docs/source/index.rst index a0de0320..946bc7a6 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -27,7 +27,7 @@ Getting started **mOWL** can be installed from `source code `_ or from `PyPi `_. For more details on installation check out the how to :doc:`install/index` section of the project. .. note:: - This version of documentation corresponds to mOWL-1.0.1. + This version of documentation corresponds to mOWL-1.0.2-dev. mOWL, JPype and the JVM diff --git a/mowl/projection/edge.py b/mowl/projection/edge.py index 3161bcc2..429933c8 100644 --- a/mowl/projection/edge.py +++ b/mowl/projection/edge.py @@ -69,6 +69,7 @@ def getEntitiesAndRelations(edges): return Edge.get_entities_and_relations(edges) @staticmethod + @versionchanged(version="1.0.2", reason="Method return type changed to tuple of lists") def get_entities_and_relations(edges): ''' :param edges: list of edges @@ -76,7 +77,7 @@ def get_entities_and_relations(edges): :returns: Returns a 2-tuple containing the list of entities (heads and tails) and the \ list of relations - :rtype: (Set of str, Set of str) + :rtype: (list of str, list of str) ''' entities = set() @@ -86,6 +87,9 @@ def get_entities_and_relations(edges): entities |= {edge.src, edge.dst} relations |= {edge.rel} + entities = sorted(list(entities)) + relations = sorted(list(relations)) + return (entities, relations) @staticmethod @@ -109,12 +113,11 @@ def as_pykeen(edges, create_inverse_triples=True, entity_to_id=None, relation_to """ if entity_to_id is None or relation_to_id is None: classes, relations = Edge.getEntitiesAndRelations(edges) - classes, relations = set(classes), set(relations) if entity_to_id is None: - entity_to_id = {v: k for k, v in enumerate(list(classes))} + entity_to_id = {v: k for k, v in enumerate(classes)} if relation_to_id is None: - relation_to_id = {v: k for k, v in enumerate(list(relations))} + relation_to_id = {v: k for k, v in enumerate(relations)} def map_edge(edge): return [entity_to_id[edge.src], relation_to_id[edge.rel], entity_to_id[edge.dst]] diff --git a/setup.py b/setup.py index c18e34c4..c86b9cb1 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setuptools.setup( name="mowl-borg", - version="1.0.2-dev.1", + version="1.0.2-dev.2", author="Bio-Ontology Research Group", author_email="fernando.zhapacamacho@kaust.edu.sa", description="mOWL: A machine learning library with ontologies",