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

Tests for the evaluate_word_pairs function #1061

Merged
merged 62 commits into from
Dec 28, 2016
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
1c63c9a
Merge branch 'release-0.12.3rc1'
tmylk Nov 5, 2015
280a488
Merge branch 'release-0.12.3'
tmylk Nov 6, 2015
ddeb002
Merge branch 'release-0.12.3'
tmylk Nov 6, 2015
f2ac3a9
Update CHANGELOG.txt
tmylk Nov 6, 2015
cf09e8c
Update CHANGELOG.txt
tmylk Nov 6, 2015
b8b8f57
cbow_mean default changed from 0 to 1.
akutuzov Nov 23, 2015
6456cbc
Hyperparameters' default values are aligned with Mikolov's word2vec.
akutuzov Jan 13, 2016
966a4b0
Merge remote-tracking branch 'upstream/master' into develop
akutuzov Jan 13, 2016
d9ec7e4
Fix for #538: cbow_mean default changed from 0 to 1.
akutuzov Jan 13, 2016
76d2df7
Update changelog
akutuzov Jan 13, 2016
0b6f45b
(main) defaults aligned to Mikolov's word2vec.
akutuzov Jan 14, 2016
7fb5f18
Merge remote-tracking branch 'upstream/develop' into develop
akutuzov Jan 14, 2016
bc7a447
word2vec (main) now mimics command-line arguments for Mikolov's word2…
akutuzov Jan 14, 2016
e689b4f
Fix for #538
akutuzov Jan 14, 2016
a5274ab
Fix for #538 (tabs and spaces).
akutuzov Jan 14, 2016
5c32ca8
Fix for #538 (tests).
akutuzov Jan 15, 2016
ac889b3
For #538: slightly relaxed sanity check demands (because now default …
akutuzov Jan 15, 2016
92087c0
Fixes as per @gojomo comments.
akutuzov Jan 15, 2016
06785b5
Test fixes due to negative sampling becoming default behavior.
akutuzov Jan 15, 2016
3ac5fd4
Commented out tests which work for HS only.
akutuzov Jan 15, 2016
e0ac3d2
Fix for #538.
akutuzov Jan 16, 2016
0aad977
Yet another fix.
akutuzov Jan 16, 2016
1db616b
Merge remote-tracking branch 'upstream/develop' into develop
akutuzov Jan 16, 2016
e4eb8ba
Merging.
akutuzov Jan 16, 2016
ab25344
Fix for CBOW test.
akutuzov Jan 16, 2016
6b3f01d
Merge remote-tracking branch 'upstream/develop' into develop
akutuzov Jan 16, 2016
2bf45d3
Changelog mention of #538
akutuzov Jan 16, 2016
1a579ec
Fix for CBOW negative sampling tests.
akutuzov Jan 17, 2016
78372bf
Merge remote-tracking branch 'upstream/develop' into develop
akutuzov Jan 26, 2016
0c10fa6
Factoring out word2vec _main__ into gensim/scripts
akutuzov Jan 26, 2016
8a3d58b
Use logger instead of logging.
akutuzov Jan 27, 2016
c5249b9
Made Changelog less verbose about word2vec defaults changed.
akutuzov Jan 27, 2016
a40e624
Fixes to word2vec_standalone.py as per Radim's comments.
akutuzov Jan 27, 2016
dbd0eab
Alpha argument. with different defaults for CBOW ans skipgram.
akutuzov Jan 27, 2016
b61287a
resolve merge conflict in Changelog
tmylk Jan 29, 2016
3ade404
Merge branch 'release-0.12.4' with #596
tmylk Jan 31, 2016
9e6522e
Merge branch 'release-0.13.0'
tmylk Jun 10, 2016
87c4e9c
Merge branch 'release-0.13.0'
tmylk Jun 10, 2016
9c74b40
Release version typo fix
tmylk Jun 10, 2016
7b30025
Merge branch 'release-0.13.0rc1'
tmylk Jun 10, 2016
de79c8e
Merge branch 'release-0.13.0'
tmylk Jun 22, 2016
d4f9cc5
Merge branch 'release-0.13.1'
tmylk Jun 23, 2016
e0627c6
Merge remote-tracking branch 'upstream/master' into develop
akutuzov Jul 2, 2016
b8b30c2
Finalizing.
akutuzov Jul 2, 2016
f3f2a52
'fisrt_push'
Nowow Jul 2, 2016
873f184
Initial shippable release
Nowow Dec 8, 2016
68a3e86
Merge remote-tracking branch 'upstream/develop' into develop
akutuzov Dec 15, 2016
498474d
Evaluation function to measure model correlation with human similarit…
akutuzov Dec 15, 2016
ce64d5a
Updating semantic similarity evaluation.
akutuzov Dec 15, 2016
0936971
Scipy stats import
akutuzov Dec 15, 2016
e11909f
Evaluation function to measure model correlation with human similarit…
akutuzov Dec 15, 2016
5f38818
Merge branch 'develop' of https://github.com/akutuzov/gensim into dev…
akutuzov Dec 15, 2016
b4b8d14
Remove unneccessary.
akutuzov Dec 15, 2016
2429dc4
Changing the neame of the word pairs evaluation function.
akutuzov Dec 16, 2016
ad6b268
Merge branch 'develop' into develop
tmylk Dec 22, 2016
fddbc0a
Merge remote-tracking branch 'upstream/develop' into develop
akutuzov Dec 26, 2016
910a511
Wordsim353 dataset added.
akutuzov Dec 26, 2016
54e0ba2
Fixed bug in evaluate_word_pairs.
akutuzov Dec 27, 2016
41f8f8e
Tests for evaluate_word_pairs function.
akutuzov Dec 27, 2016
9dfbac5
Atrributing Wordsim353 dataset.
akutuzov Dec 27, 2016
5899610
Merge remote-tracking branch 'upstream/develop' into develop
akutuzov Dec 28, 2016
11c9afb
Test for out-of-vocabulary pairs in evaluate_word_pairs.
akutuzov Dec 28, 2016
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
Fixed bug in evaluate_word_pairs.
akutuzov committed Dec 27, 2016
commit 54e0ba257c86ec503d06927f9df1264862f5f9fb
3 changes: 1 addition & 2 deletions gensim/models/word2vec.py
Original file line number Diff line number Diff line change
@@ -1402,7 +1402,7 @@ def log_evaluate_word_pairs(pearson, spearman, oov, pairs):
return KeyedVectors.log_evaluate_word_pairs(pearson, spearman, oov, pairs)

def evaluate_word_pairs(self, pairs, delimiter='\t', restrict_vocab=300000, case_insensitive=True, dummy4unknown=False):
return self.wv.evaluate_word_pairs(self, pairs, delimiter, restrict_vocab, case_insensitive, dummy4unknown)
return self.wv.evaluate_word_pairs(pairs, delimiter, restrict_vocab, case_insensitive, dummy4unknown)

def __str__(self):
return "%s(vocab=%s, size=%s, alpha=%s)" % (self.__class__.__name__, len(self.wv.index2word), self.vector_size, self.alpha)
@@ -1629,4 +1629,3 @@ def __iter__(self):
model.accuracy(args.accuracy)

logger.info("finished running %s", program)