Merge remote-tracking branch 'origin/kNN-top' into kNN-top · NicolasHug/Surprise@1ae3ad2 · GitHub

Commit

Merge remote-tracking branch 'origin/kNN-top' into kNN-top

Browse files

# Conflicts:
#	surprise/prediction_algorithms/algo_base.py
#	surprise/prediction_algorithms/knns.py

Loading branch information

ODemidenko committed Jan 30, 2018

2 parents 56311f0 + 4741998 commit 1ae3ad2