From 91384b32c6ade7733872b05036c2a012a6b0d0d3 Mon Sep 17 00:00:00 2001
From: Tássia Camões Araújo <tassia@gmail.com>
Date: Mon, 12 Sep 2011 04:55:48 +0000
Subject: [PATCH] ignoring full programs repositories.

---
 src/recommender.py | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/recommender.py b/src/recommender.py
index 365d6f3..1869677 100644
--- a/src/recommender.py
+++ b/src/recommender.py
@@ -75,20 +75,20 @@ class Recommender:
         """
         self.cfg = cfg
         # Load xapian indexes
-        self.axi_programs = xapian.Database(cfg.axi_programs)
+        #self.axi_programs = xapian.Database(cfg.axi_programs)
         self.axi_desktopapps = xapian.Database(cfg.axi_desktopapps)
         if cfg.popcon:
-            self.popcon_programs = xapian.Database(cfg.popcon_programs)
+            #self.popcon_programs = xapian.Database(cfg.popcon_programs)
             self.popcon_desktopapps = xapian.Database(cfg.popcon_desktopapps)
         # Load valid programs, desktopapps and tags
         # format: one package or tag name per line
-        self.valid_programs = []
+        #self.valid_programs = []
         self.valid_desktopapps = []
         self.valid_tags = []
         logging.info("Loading recommender filters")
-        with open(os.path.join(cfg.filters_dir,"programs")) as pkgs:
-            self.valid_programs = [line.strip() for line in pkgs
-                                   if not line.startswith("#")]
+        #with open(os.path.join(cfg.filters_dir,"programs")) as pkgs:
+        #    self.valid_programs = [line.strip() for line in pkgs
+        #                           if not line.startswith("#")]
         with open(os.path.join(cfg.filters_dir,"desktopapps")) as pkgs:
             self.valid_desktopapps = [line.strip() for line in pkgs
                                       if not line.startswith("#")]
@@ -114,16 +114,16 @@ class Recommender:
             if not self.cfg.popcon:
                 logging.info("Cannot perform collaborative strategy")
                 return 1
-        if self.cfg.pkgs_filter.split("/")[-1] == "desktopapps":
-            self.items_repository = self.axi_desktopapps
-            self.valid_pkgs = self.valid_desktopapps
-            if "knn" in strategy_str:
-                self.users_repository = self.popcon_desktopapps
-        else:
-            self.items_repository = self.axi_programs
-            self.valid_pkgs = self.valid_programs
-            if "knn" in strategy_str:
-                self.users_repository = self.popcon_programs
+        #if self.cfg.pkgs_filter.split("/")[-1] == "desktopapps":
+        self.items_repository = self.axi_desktopapps
+        self.valid_pkgs = self.valid_desktopapps
+        if "knn" in strategy_str:
+            self.users_repository = self.popcon_desktopapps
+        #else:
+        #    self.items_repository = self.axi_programs
+        #    self.valid_pkgs = self.valid_programs
+        #    if "knn" in strategy_str:
+        #        self.users_repository = self.popcon_programs
         # Set strategy based on strategy_str
         if strategy_str == "cb":
             self.strategy = strategy.ContentBased("mix",self.cfg.profile_size)
@@ -153,8 +153,9 @@ class Recommender:
             self.strategy = strategy.KnnContent(self.cfg.k_neighbors)
         elif strategy_str == "knnco_eset":
             self.strategy = strategy.KnnContentEset(self.cfg.k_neighbors)
-        elif strategy_str.startswith("demo"):
-            self.strategy = strategy.Demographic(strategy_str)
+        # [FIXME: fix repository instanciation]
+        #elif strategy_str.startswith("demo"):
+        #    self.strategy = strategy.Demographic(strategy_str)
         else:
             logging.info("Strategy not defined.")
             return
--
libgit2 0.21.2