Changeset 129:a87db93d93f6

Timestamp:

06/21/07 09:00:38 (15 months ago)

Author:

Tarek Ziad?? <tarek@…>

Message:

fixed tag calculation

Location:

neighbors

Files:

• doc/neartag.txt (modified) (1 diff)
• doc/neighbours.txt (modified) (1 diff)
• neartag.py (modified) (2 diffs)
• neighbours.py (modified) (1 diff)

neighbors/doc/neartag.txt

@@ -17 +17 @@
 Then each user is added with her name and tag values (boolean value)::
 
-    >>> user_1 = 'user 1', ['1', '1', '0', '0', '0']
-    >>> user_2 = 'user 2', ['0', '0', '1', '1', '1']
-    >>> user_3 = 'user 3', ['1', '0', '0', '0', '0']
-    >>> user_4 = 'user 4', ['1', '1', '0', '0', '0']
+    >>> user_1 = 'user 1', ["django", "python"]
+    >>> user_2 = 'user 2', ["zen", "fun", "scary"]
+    >>> user_3 = 'user 3', ["django"]
+    >>> user_4 = 'user 4', ["django", "python"]
     >>> for user, tags in (user_1, user_2, user_3, user_4):
     ...     solver.add_user(user, tags)

neighbors/doc/neighbours.txt

@@ -12 +12 @@
     >>> from neighbours import get
     >>> get('tarek')
-    [(1.0, 'robert'), (1.0, 'test')]
+    [(0.04..., 'robert'), (0.04..., 'test')]
 

neighbors/neartag.py

@@ -4 +4 @@
 
     def __init__(self, tags):
+        self.tags = tags
         self.db = nearest.DataSet(attrnames=tags, exclude=(-1,),)
         self.solver = nearest.NearestNeighborLearner()
@@ -9 +10 @@
 
     def add_user(self, name, tags):
-        self.db.add_example(tags+[name])
+        values = []
+        for tag in self.tags:
+            if tag in tags:
+                values.append('1')
+            else:
+                values.append('0')
+        values.append(name)
+
+        self.db.add_example(values)
 
     def neighbours(self, name, k=10):

neighbors/neighbours.py

@@ -22 +22 @@
     solver = NearestByTag(tags)
 
+    import pdb; pdb.set_trace()
     for user in users:
-        user_tags = query(user_tags_retriever % user)
+        user_tags = [res[0] for res in query(user_tags_retriever % user)]
         solver.add_user(user, user_tags)