From 7a8fd22dd42af27b04e0e598f2d13ddb15e91af3 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Tue, 1 Jan 2019 17:26:43 +0100 Subject: [PATCH 01/30] Update book_crossing.py --- scikits/crab/datasets/book_crossing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/datasets/book_crossing.py b/scikits/crab/datasets/book_crossing.py index 5a522dc..0684ac5 100644 --- a/scikits/crab/datasets/book_crossing.py +++ b/scikits/crab/datasets/book_crossing.py @@ -116,7 +116,7 @@ def load_bookcrossings(data_home=None, download_if_missing=True, if not os.path.exists(os.path.join(data_home, 'BX-Book-Ratings.csv')) \ and not open(os.path.join(data_home, 'BX-Books.csv')): raise IOError - except Exception, e: + except Exception as e: print 80 * '_' print 'Loading files failed' print 80 * '_' From c22d790ee6d3ea8693c00dde232abb31ae4fe846 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Tue, 1 Jan 2019 17:32:13 +0100 Subject: [PATCH 02/30] Update book_crossing.py --- scikits/crab/datasets/book_crossing.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scikits/crab/datasets/book_crossing.py b/scikits/crab/datasets/book_crossing.py index 0684ac5..678ec2a 100644 --- a/scikits/crab/datasets/book_crossing.py +++ b/scikits/crab/datasets/book_crossing.py @@ -117,18 +117,18 @@ def load_bookcrossings(data_home=None, download_if_missing=True, and not open(os.path.join(data_home, 'BX-Books.csv')): raise IOError except Exception as e: - print 80 * '_' - print 'Loading files failed' - print 80 * '_' - print e + print ( 80 * '_') + print ('Loading files failed') + print (80 * '_') + print (e) if download_if_missing: - print 'downloading the dataset...' + print ('downloading the dataset...') try: download_book_crossings(data_home) except: raise Exception('FAIL: Problems during the download.') - print 'dataset downloaded.' + print ('dataset downloaded.') else: raise IOError('Book-Crossing dataset not found') From 6ed1f20bcc6831e515fa88783bf05bc8a73a38f1 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Tue, 1 Jan 2019 18:11:25 +0100 Subject: [PATCH 03/30] Update book_crossing.py --- scikits/crab/datasets/book_crossing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/datasets/book_crossing.py b/scikits/crab/datasets/book_crossing.py index 678ec2a..6e7be95 100644 --- a/scikits/crab/datasets/book_crossing.py +++ b/scikits/crab/datasets/book_crossing.py @@ -40,7 +40,7 @@ from os.path import dirname from os.path import join import numpy as np -from base import Bunch +from .base import Bunch import csv logger = logging.getLogger(__name__) From 9a9f78fb1d94926ab8108621a0a3b14b0404a833 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 11:54:01 +0100 Subject: [PATCH 04/30] Update classes.py --- scikits/crab/models/classes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scikits/crab/models/classes.py b/scikits/crab/models/classes.py index 010dbf7..3c09f94 100644 --- a/scikits/crab/models/classes.py +++ b/scikits/crab/models/classes.py @@ -105,7 +105,8 @@ def build_model(self): Build the data model ''' #Is it important to store as numpy array ? - self._user_ids = np.asanyarray(self.dataset.keys()) + myListOKeys =[k for k,_ in movies.self.dataset.items()] + self._user_ids = np.asanyarray(myListOKeys) self._user_ids.sort() #Is it important to store as numpy array ? From 8ea9af91bdf1a5a0b352762169e8d6da52efe37d Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 13:16:59 +0100 Subject: [PATCH 05/30] Update classes.py --- scikits/crab/models/classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/models/classes.py b/scikits/crab/models/classes.py index 3c09f94..f81ebde 100644 --- a/scikits/crab/models/classes.py +++ b/scikits/crab/models/classes.py @@ -105,7 +105,7 @@ def build_model(self): Build the data model ''' #Is it important to store as numpy array ? - myListOKeys =[k for k,_ in movies.self.dataset.items()] + myListOKeys =[k for k,_ in self.dataset.items()] self._user_ids = np.asanyarray(myListOKeys) self._user_ids.sort() From c7544d9b4d47dfcbd26a51c69e8e144594fa3a6f Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:03:47 +0100 Subject: [PATCH 06/30] Update classes.py --- scikits/crab/models/classes.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scikits/crab/models/classes.py b/scikits/crab/models/classes.py index f81ebde..24fb9a7 100644 --- a/scikits/crab/models/classes.py +++ b/scikits/crab/models/classes.py @@ -111,7 +111,10 @@ def build_model(self): #Is it important to store as numpy array ? self._item_ids = [] - for items in self.dataset.itervalues(): + print("**this is for test****") + print(self.dataset) + print("*** this was for test***") + for items in self.dataset.items(): self._item_ids.extend(items.keys()) self._item_ids = np.unique(np.array(self._item_ids)) From 9154fe1fd6c620fed6dcaad42ca4275ce1641709 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:14:39 +0100 Subject: [PATCH 07/30] Update classes.py --- scikits/crab/models/classes.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scikits/crab/models/classes.py b/scikits/crab/models/classes.py index 24fb9a7..7c5f40a 100644 --- a/scikits/crab/models/classes.py +++ b/scikits/crab/models/classes.py @@ -113,9 +113,12 @@ def build_model(self): self._item_ids = [] print("**this is for test****") print(self.dataset) + print(self.dataset.values().keys) print("*** this was for test***") - for items in self.dataset.items(): - self._item_ids.extend(items.keys()) + + + for dictVal in self.dataset.values(): + self._item_ids.extend(dictVal.keys()) self._item_ids = np.unique(np.array(self._item_ids)) self._item_ids.sort() From 373748e3045ac9460218963e6d8d16850f572ff9 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:32:22 +0100 Subject: [PATCH 08/30] Update classes.py --- scikits/crab/models/classes.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scikits/crab/models/classes.py b/scikits/crab/models/classes.py index 7c5f40a..0d46d1f 100644 --- a/scikits/crab/models/classes.py +++ b/scikits/crab/models/classes.py @@ -117,8 +117,9 @@ def build_model(self): print("*** this was for test***") - for dictVal in self.dataset.values(): - self._item_ids.extend(dictVal.keys()) + #for dictVal in self.dataset.values(): + # self._item_ids.extend(dictVal.keys()) + self._item_ids = [k for k,v in self.dataset.items() ] self._item_ids = np.unique(np.array(self._item_ids)) self._item_ids.sort() From cc139b2ecb7a6bd2706d4aad01f4a05a623b49c1 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:34:04 +0100 Subject: [PATCH 09/30] Update classes.py --- scikits/crab/models/classes.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scikits/crab/models/classes.py b/scikits/crab/models/classes.py index 0d46d1f..e145613 100644 --- a/scikits/crab/models/classes.py +++ b/scikits/crab/models/classes.py @@ -111,11 +111,7 @@ def build_model(self): #Is it important to store as numpy array ? self._item_ids = [] - print("**this is for test****") - print(self.dataset) - print(self.dataset.values().keys) - print("*** this was for test***") - + #for dictVal in self.dataset.values(): # self._item_ids.extend(dictVal.keys()) From cafd199ceceb7303e1d5512419c5dd1bc9a9c12b Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:35:54 +0100 Subject: [PATCH 10/30] Update basic_similarities.py --- scikits/crab/similarities/basic_similarities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/similarities/basic_similarities.py b/scikits/crab/similarities/basic_similarities.py index b8231f8..ac553af 100644 --- a/scikits/crab/similarities/basic_similarities.py +++ b/scikits/crab/similarities/basic_similarities.py @@ -9,7 +9,7 @@ import numpy as np -from base import BaseSimilarity +from .base import BaseSimilarity from ..metrics.pairwise import loglikehood_coefficient From e6606940c6edcd2fd313526ba6c42bd11e06f980 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:42:44 +0100 Subject: [PATCH 11/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index bf96af3..2f6bcea 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -14,7 +14,7 @@ # # License: BSD Style. -from base import ItemRecommender, UserRecommender +from .base import ItemRecommender, UserRecommender from item_strategies import ItemsNeighborhoodStrategy from neighborhood_strategies import NearestNeighborsStrategy import numpy as np From 82c0a68b7a776e10fed09ca5d1c054e1d72bd1c9 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:46:57 +0100 Subject: [PATCH 12/30] Update base.py --- scikits/crab/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/base.py b/scikits/crab/base.py index b49c70d..435e6fa 100644 --- a/scikits/crab/base.py +++ b/scikits/crab/base.py @@ -8,7 +8,7 @@ # Bruno Melo # License: BSD Style. -from scikits.learn.base import BaseEstimator +from sklearn.base import BaseEstimator class BaseRecommender(BaseEstimator): From f84155a669b0f46e58338c0a1146c1a30aa838ca Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 18:03:29 +0100 Subject: [PATCH 13/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 2f6bcea..f2011ec 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -15,8 +15,8 @@ # License: BSD Style. from .base import ItemRecommender, UserRecommender -from item_strategies import ItemsNeighborhoodStrategy -from neighborhood_strategies import NearestNeighborsStrategy +from .item_strategies import ItemsNeighborhoodStrategy +from .neighborhood_strategies import NearestNeighborsStrategy import numpy as np From e53984da618912d0c0dc6187279bf38fba387dc0 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 18:05:01 +0100 Subject: [PATCH 14/30] Update item_strategies.py --- scikits/crab/recommenders/knn/item_strategies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/item_strategies.py b/scikits/crab/recommenders/knn/item_strategies.py index c003891..600b881 100644 --- a/scikits/crab/recommenders/knn/item_strategies.py +++ b/scikits/crab/recommenders/knn/item_strategies.py @@ -11,7 +11,7 @@ # # License: BSD Style. -from base import BaseCandidateItemsStrategy +from .base import BaseCandidateItemsStrategy import numpy as np From 270c60db329cc2c84bcb64c41ef513257e94838d Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 19:48:33 +0100 Subject: [PATCH 15/30] Update neighborhood_strategies.py --- scikits/crab/recommenders/knn/neighborhood_strategies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/neighborhood_strategies.py b/scikits/crab/recommenders/knn/neighborhood_strategies.py index 3bcf312..9dad2b5 100644 --- a/scikits/crab/recommenders/knn/neighborhood_strategies.py +++ b/scikits/crab/recommenders/knn/neighborhood_strategies.py @@ -11,7 +11,7 @@ # # License: BSD Style. -from base import BaseUserNeighborhoodStrategy +from .base import BaseUserNeighborhoodStrategy import numpy as np from ...similarities.basic_similarities import UserSimilarity from ...metrics.pairwise import euclidean_distances From b455a138c7d34545cddf462d610ba4186d89e125 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Wed, 2 Jan 2019 19:50:21 +0100 Subject: [PATCH 16/30] Update classes.py --- scikits/crab/recommenders/svd/classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/svd/classes.py b/scikits/crab/recommenders/svd/classes.py index 36be33a..ede955e 100644 --- a/scikits/crab/recommenders/svd/classes.py +++ b/scikits/crab/recommenders/svd/classes.py @@ -15,7 +15,7 @@ # License: BSD Style. import random -from base import SVDRecommender +from .base import SVDRecommender from ..knn.item_strategies import ItemsNeighborhoodStrategy import numpy as np from math import sqrt From efc9e2e82e975e04661aea2f7c49f50038d7b8d4 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 18:05:18 +0100 Subject: [PATCH 17/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index f2011ec..02be3ac 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -13,7 +13,7 @@ # Author: Marcel Caraciolo # # License: BSD Style. - +from sklearn.base import BaseEstimator from .base import ItemRecommender, UserRecommender from .item_strategies import ItemsNeighborhoodStrategy from .neighborhood_strategies import NearestNeighborsStrategy From 645572213343bd757e85182a1bbc99c579da8e8e Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 18:38:39 +0100 Subject: [PATCH 18/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 02be3ac..f5bc48e 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -597,7 +597,8 @@ def recommend(self, user_id, how_many=None, **params): ''' - self._set_params(**params) + #self._set_params(**params) + Super(BaseEstimator, self)._set_params(**params) candidate_items = self.all_other_items(user_id, **params) From 235eabfae13357f1ebc4b92f7e6139899c07062b Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 18:40:39 +0100 Subject: [PATCH 19/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index f5bc48e..3c88749 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -598,7 +598,7 @@ def recommend(self, user_id, how_many=None, **params): ''' #self._set_params(**params) - Super(BaseEstimator, self)._set_params(**params) + super(BaseEstimator, self)._set_params(**params) candidate_items = self.all_other_items(user_id, **params) From 22d6c15fbc7c0d57edfdf23758909ded69e19677 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 18:45:51 +0100 Subject: [PATCH 20/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 3c88749..ed01ded 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -597,8 +597,8 @@ def recommend(self, user_id, how_many=None, **params): ''' - #self._set_params(**params) - super(BaseEstimator, self)._set_params(**params) + self.set_params(**params) + #super(BaseEstimator, self).set_params(**params) candidate_items = self.all_other_items(user_id, **params) From 78fc4aaf384f2fe1e18f41fec03be73dcaaee7da Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 18:47:49 +0100 Subject: [PATCH 21/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index ed01ded..0691e90 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -598,7 +598,6 @@ def recommend(self, user_id, how_many=None, **params): ''' self.set_params(**params) - #super(BaseEstimator, self).set_params(**params) candidate_items = self.all_other_items(user_id, **params) From a108623f8c145a85d1eeafd7a5acc3b45bc003bc Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 19:09:57 +0100 Subject: [PATCH 22/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 0691e90..3b35204 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -1,4 +1,3 @@ -""" Generalized Recommender models. This module contains basic memory recommender interfaces used throughout @@ -598,6 +597,7 @@ def recommend(self, user_id, how_many=None, **params): ''' self.set_params(**params) + print(**params) candidate_items = self.all_other_items(user_id, **params) From ce31f805169ea11e5ffbe7ef59d7415ac39c5502 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 19:11:40 +0100 Subject: [PATCH 23/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 3b35204..578cc5b 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -1,3 +1,4 @@ +""" Generalized Recommender models. This module contains basic memory recommender interfaces used throughout From 5cb63b552080a565e869b1713128d65af05fa33f Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 19:37:40 +0100 Subject: [PATCH 24/30] Update basic_similarities.py --- scikits/crab/similarities/basic_similarities.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scikits/crab/similarities/basic_similarities.py b/scikits/crab/similarities/basic_similarities.py index ac553af..f30156a 100644 --- a/scikits/crab/similarities/basic_similarities.py +++ b/scikits/crab/similarities/basic_similarities.py @@ -20,8 +20,8 @@ def find_common_elements(source_preferences, target_preferences): inter = np.intersect1d(src.keys(), tgt.keys()) - common_preferences = zip(*[(src[item], tgt[item]) for item in inter \ - if not np.isnan(src[item]) and not np.isnan(tgt[item])]) + common_preferences = list(zip(*[(src[item], tgt[item]) for item in inter \ + if not np.isnan(src[item]) and not np.isnan(tgt[item])])) if common_preferences: return np.asarray([common_preferences[0]]), np.asarray([common_preferences[1]]) else: From 6af650999034634d6e79ce06cf1efb49b455a2db Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 19:48:16 +0100 Subject: [PATCH 25/30] Update basic_similarities.py --- scikits/crab/similarities/basic_similarities.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scikits/crab/similarities/basic_similarities.py b/scikits/crab/similarities/basic_similarities.py index f30156a..b113f3a 100644 --- a/scikits/crab/similarities/basic_similarities.py +++ b/scikits/crab/similarities/basic_similarities.py @@ -20,8 +20,10 @@ def find_common_elements(source_preferences, target_preferences): inter = np.intersect1d(src.keys(), tgt.keys()) - common_preferences = list(zip(*[(src[item], tgt[item]) for item in inter \ - if not np.isnan(src[item]) and not np.isnan(tgt[item])])) + common_preferences = zip(*[(src[item], tgt[item]) for item in inter \ + if not np.isnan(src[item]) and not np.isnan(tgt[item])]) + common_preferences = list(common_preferences ) + if common_preferences: return np.asarray([common_preferences[0]]), np.asarray([common_preferences[1]]) else: From 2b9ad26fd8f55e83b8498229fd6dc6ea7747293e Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 19:57:23 +0100 Subject: [PATCH 26/30] Update basic_similarities.py --- scikits/crab/similarities/basic_similarities.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scikits/crab/similarities/basic_similarities.py b/scikits/crab/similarities/basic_similarities.py index b113f3a..f3f52b9 100644 --- a/scikits/crab/similarities/basic_similarities.py +++ b/scikits/crab/similarities/basic_similarities.py @@ -18,7 +18,10 @@ def find_common_elements(source_preferences, target_preferences): src = dict(source_preferences) tgt = dict(target_preferences) - inter = np.intersect1d(src.keys(), tgt.keys()) + srcKeys = [k for k,_ in src.items()] + tgtKeys = [k for k,_ in tgt.items()] + + inter = np.intersect1d(srckeys, tgtkeys) common_preferences = zip(*[(src[item], tgt[item]) for item in inter \ if not np.isnan(src[item]) and not np.isnan(tgt[item])]) From 954d181639a9832cd631b75cc84db61f036f9d22 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 19:59:25 +0100 Subject: [PATCH 27/30] Update basic_similarities.py --- scikits/crab/similarities/basic_similarities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/crab/similarities/basic_similarities.py b/scikits/crab/similarities/basic_similarities.py index f3f52b9..7b2198e 100644 --- a/scikits/crab/similarities/basic_similarities.py +++ b/scikits/crab/similarities/basic_similarities.py @@ -21,7 +21,7 @@ def find_common_elements(source_preferences, target_preferences): srcKeys = [k for k,_ in src.items()] tgtKeys = [k for k,_ in tgt.items()] - inter = np.intersect1d(srckeys, tgtkeys) + inter = np.intersect1d(srcKeys, tgtKeys) common_preferences = zip(*[(src[item], tgt[item]) for item in inter \ if not np.isnan(src[item]) and not np.isnan(tgt[item])]) From 061d5a25d65389c201e57e1b0bdbe7e15fd98dd9 Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 20:06:25 +0100 Subject: [PATCH 28/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 578cc5b..28533c6 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -533,8 +533,13 @@ def estimate_preference(self, user_id, item_id, **params): prefs = np.array([self.model.preference_value(to_user_id, item_id) for to_user_id in nearest_neighbors]) + print("before***",prefs.shape) + print("similarities***",similarities.shape) + prefs = prefs[~np.isnan(prefs)] - similarities = similarities[~np.isnan(prefs)] + print("after***",prefs.shape) + similarities = similarities[prefs] + #similarities = similarities[~np.isnan(prefs)] prefs_sim = np.sum(prefs[~np.isnan(similarities)] * similarities[~np.isnan(similarities)]) @@ -598,7 +603,6 @@ def recommend(self, user_id, how_many=None, **params): ''' self.set_params(**params) - print(**params) candidate_items = self.all_other_items(user_id, **params) From 40e410b1b5a8d768037e1bd04126b62e9cbcf54b Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 20:13:33 +0100 Subject: [PATCH 29/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 28533c6..893da67 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -536,10 +536,9 @@ def estimate_preference(self, user_id, item_id, **params): print("before***",prefs.shape) print("similarities***",similarities.shape) - prefs = prefs[~np.isnan(prefs)] + # prefs = prefs[~np.isnan(prefs)] print("after***",prefs.shape) - similarities = similarities[prefs] - #similarities = similarities[~np.isnan(prefs)] + similarities = similarities[~np.isnan(prefs)] prefs_sim = np.sum(prefs[~np.isnan(similarities)] * similarities[~np.isnan(similarities)]) From 1c1fc21e902e4ee422ab367d691df16978972f8c Mon Sep 17 00:00:00 2001 From: MostaSchoolOfAI <44090479+MostaSchoolOfAI@users.noreply.github.com> Date: Thu, 3 Jan 2019 20:16:18 +0100 Subject: [PATCH 30/30] Update classes.py --- scikits/crab/recommenders/knn/classes.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scikits/crab/recommenders/knn/classes.py b/scikits/crab/recommenders/knn/classes.py index 893da67..f72fbf4 100644 --- a/scikits/crab/recommenders/knn/classes.py +++ b/scikits/crab/recommenders/knn/classes.py @@ -533,12 +533,9 @@ def estimate_preference(self, user_id, item_id, **params): prefs = np.array([self.model.preference_value(to_user_id, item_id) for to_user_id in nearest_neighbors]) - print("before***",prefs.shape) - print("similarities***",similarities.shape) - + # prefs = prefs[~np.isnan(prefs)] - print("after***",prefs.shape) - similarities = similarities[~np.isnan(prefs)] + # similarities = similarities[~np.isnan(prefs)] prefs_sim = np.sum(prefs[~np.isnan(similarities)] * similarities[~np.isnan(similarities)])