浏览代码

[enh] score per result stat added

asciimoo 11 年前
父节点
当前提交
a5544ab95e
共有 1 个文件被更改,包括 11 次插入2 次删除
  1. 11
    2
      searx/engines/__init__.py

+ 11
- 2
searx/engines/__init__.py 查看文件

226
     return results, suggestions
226
     return results, suggestions
227
 
227
 
228
 def get_engines_stats():
228
 def get_engines_stats():
229
+    # TODO refactor
229
     pageloads = []
230
     pageloads = []
230
     results = []
231
     results = []
231
     scores = []
232
     scores = []
232
     errors = []
233
     errors = []
234
+    scores_per_result = []
233
 
235
 
234
-    max_pageload = max_results = max_score = max_errors = 0
236
+    max_pageload = max_results = max_score = max_errors = max_score_per_result = 0
235
     for engine in engines.values():
237
     for engine in engines.values():
236
         if engine.stats['search_count'] == 0:
238
         if engine.stats['search_count'] == 0:
237
             continue
239
             continue
239
         load_times  = engine.stats['page_load_time']/float(engine.stats['search_count'])
241
         load_times  = engine.stats['page_load_time']/float(engine.stats['search_count'])
240
         if results_num:
242
         if results_num:
241
             score = engine.stats['score_count'] / float(engine.stats['search_count'])
243
             score = engine.stats['score_count'] / float(engine.stats['search_count'])
244
+            score_per_result = score / results_num
242
         else:
245
         else:
243
-            score = 0
246
+            score = score_per_result = 0.0
244
         max_results = max(results_num, max_results)
247
         max_results = max(results_num, max_results)
245
         max_pageload = max(load_times, max_pageload)
248
         max_pageload = max(load_times, max_pageload)
246
         max_score = max(score, max_score)
249
         max_score = max(score, max_score)
250
+        max_score_per_result = max(score_per_result, max_score_per_result)
247
         max_errors = max(max_errors, engine.stats['errors'])
251
         max_errors = max(max_errors, engine.stats['errors'])
248
         pageloads.append({'avg': load_times, 'name': engine.name})
252
         pageloads.append({'avg': load_times, 'name': engine.name})
249
         results.append({'avg': results_num, 'name': engine.name})
253
         results.append({'avg': results_num, 'name': engine.name})
250
         scores.append({'avg': score, 'name': engine.name})
254
         scores.append({'avg': score, 'name': engine.name})
251
         errors.append({'avg': engine.stats['errors'], 'name': engine.name})
255
         errors.append({'avg': engine.stats['errors'], 'name': engine.name})
256
+        scores_per_result.append({'avg': score_per_result, 'name': engine.name})
252
 
257
 
253
     for engine in pageloads:
258
     for engine in pageloads:
254
         engine['percentage'] = int(engine['avg']/max_pageload*100)
259
         engine['percentage'] = int(engine['avg']/max_pageload*100)
259
     for engine in scores:
264
     for engine in scores:
260
         engine['percentage'] = int(engine['avg']/max_score*100)
265
         engine['percentage'] = int(engine['avg']/max_score*100)
261
 
266
 
267
+    for engine in scores_per_result:
268
+        engine['percentage'] = int(engine['avg']/max_score_per_result*100)
269
+
262
     for engine in errors:
270
     for engine in errors:
263
         if max_errors:
271
         if max_errors:
264
             engine['percentage'] = int(float(engine['avg'])/max_errors*100)
272
             engine['percentage'] = int(float(engine['avg'])/max_errors*100)
269
     return [('Page loads (sec)', sorted(pageloads, key=itemgetter('avg')))
277
     return [('Page loads (sec)', sorted(pageloads, key=itemgetter('avg')))
270
            ,('Number of results', sorted(results, key=itemgetter('avg'), reverse=True))
278
            ,('Number of results', sorted(results, key=itemgetter('avg'), reverse=True))
271
            ,('Scores', sorted(scores, key=itemgetter('avg'), reverse=True))
279
            ,('Scores', sorted(scores, key=itemgetter('avg'), reverse=True))
280
+           ,('Scores per result', sorted(scores_per_result, key=itemgetter('avg'), reverse=True))
272
            ,('Errors', sorted(errors, key=itemgetter('avg'), reverse=True))
281
            ,('Errors', sorted(errors, key=itemgetter('avg'), reverse=True))
273
            ]
282
            ]