Download as
Browse Code »

Commit 91384b32c6ade7733872b05036c2a012a6b0d0d3

Authored by Tássia Camões Araújo
1 parent b1904ec8
Exists in master and in 1 other branch add_vagrant

ignoring full programs repositories.

Showing 1 changed file with 19 additions and 18 deletions   Show diff stats
src/recommender.py
  Diff comments   View file @91384b3
@@ -75,20 +75,20 @@ class Recommender: @@ -75,20 +75,20 @@ class Recommender:
75 """ 75 """
76 self.cfg = cfg 76 self.cfg = cfg
77 # Load xapian indexes 77 # Load xapian indexes
78 - self.axi_programs = xapian.Database(cfg.axi_programs) 78 + #self.axi_programs = xapian.Database(cfg.axi_programs)
79 self.axi_desktopapps = xapian.Database(cfg.axi_desktopapps) 79 self.axi_desktopapps = xapian.Database(cfg.axi_desktopapps)
80 if cfg.popcon: 80 if cfg.popcon:
81 - self.popcon_programs = xapian.Database(cfg.popcon_programs) 81 + #self.popcon_programs = xapian.Database(cfg.popcon_programs)
82 self.popcon_desktopapps = xapian.Database(cfg.popcon_desktopapps) 82 self.popcon_desktopapps = xapian.Database(cfg.popcon_desktopapps)
83 # Load valid programs, desktopapps and tags 83 # Load valid programs, desktopapps and tags
84 # format: one package or tag name per line 84 # format: one package or tag name per line
85 - self.valid_programs = [] 85 + #self.valid_programs = []
86 self.valid_desktopapps = [] 86 self.valid_desktopapps = []
87 self.valid_tags = [] 87 self.valid_tags = []
88 logging.info("Loading recommender filters") 88 logging.info("Loading recommender filters")
89 - with open(os.path.join(cfg.filters_dir,"programs")) as pkgs:  
90 - self.valid_programs = [line.strip() for line in pkgs  
91 - if not line.startswith("#")] 89 + #with open(os.path.join(cfg.filters_dir,"programs")) as pkgs:
  90 + # self.valid_programs = [line.strip() for line in pkgs
  91 + # if not line.startswith("#")]
92 with open(os.path.join(cfg.filters_dir,"desktopapps")) as pkgs: 92 with open(os.path.join(cfg.filters_dir,"desktopapps")) as pkgs:
93 self.valid_desktopapps = [line.strip() for line in pkgs 93 self.valid_desktopapps = [line.strip() for line in pkgs
94 if not line.startswith("#")] 94 if not line.startswith("#")]
@@ -114,16 +114,16 @@ class Recommender: @@ -114,16 +114,16 @@ class Recommender:
114 if not self.cfg.popcon: 114 if not self.cfg.popcon:
115 logging.info("Cannot perform collaborative strategy") 115 logging.info("Cannot perform collaborative strategy")
116 return 1 116 return 1
117 - if self.cfg.pkgs_filter.split("/")[-1] == "desktopapps":  
118 - self.items_repository = self.axi_desktopapps  
119 - self.valid_pkgs = self.valid_desktopapps  
120 - if "knn" in strategy_str:  
121 - self.users_repository = self.popcon_desktopapps  
122 - else:  
123 - self.items_repository = self.axi_programs  
124 - self.valid_pkgs = self.valid_programs  
125 - if "knn" in strategy_str:  
126 - self.users_repository = self.popcon_programs 117 + #if self.cfg.pkgs_filter.split("/")[-1] == "desktopapps":
  118 + self.items_repository = self.axi_desktopapps
  119 + self.valid_pkgs = self.valid_desktopapps
  120 + if "knn" in strategy_str:
  121 + self.users_repository = self.popcon_desktopapps
  122 + #else:
  123 + # self.items_repository = self.axi_programs
  124 + # self.valid_pkgs = self.valid_programs
  125 + # if "knn" in strategy_str:
  126 + # self.users_repository = self.popcon_programs
127 # Set strategy based on strategy_str 127 # Set strategy based on strategy_str
128 if strategy_str == "cb": 128 if strategy_str == "cb":
129 self.strategy = strategy.ContentBased("mix",self.cfg.profile_size) 129 self.strategy = strategy.ContentBased("mix",self.cfg.profile_size)
@@ -153,8 +153,9 @@ class Recommender: @@ -153,8 +153,9 @@ class Recommender:
153 self.strategy = strategy.KnnContent(self.cfg.k_neighbors) 153 self.strategy = strategy.KnnContent(self.cfg.k_neighbors)
154 elif strategy_str == "knnco_eset": 154 elif strategy_str == "knnco_eset":
155 self.strategy = strategy.KnnContentEset(self.cfg.k_neighbors) 155 self.strategy = strategy.KnnContentEset(self.cfg.k_neighbors)
156 - elif strategy_str.startswith("demo"):  
157 - self.strategy = strategy.Demographic(strategy_str) 156 + # [FIXME: fix repository instanciation]
  157 + #elif strategy_str.startswith("demo"):
  158 + # self.strategy = strategy.Demographic(strategy_str)
158 else: 159 else:
159 logging.info("Strategy not defined.") 160 logging.info("Strategy not defined.")
160 return 161 return