Changeset eb2904 in git

Timestamp:

Jul 29, 2019, 2:57:21 PM (4 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

9f0f63787f503527775273cff2d354bd558c9cda

Parents:

91d4aef86185a730eb9b18bef092b9b2a784f0fa

Message:

Cleanup

Location:

machine_learning/common

Files:

• keyword_vector.py (modified) (3 diffs)
• lookuptable.py (modified) (1 diff)

machine_learning/common/keyword_vector.py

@@ -37 +37 @@
     if not os.path.isfile(filename):
         print("Please provide a valid input file as argument")
-        return {}
+        return []
     if dictionary == []:
         print("Please provide a valid dictionary as argument")
-        return {}
+        return []
     if dictionary is None:
         print("Please provide a valid dictionary as argument")
-        return {}
+        return []
     vector = create_vector_dictionary(dictionary)
     with open(filename, "r+") as file:
@@ -85 +85 @@
     Create a zero vector for a given dictionary
     """
+    assert not dictionary == None, "Please give a dictionary"
+    assert not len(dictionary) == 0, "Please give a dictionary"
     vector = {}
     for word in dictionary:
@@ -99 +101 @@
         return -1
 
-    diff_vec = vec1 - vec2
-    dist = np.linalg.norm(diff_vec)
+    dist = np.linalg.norm(vec1 - vec2)
 
     return dist

machine_learning/common/lookuptable.py

@@ -95 +95 @@
     test_vec = count_occurances(os.path.join(HELP_FILE_PATH, "html",
                                              files[1]), dictionary)
-    print(test_vec == vectors[1])
+    print((test_vec == vectors[1]).all())