Changeset 102:917b0f7d3576 for atomisator/filters/bayes.py

Timestamp:

05/30/07 16:47:14 (18 months ago)

Author:

Tarek Ziad?? <tarek@…>

Message:

fixes

Files:

• atomisator/filters/bayes.py (modified) (4 diffs)

atomisator/filters/bayes.py

@@ -49 +49 @@
 SQLURI = 'sqlite:///filters/BayesCore/data/bayes.db'
 
-def bayesian(entry, entries):
+def bayesian(entry, entries, sqluri=None):
     """uses bayesian inference over entries"""
     content = entry['content'].encode('utf8')
@@ -59 +59 @@
 
     data = '%s %s' % (content, title)
-    classifier = BayesClassifier(LANG, SQLStorage(SQLURI), AllFilters())
+
+    if sqluri is None:
+        sqluri = SQLURI
+
+    classifier = BayesClassifier(LANG, SQLStorage(sqluri), AllFilters())
 
     # let's test the entry
@@ -67 +71 @@
         return True
 
+
     return  result[0][0] == 'nojunk'
 
 register_filter(bayesian)
 
-def bayesian_learn(entry):
+def bayesian_learn(entry, sqluri=None, answer=None):
     """uses bayesian inference over entries"""
     content = entry['content'].encode('utf8')
@@ -80 +85 @@
         title = ''
 
-    print 'title : %s' % title
+
+    if sqluri is None:
+        sqluri = SQLURI
 
     data = '%s %s' % (content, title)
-    classifier = BayesClassifier(LANG, SQLStorage(SQLURI), AllFilters())
 
-    res = raw_input("Interesting (type 'm' for more) ? (y/n)  ")
-    res = res.strip().lower()
+    classifier = BayesClassifier(LANG, SQLStorage(sqluri), AllFilters())
 
-    if res == 'm':
-        print content
-        res = raw_input("Interesting ? (y/n)  ")
+    if answer is None:
+        print 'title : %s' % title
 
+        res = raw_input("Interesting (type 'm' for more) ? (y/n)  ")
+        answer = res.strip().lower()
 
-    print 'Learning...'
-    if res.strip().lower() in ('y', 'yes'):
+        if answer == 'm':
+            print content
+            answer = raw_input("Interesting ? (y/n)  ")
+
+        print 'Learning...'
+
+    if answer.strip().lower() in ('y', 'yes'):
         classifier.learn(data, 'nojunk')
     else: