Cambios realizados desde ISIS1225-Lib

DISClib/ADT/config.py

@@ -1,5 +1,5 @@
 import os
 import sys
-file_path = os.path.join(os.path.dirname(__file__), '../..')
+file_path = os.path.join(os.path.dirname(__file__), '..', '..')
 file_dir = os.path.dirname(os.path.realpath('__file__'))
 sys.path.insert(0, os.path.abspath(file_path))

DISClib/ADT/graph.py

@@ -25,7 +25,7 @@
  """
 
 import config
-from DISClib.DataStructures import graphstructure as gr
+import importlib
 assert config
 
 """
@@ -51,7 +51,8 @@ def newGraph(datastructure="ADJ_LIST",
     Raises:
         Exception
     """
-    return gr.newGraph(datastructure, directed, size, comparefunction)
+    gr = graphSelector(datastructure)
+    return gr.newGraph(size, comparefunction,  directed, datastructure, gr)
 
 
 def insertVertex(graph, vertex):
@@ -66,7 +67,7 @@ def insertVertex(graph, vertex):
     Raises:
         Exception
     """
-    return gr.insertVertex(graph, vertex)
+    return graph['datastructure'].insertVertex(graph, vertex)
 
 
 def removeVertex(graph, vertex):
@@ -81,7 +82,7 @@ def removeVertex(graph, vertex):
     Raises:
         Exception
     """
-    return gr.removeVertex(graph, vertex)
+    return graph['datastructure'].removeVertex(graph, vertex)
 
 
 def numVertices(graph):
@@ -96,7 +97,7 @@ def numVertices(graph):
     Raises:
         Exception
     """
-    return gr.numVertices(graph)
+    return graph['datastructure'].numVertices(graph)
 
 
 def numEdges(graph):
@@ -111,7 +112,7 @@ def numEdges(graph):
     Raises:
         Exception
     """
-    return gr.numEdges(graph)
+    return graph['datastructure'].numEdges(graph)
 
 
 def vertices(graph):
@@ -125,7 +126,7 @@ def vertices(graph):
     Raises:
         Exception
     """
-    return gr.vertices(graph)
+    return graph['datastructure'].vertices(graph)
 
 
 def edges(graph):
@@ -140,7 +141,7 @@ def edges(graph):
     Raises:
         Exception
     """
-    return gr.edges(graph)
+    return graph['datastructure'].edges(graph)
 
 
 def degree(graph, vertex):
@@ -156,7 +157,7 @@ def degree(graph, vertex):
     Raises:
         Exception
     """
-    return gr.degree(graph, vertex)
+    return graph['datastructure'].degree(graph, vertex)
 
 
 def outdegree(graph, vertex):
@@ -172,7 +173,7 @@ def outdegree(graph, vertex):
     Raises:
         Exception
     """
-    return gr.outdegree(graph, vertex)
+    return graph['datastructure'].outdegree(graph, vertex)
 
 
 def indegree(graph, vertex):
@@ -188,7 +189,7 @@ def indegree(graph, vertex):
     Raises:
         Exception
     """
-    return gr.indegree(graph, vertex)
+    return graph['datastructure'].indegree(graph, vertex)
 
 
 def getEdge(graph, vertexa, vertexb):
@@ -205,7 +206,7 @@ def getEdge(graph, vertexa, vertexb):
     Raises:
         Exception
     """
-    return gr.getEdge(graph, vertexa, vertexb)
+    return graph['datastructure'].getEdge(graph, vertexa, vertexb)
 
 
 def addEdge(graph, vertexa, vertexb, weight=0):
@@ -226,7 +227,7 @@ def addEdge(graph, vertexa, vertexb, weight=0):
     Raises:
         Exception
     """
-    return gr.addEdge(graph, vertexa, vertexb, weight)
+    return graph['datastructure'].addEdge(graph, vertexa, vertexb, weight)
 
 
 def containsVertex(graph, vertex):
@@ -242,7 +243,7 @@ def containsVertex(graph, vertex):
     Raises:
         Exception
     """
-    return gr.containsVertex(graph, vertex)
+    return graph['datastructure'].containsVertex(graph, vertex)
 
 
 def adjacents(graph, vertex):
@@ -258,7 +259,7 @@ def adjacents(graph, vertex):
     Raises:
         Exception
     """
-    return gr.adjacents(graph, vertex)
+    return graph['datastructure'].adjacents(graph, vertex)
 
 
 def adjacentEdges(graph, vertex):
@@ -275,4 +276,24 @@ def adjacentEdges(graph, vertex):
     Raises:
         Exception
     """
-    return gr.adjacentEdges(graph, vertex)
+    return graph['datastructure'].adjacentEdges(graph, vertex)
+
+
+"""
+Selector dinamico de la estructua de datos solicitada
+"""
+
+switch_module = {
+    "ADJ_LIST": ".adjlist",
+    "ADJ_MTX": ".adjlist",
+}
+
+
+def graphSelector(datastructure):
+    """
+    Carga dinamicamente el import de la estructura de datos
+    seleccionada
+    """
+    ds = switch_module.get(datastructure)
+    module = importlib.import_module(ds, package="DISClib.DataStructures")
+    return module

DISClib/ADT/list.py

@@ -25,8 +25,8 @@
  """
 
 import config
+import importlib
 from DISClib.Utils import error as error
-from DISClib.DataStructures import liststructure as lt
 assert config
 
 
@@ -46,7 +46,8 @@ def newList(datastructure='SINGLE_LINKED',
 
     Args:
         datastructure:  Tipo de estructura de datos a utilizar para implementar
-        la lista. Los tipos posibles pueden ser: ARRAY_LIST y SINGLE_LINKED.
+        la lista. Los tipos posibles pueden ser: ARRAY_LIST,
+        SINGLE_LINKED y DOUBLE_LINKED.
 
         cmpfunction: Función de comparación para los elementos de la lista.
         Si no se provee función de comparación se utiliza la función
@@ -69,7 +70,14 @@ def newList(datastructure='SINGLE_LINKED',
         Exception
     """
     try:
-        lst = lt.newList(datastructure, cmpfunction, key, filename, delimiter)
+        module = listSelector(datastructure)
+        lst = module.newList(
+            cmpfunction,
+            module,
+            key,
+            filename,
+            delimiter
+        )
         return lst
     except Exception as exp:
         error.reraise(exp, 'TADList->newList: ')
@@ -93,7 +101,7 @@ def addFirst(lst, element):
         Exception
     """
     try:
-        lt.addFirst(lst, element)
+        lst['datastructure'].addFirst(lst, element)
     except Exception as exp:
         error.reraise(exp, 'TADList->addFirst: ')
 
@@ -112,7 +120,7 @@ def addLast(lst, element):
         Exception
     """
     try:
-        lt.addLast(lst, element)
+        lst['datastructure'].addLast(lst, element)
     except Exception as exp:
         error.reraise(exp, 'TADList->addLast: ')
 
@@ -127,7 +135,7 @@ def isEmpty(lst):
         Exception
     """
     try:
-        return lt.isEmpty(lst)
+        return lst['datastructure'].isEmpty(lst)
     except Exception as exp:
         error.reraise(exp, 'TADList->isEmpty: ')
 
@@ -142,7 +150,7 @@ def size(lst):
         Exception
     """
     try:
-        return lt.size(lst)
+        return lst['datastructure'].size(lst)
     except Exception as exp:
         error.reraise(exp, 'TADList->size: ')
 
@@ -158,7 +166,7 @@ def firstElement(lst):
         Exception
     """
     try:
-        return lt.firstElement(lst)
+        return lst['datastructure'].firstElement(lst)
     except Exception as exp:
         error.reraise(exp, 'TADList->firstElement: ')
 
@@ -174,7 +182,7 @@ def lastElement(lst):
         Exception
     """
     try:
-        return lt.lastElement(lst)
+        return lst['datastructure'].lastElement(lst)
     except Exception as exp:
         error.reraise(exp, 'TADList->LastElement: ')
 
@@ -195,7 +203,7 @@ def getElement(lst, pos):
         Exception
     """
     try:
-        return lt.getElement(lst, pos)
+        return lst['datastructure'].getElement(lst, pos)
     except Exception as exp:
         error.reraise(exp, 'List->getElement: ')
 
@@ -216,7 +224,7 @@ def deleteElement(lst, pos):
         Exception
     """
     try:
-        lt.deleteElement(lst, pos)
+        lst['datastructure'].deleteElement(lst, pos)
     except Exception as exp:
         error.reraise(exp, 'TADList->deleteElement: ')
 
@@ -237,7 +245,7 @@ def removeFirst(lst):
         Exception
     """
     try:
-        return lt.removeFirst(lst)
+        return lst['datastructure'].removeFirst(lst)
     except Exception as exp:
         error.reraise(exp, 'TADList->removeFirst: ')
 
@@ -258,7 +266,7 @@ def removeLast(lst):
         Exception
     """
     try:
-        return lt.removeLast(lst)
+        return lst['datastructure'].removeLast(lst)
     except Exception as exp:
         error.reraise(exp, 'TADList->removeLast: ')
 
@@ -280,7 +288,7 @@ def insertElement(lst, element, pos):
         Exception
     """
     try:
-        lt.insertElement(lst, element, pos)
+        lst['datastructure'].insertElement(lst, element, pos)
     except Exception as exp:
         error.reraise(exp, 'TADList->insertElement: ')
 
@@ -302,7 +310,7 @@ def isPresent(lst, element):
         Exception
     """
     try:
-        return lt.isPresent(lst, element)
+        return lst['datastructure'].isPresent(lst, element)
     except Exception as exp:
         error.reraise(exp, 'TADList->isPresent: ')
 
@@ -319,7 +327,7 @@ def exchange(lst, pos1, pos2):
         Exception
     """
     try:
-        lt.exchange(lst, pos1, pos2)
+        lst['datastructure'].exchange(lst, pos1, pos2)
     except Exception as exp:
         error.reraise(exp, 'List->exchange: ')
 
@@ -338,7 +346,7 @@ def changeInfo(lst, pos, element):
         Exception
     """
     try:
-        lt.changeInfo(lst, pos, element)
+        lst['datastructure'].changeInfo(lst, pos, element)
     except Exception as exp:
         error.reraise(exp, 'List->changeInfo: ')
 
@@ -359,7 +367,7 @@ def subList(lst, pos, numelem):
         Exception
     """
     try:
-        return lt.subList(lst, pos, numelem)
+        return lst['datastructure'].subList(lst, pos, numelem)
     except Exception as exp:
         error.reraise(exp, 'List->subList: ')
 
@@ -373,6 +381,27 @@ def iterator(lst):
         Exception
     """
     try:
-        return lt.iterator(lst)
+        return lst['datastructure'].iterator(lst)
     except Exception as exp:
         error.reraise(exp, 'List->Iterator: ')
+
+
+"""
+Selector dinamico de la estructua de datos solicitada
+"""
+
+switch_module = {
+    "ARRAY_LIST": ".arraylist",
+    "SINGLE_LINKED": ".singlelinkedlist",
+    "DOUBLE_LINKED": ".doublelinkedlist"
+}
+
+
+def listSelector(datastructure):
+    """
+    Carga dinamicamente el import de la estructura de datos
+    seleccionada
+    """
+    ds = switch_module.get(datastructure)
+    module = importlib.import_module(ds, package="DISClib.DataStructures")
+    return module