Nuevo iterador y carga de archivo

.vim/coc-settings.json

@@ -0,0 +1,6 @@
+{
+  "python.linting.pylintEnabled": false,
+  "python.linting.flake8Enabled": true,
+  "python.linting.enabled": true,
+  "python.venvPath":"/Users/dcorreal/Documents/Develop/Python/Envs/"
+}

DISClib/ADT/list.py

@@ -37,7 +37,10 @@
 """
 
 
-def newList(datastructure='SINGLE_LINKED', cmpfunction=None):
+def newList(datastructure='SINGLE_LINKED',
+            cmpfunction=None,
+            key=None,
+            filename=None):
     """Crea una lista vacia
 
     Args:
@@ -48,7 +51,7 @@ def newList(datastructure='SINGLE_LINKED', cmpfunction=None):
         Exception
     """
     try:
-        lst = lt.newList(datastructure, cmpfunction)
+        lst = lt.newList(datastructure, cmpfunction, key, filename)
         return lst
     except Exception as exp:
         error.reraise(exp, 'TADList->newList: ')
@@ -341,3 +344,17 @@ def subList(lst, pos, numelem):
         return lt.subList(lst, pos, numelem)
     except Exception as exp:
         error.reraise(exp, 'List->subList: ')
+
+
+def iterator(lst):
+    """ Retorna un iterador para la lista.
+    Args:
+        lst: La lista a iterar
+
+    Raises:
+        Exception
+    """
+    try:
+        return lt.iterator(lst)
+    except Exception as exp:
+        error.reraise(exp, 'List->Iterator: ')

DISClib/DataStructures/arraylist.py

@@ -27,6 +27,7 @@
 
 import config
 from DISClib.Utils import error as error
+import csv
 assert config
 
 """
@@ -40,7 +41,7 @@
 """
 
 
-def newList(cmpfunction=None):
+def newList(cmpfunction, key, filename):
     """Crea una lista vacia.
 
     Args:
@@ -51,12 +52,24 @@ def newList(cmpfunction=None):
     Raises:
 
     """
-    new_list = {'elements': [],
-                'size': 0,
-                'type': 'ARRAY_LIST',
-                'cmpfunction': cmpfunction
-                }
-    return (new_list)
+    newlist = {'elements': [],
+               'size': 0,
+               'type': 'ARRAY_LIST',
+               'cmpfunction': cmpfunction,
+               'key': key
+               }
+
+    if(cmpfunction is None):
+        newlist['cmpfunction'] = defaultfunction
+    else:
+        newlist['cmpfunction'] = cmpfunction
+
+    if (filename is not None):
+        input_file = csv.DictReader(open(filename, encoding="utf8"),
+                                    delimiter=',')
+        for line in input_file:
+            addLast(newlist, line)
+    return (newlist)
 
 
 def addFirst(lst, element):
@@ -273,7 +286,7 @@ def insertElement(lst, element, pos):
         error.reraise(exp, 'arraylist->insertElement: ')
 
 
-def isPresent(lst, element):
+def isPresent(lst, e):
     """ Informa si el elemento element esta presente en la lista.
 
     Informa si un elemento está en la lista.
@@ -295,7 +308,7 @@ def isPresent(lst, element):
             keyexist = False
             for keypos in range(1, size+1):
                 info = lst['elements'][keypos-1]
-                if (lst['cmpfunction'](element, info) == 0):
+                if (lst['cmpfunction'](e[lst['key']], info[lst['key']]) == 0):
                     keyexist = True
                     break
             if keyexist:
@@ -364,6 +377,7 @@ def subList(lst, pos, numelem):
         sublst = {'elements': [],
                   'size': 0,
                   'type': 'ARRAY_LIST',
+                  'key': lst['key'],
                   'cmpfunction': lst['cmpfunction']}
         elem = pos-1
         cont = 1
@@ -375,3 +389,27 @@ def subList(lst, pos, numelem):
         return sublst
     except Exception as exp:
         error.reraise(exp, 'arraylist->subList: ')
+
+
+def iterator(lst):
+    """ Retorna un iterador para la lista.
+    Args:
+        lst: La lista a iterar
+
+    Raises:
+        Exception
+    """
+    try:
+        if(lst is not None):
+            for pos in range(0, lst['size']):
+                yield lst['elements'][pos]
+    except Exception as exp:
+        error.reraise(exp, 'arraylist->Iterator')
+
+
+def defaultfunction(id1, id2):
+    if id1 > id2:
+        return 1
+    elif id1 < id2:
+        return -1
+    return 0

DISClib/DataStructures/liststructure.py

@@ -36,7 +36,7 @@
 """
 
 
-def newList(datastructure='SINGLE_LINKED', cmpfunction=None):
+def newList(datastructure, cmpfunction, key, filename):
     """Crea una lista vacia.
 
     Args:
@@ -48,9 +48,9 @@ def newList(datastructure='SINGLE_LINKED', cmpfunction=None):
     """
     try:
         if (datastructure == "ARRAY_LIST"):
-            lt = alt.newList(cmpfunction)
+            lt = alt.newList(cmpfunction, key, filename)
         else:
-            lt = slt.newList(cmpfunction)
+            lt = slt.newList(cmpfunction, key, filename)
         return lt
     except Exception as exp:
         error.reraise(exp, 'list->newList: ')
@@ -383,3 +383,20 @@ def subList(lst, pos, numelem):
             return slt.subList(lst, pos, numelem)
     except Exception as exp:
         error.reraise(exp, 'List->subList: ')
+
+
+def iterator(lst):
+    """ Retorna un iterador para la lista.
+    Args:
+        lst: La lista a iterar
+
+    Raises:
+        Exception
+    """
+    try:
+        if (lst['type'] == 'ARRAY_LIST'):
+            return alt.iterator(lst)
+        else:
+            return slt.iterator(lst)
+    except Exception as exp:
+        error.reraise(exp, 'List->Iterator: ')

DISClib/DataStructures/singlelinkedlist.py

@@ -26,6 +26,7 @@
 import config
 from DISClib.DataStructures import listnode as node
 from DISClib.Utils import error as error
+import csv
 assert config
 
 """
@@ -39,7 +40,7 @@
 """
 
 
-def newList(cmpfunction=None):
+def newList(cmpfunction, key, filename):
     """Crea una lista vacia.
 
     Se inicializan los apuntadores a la primera y ultima posicion en None.
@@ -53,12 +54,22 @@ def newList(cmpfunction=None):
     Raises:
 
     """
-    new_list = {'first': None,
-                'last': None,
-                'size': 0,
-                'type': 'SINGLE_LINKED',
-                'cmpfunction': cmpfunction}
-    return new_list
+    newlist = {'first': None,
+               'last': None,
+               'size': 0,
+               'key': key,
+               'type': 'SINGLE_LINKED'}
+
+    if(cmpfunction is None):
+        newlist['cmpfunction'] = defaultfunction
+    else:
+        newlist['cmpfunction'] = cmpfunction
+
+    if (filename is not None):
+        input_file = csv.DictReader(open(filename))
+        for line in input_file:
+            addLast(newlist, line)
+    return newlist
 
 
 def addFirst(lst, element):
@@ -356,7 +367,8 @@ def isPresent(lst, element):
             node = lst['first']
             keyexist = False
             for keypos in range(1, size+1):
-                if (lst['cmpfunction'](element, node['info']) == 0):
+                if (lst['cmpfunction'](element[lst['key']],
+                                       node['info'][lst['key']]) == 0):
                     keyexist = True
                     break
                 node = node['next']
@@ -433,6 +445,7 @@ def subList(lst, pos, numelem):
                   'last': None,
                   'size': 0,
                   'type': 'SINGLE_LINKED',
+                  'key': lst['key'],
                   'cmpfunction': lst['cmpfunction']}
         cont = 1
         loc = pos
@@ -444,3 +457,29 @@ def subList(lst, pos, numelem):
         return sublst
     except Exception as exp:
         error.reraise(exp, 'singlelinkedlist->subList: ')
+
+
+def iterator(lst):
+    """ Retorna un iterador para la lista.
+    Args:
+        lst: La lista a iterar
+
+    Raises:
+        Exception
+    """
+    try:
+        if(lst is not None):
+            current = lst['first']
+            while current is not None:
+                yield current['info']
+                current = current['next']
+    except Exception as exp:
+        error.reraise(exp, 'singlelinkedlist->Iterator')
+
+
+def defaultfunction(id1, id2):
+    if id1 > id2:
+        return 1
+    elif id1 < id2:
+        return -1
+    return 0

Test/list/config.py

@@ -1,5 +1,6 @@
 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))
+data_path = os.path.join(os.path.dirname(__file__), '../Data/')