Small fixes.

Tássia Camões Araújo
1 parent b07dbf63
Showing 4 changed files with 23 additions and 23 deletions Show diff stats
src/data.py
src/recommender.py
src/tests/user_tests.py
src/web/server.py
@@ -123,13 +123,12 @@ class PopconXapianIndex(xapian.WritableDatabase):
     """
     Data source for popcon submissions defined as a singleton xapian database.
     """
-    def __init__(self,cfg,reindex=0,recluster=0):
+    def __init__(self,cfg):
         """
         Set initial attributes.
         """
         self.axi = xapian.Database(cfg.axi)
         self.path = os.path.expanduser(cfg.popcon_index)
-        self.source_dir = cfg.popcon_dir
         if cfg.index_mode.startswith("1") or not self.load_index():
             if not os.path.exists(cfg.popcon_dir):
                 os.makedirs(cfg.popcon_dir)
@@ -279,11 +278,11 @@ class KMedoidsClustering(cluster.KMeansClustering):
         medoidDistance = sys.maxint
         for i in range(len(cluster)):
             totalDistance = sum(self.distanceMatrix[cluster[i].user_id].values())
-            print "totalDistance[",i,"]=",totalDistance
+            logging.debug("totalDistance[%d]=%f" % (i,totalDistance))
             if totalDistance < medoidDistance:
                 medoidDistance = totalDistance
                 medoid = i
-            print "medoidDistance:",medoidDistance
+            logging.debug("medoidDistance: %f" % medoidDistance)
         logging.debug("Cluster medoid: [%d] %s" % (medoid,
                                                    cluster[medoid].user_id))
         return cluster[medoid]
@@ -63,8 +63,8 @@ class Recommender:
         Set initial parameters.
         """
         self.items_repository = xapian.Database(cfg.axi)
-        self.users_repository = data.PopconXapianIndex(cfg) #[FIXME] only cfg fields
-        self.clustered_users_repository = data.PopconXapianIndex(cfg) #[FIXME]
+        self.users_repository = data.PopconXapianIndex(cfg)
+        #self.clustered_users_repository = data.PopconXapianIndex(cfg)
         self.set_strategy(cfg.strategy)
         if cfg.weight == "bm25":
             self.weight = xapian.BM25Weight()
@@ -125,12 +125,12 @@ class UserTests(unittest2.TestCase):
                          self.user.full_profile(self.sample_axi,10))
     def test_tag_profile(self):
-        self.assertEqual(self.user.tag_profile(self.sample_axi,2),
-                         ['XTuse::editing', 'XTworks-with-format::jpg'])
+        self.assertEqual(self.user.tag_profile(self.sample_axi,1),
+                         ['XTuse::editing'])
     def test_desc_profile(self):
-        self.assertEqual(self.user.desc_profile(self.sample_axi,2),
-                         ['image', 'the'])
+        self.assertEqual(self.user.desc_profile(self.sample_axi,1),
+                         ['image'])
     def test_full_profile(self):
         self.assertEqual(self.user.full_profile(self.sample_axi,10),
@@ -215,6 +215,9 @@ class RandomRequest(Request):
         #self.storage = web.Storage()
 class AppRecommender:
+    def __init__(self):
+        self.rec = Recommender(Config())
+
     def POST(self):
         request = Request(web.input(pkgs_file={}))
         if not request.validates():
@@ -233,6 +236,17 @@ class AppRecommender:
             return render.apprec(recommendation, pkg_summaries,
                                  FeedbackForm(request.selected_strategies),request)
+    def _recommends(self,request):
+        user = User(dict.fromkeys(request.pkgs_list,1),request.user_id)
+        user.maximal_pkg_profile()
+        results = dict()
+        for strategy_str in request.selected_strategies:
+            self.rec.set_strategy(strategy_str)
+            prediction = self.rec.get_recommendation(user).get_prediction(request.limit)
+            results[strategy_str] = \
+                [result[0] for result in prediction]
+        return results
+
 # parsing json from screenshots - can be usefull in the future...
 #    def _packages_attrs(self, recommends): #recommends is result of _recommends()
 #        all_recommended_packages = []
@@ -247,19 +261,6 @@ class AppRecommender:
 #                recommended_pkgs_attrs[pkg_attrs_dict['name']] = pkg_attrs_dict
 #        return recommended_pkgs_attrs
-    def _recommends(self,request):
-        user = User(dict.fromkeys(request.pkgs_list,1),request.user_id)
-        user.maximal_pkg_profile()
-        cfg = Config()
-        rec = Recommender(cfg)
-        results = dict()
-        for strategy_str in request.selected_strategies:
-            rec.set_strategy(strategy_str)
-            prediction = rec.get_recommendation(user).get_prediction(request.limit)
-            results[strategy_str] = \
-                [result[0] for result in prediction]
-        return results
-
 def add_global_hook():
     g = web.storage({"counter": "1"})
     def _wrapper(handler):