Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Option to add user and/or item features #159

Open
wants to merge 54 commits into
base: user_item_features
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
8a3532f
added asym_rmse and asym_mae
martincousi Mar 26, 2018
de2cd0c
Merge pull request #1 from NicolasHug/master
martincousi Mar 26, 2018
6d18af6
Merge pull request #2 from martincousi/asymetric-measures
martincousi Mar 26, 2018
3f6b1d0
disable print in AlgoBase.compute_baselines()
martincousi Mar 27, 2018
daab1ba
Cancel printing of computation of similarities
martincousi Mar 28, 2018
05ef072
Cancel printing of similiraty computation
martincousi Mar 28, 2018
902246f
add load_features_df() method
martincousi Mar 29, 2018
fb64e98
modified construct_trainset() and load_features_df()
martincousi Mar 29, 2018
13f3a28
modified Trainset.__init__()
martincousi Mar 29, 2018
900c0c0
corrected bugs in print statement
martincousi Mar 29, 2018
68ccfca
use user_features_nb to test if initialized
martincousi Mar 30, 2018
f7fa4d8
revert back changes to accuracy.py
martincousi Mar 30, 2018
c6591ae
revert back changes to AlgoBase
martincousi Mar 30, 2018
e31e857
Update .gitignore
martincousi Mar 30, 2018
7d67963
Update .gitignore
martincousi Mar 30, 2018
73bea50
fixed python 2 compatibility
martincousi Mar 30, 2018
4063da8
construction of Lasso.fit()
martincousi Apr 4, 2018
34dd04b
modified predict and estimate methods
martincousi Apr 4, 2018
d275f84
include features in testset and prediction objects
martincousi Apr 4, 2018
14d1248
update matrix factorization estimate method
martincousi Apr 4, 2018
a2b87c4
adapt estimate methods for all prediction algorithms
martincousi Apr 4, 2018
3c5f7e6
add sklearn arguments to Lasso
martincousi Apr 5, 2018
7b82e78
single underscore for dummy variable
martincousi Apr 5, 2018
bf335c2
update documentation for Lasso and change filename
martincousi Apr 5, 2018
e34a5f9
correct conflict with master
martincousi Apr 5, 2018
4081244
add interaction terms in Lasso
martincousi Apr 5, 2018
d3dd0dd
add interaction terms to Lasso.estimate
martincousi Apr 5, 2018
47ff477
correct conflicts with master
martincousi Apr 5, 2018
1279424
correct verbose conflicts in knns
martincousi Apr 5, 2018
62ccd84
add add_interactions to self in Lasso
martincousi Apr 5, 2018
53b8697
change add_interactions fn name
martincousi Apr 5, 2018
7e34298
remove add_interactions_fn
martincousi Apr 5, 2018
39c2601
correct bad index
martincousi Apr 5, 2018
4f3c3a8
pep8 and description
martincousi Apr 5, 2018
aab90a5
add feature labels
martincousi Apr 5, 2018
bfb2b8d
resolve conflicts
martincousi Apr 5, 2018
f9255e1
remove Lasso
martincousi Apr 5, 2018
1d74bef
Merge branch 'master' into features-dataset
martincousi Apr 5, 2018
e63d5ad
Merge pull request #3 from martincousi/features-dataset
martincousi Apr 5, 2018
ed7180d
Revert "Features dataset"
martincousi Apr 5, 2018
40cc8d2
Merge pull request #4 from martincousi/revert-3-features-dataset
martincousi Apr 5, 2018
32082ce
initialize features_labels
martincousi Apr 5, 2018
e3de208
Revert "Revert "Features dataset""
martincousi Apr 5, 2018
c52d707
Merge pull request #5 from martincousi/revert-4-revert-3-features-dat…
martincousi Apr 5, 2018
4fabe29
add lasso
martincousi Apr 5, 2018
e7adc87
Merge pull request #6 from martincousi/lasso
martincousi Apr 5, 2018
4fc4242
Merge pull request #7 from NicolasHug/master
martincousi Apr 6, 2018
5eaccce
Merge branch 'master' into features-dataset
martincousi Apr 6, 2018
7427b22
Delete linear.py
martincousi Apr 9, 2018
773bd24
Update __init__.py
martincousi Apr 9, 2018
bb0012c
Update __init__.py
martincousi Apr 9, 2018
c76a51a
remove features from Prediction object + typos
martincousi Apr 13, 2018
c34a817
correct accuracy
martincousi Apr 13, 2018
fec4d4f
Correct tests
martincousi Apr 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
correct accuracy
martincousi committed Apr 13, 2018
commit c34a817d1ee71689d688cf7f787e06d062de5f78
6 changes: 3 additions & 3 deletions surprise/accuracy.py
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ def rmse(predictions, verbose=True):
raise ValueError('Prediction list is empty.')

mse = np.mean([float((true_r - est)**2)
for (_, _, _, _, true_r, est, _) in predictions])
for (_, _, true_r, est, _) in predictions])
rmse_ = np.sqrt(mse)

if verbose:
@@ -80,7 +80,7 @@ def mae(predictions, verbose=True):
raise ValueError('Prediction list is empty.')

mae_ = np.mean([float(abs(true_r - est))
for (_, _, _, _, true_r, est, _) in predictions])
for (_, _, true_r, est, _) in predictions])

if verbose:
print('MAE: {0:1.4f}'.format(mae_))
@@ -117,7 +117,7 @@ def fcp(predictions, verbose=True):
nc_u = defaultdict(int)
nd_u = defaultdict(int)

for u0, _, _, _, r0, est, _ in predictions:
for u0, _, r0, est, _ in predictions:
predictions_u[u0].append((r0, est))

for u0, preds in iteritems(predictions_u):