From d51748b1d0467d9d742dce749221845123174d3c Mon Sep 17 00:00:00 2001 From: j Date: Mon, 19 Nov 2018 19:51:21 +0100 Subject: [PATCH] fix merge conflicts --- recommendation_engine.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/recommendation_engine.py b/recommendation_engine.py index 3082c4a..3281ec2 100644 --- a/recommendation_engine.py +++ b/recommendation_engine.py @@ -58,10 +58,6 @@ class Engine: self.state['userKeywordsWeights'] = { 'themeTags': {'locked': False, 'value': 0.3}, 'characterTags': {'locked': False, 'value': 0.7} -<<<<<<< HEAD -======= - ->>>>>>> iss2 } self.update_keywords() @@ -128,11 +124,7 @@ class Engine: prev_grid_list = sorted([v for v in grid_events.values()], key=lambda k:k['index']) # if there were no grid events for all, initialize all grids. -<<<<<<< HEAD - if len(prev_grid_list) < video_num: -======= if len(prev_grid_list) < video_num: ->>>>>>> iss2 return { 'user': { 'keywords': user.get('keywords', {}) @@ -201,10 +193,6 @@ class Engine: }, 'videos': videos_ } -<<<<<<< HEAD - -======= ->>>>>>> iss2 def get_recommendations(self, user, vids_exclude = []): @@ -231,11 +219,6 @@ class Engine: character_tags["FEDOR MIKHAILOVICH SOFRONOV"] = character_tags.get("FYODOR MIKHAILOVICH SOFRONOV",0) character_tags["SHKABARNYA OLGA SERGEEVNA"] = character_tags.get("OLGA SERGEEVNA SHKABARNYA",0) character_tags["VICTORIA OLEGOVNA SKITSKAYA"] = character_tags.get("VIKTORIA OLEGOVNA SKITSKAYA",0) -<<<<<<< HEAD - -======= - ->>>>>>> iss2 score = {} for playlist in playlists: score[playlist['name']] = random.random() * 0.001