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

restyle API Ref #2102

Closed
wants to merge 62 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
c46cddf
Reformat apiref.rst
anotherbugmaster Dec 20, 2017
b7e882c
Walkaround reference bug
anotherbugmaster Dec 20, 2017
0092c16
Merge upstream
anotherbugmaster Dec 20, 2017
3ff14b8
Merge upstream
anotherbugmaster Jan 8, 2018
1d9c13f
Workaround link bug
anotherbugmaster Jan 8, 2018
fe6b60e
Add 'The'
anotherbugmaster Jan 8, 2018
0b9a135
Rearrange modules
anotherbugmaster Jan 9, 2018
af1551b
Merge upstream
anotherbugmaster Jan 22, 2018
8fa1691
Remove redundant "This package..."
anotherbugmaster Jan 23, 2018
74dcb42
Move docs/src/* -> docs/*
anotherbugmaster Feb 6, 2018
4695125
Add legacy apiref
anotherbugmaster Feb 19, 2018
4e5d176
Merge remote-tracking branch 'upstream/develop' into fix_1808
anotherbugmaster Feb 19, 2018
15e418d
Fix fasttext references
anotherbugmaster Feb 19, 2018
6c29149
Merge remote-tracking branch 'upstream/develop' into fix_1808
anotherbugmaster Feb 19, 2018
9dfcb68
Restore static files
anotherbugmaster Feb 19, 2018
6e9d372
Add js
anotherbugmaster Feb 19, 2018
9d7c3a8
Restore .html
anotherbugmaster Feb 19, 2018
695b452
Make an exception for _static/js in .gitignore
anotherbugmaster Feb 19, 2018
c9dcfac
Document certain special members
anotherbugmaster Feb 19, 2018
15c2ef7
Add downloader's userguide
anotherbugmaster Feb 19, 2018
034137b
Fix circleci config
anotherbugmaster Feb 19, 2018
2b07283
Fix gensim_theme static
anotherbugmaster Feb 20, 2018
3e7519d
Fix some issues
anotherbugmaster Feb 23, 2018
003d038
Merge upstream
anotherbugmaster Feb 23, 2018
7b15419
Fix some more issues
anotherbugmaster Feb 23, 2018
97c8ba3
Make link to legacy version of apiref
anotherbugmaster Feb 23, 2018
6a29c91
Fix cyclic import
anotherbugmaster Feb 23, 2018
58a46ae
They're back!
anotherbugmaster Feb 23, 2018
3b3fbb8
Merge upstream
anotherbugmaster Feb 23, 2018
63d296c
C Matutils
anotherbugmaster Feb 24, 2018
7b4e100
Fix circleci path
anotherbugmaster Feb 24, 2018
52c39e9
Remove redundant examples
anotherbugmaster Feb 24, 2018
357a468
Convert tabs to spaces
anotherbugmaster Feb 24, 2018
b100d86
Change line endings
anotherbugmaster Feb 24, 2018
dec5338
Merge remote-tracking branch 'upstream/develop' into fix_1808
anotherbugmaster Feb 24, 2018
57c5dd3
Revert "Change line endings"
anotherbugmaster Feb 24, 2018
be0917e
Fix line endings (probably)
anotherbugmaster Feb 24, 2018
541378e
Fix
anotherbugmaster Feb 24, 2018
b16c392
Fix awkward docstring
anotherbugmaster Feb 24, 2018
7313d2a
Fix references
anotherbugmaster Feb 24, 2018
a08fac9
Fix redundant copying of .html
anotherbugmaster Feb 25, 2018
c610958
Fix flake8
anotherbugmaster Feb 25, 2018
f1f37d8
Merge remote-tracking branch 'upstream/develop' into fix_1808
anotherbugmaster Feb 25, 2018
7313808
Add arrows and unify Workers and Dispatchers
anotherbugmaster Feb 27, 2018
18b8b15
Add example example :)
anotherbugmaster Feb 27, 2018
f058879
Add soft cosine similarity
anotherbugmaster Feb 27, 2018
05e9979
Fix models docstring
anotherbugmaster Feb 27, 2018
2a98a19
Fix backticks bug
anotherbugmaster Mar 2, 2018
4763459
Add C Matutils
anotherbugmaster Mar 2, 2018
7369597
Refine scripts reference|
anotherbugmaster Mar 2, 2018
7a781b2
Merge branch 'develop' into fix_1808
menshikh-iv Mar 15, 2018
247e36e
Merge branch 'develop' into fix_1808
piskvorky Jun 25, 2018
cca7185
fix docs in lda_worker and dispatcher scripts
piskvorky Jun 25, 2018
0c63dbb
Merge
anotherbugmaster Jun 27, 2018
beccb35
Merge
anotherbugmaster Jun 27, 2018
aff50e9
Remove redundant rsts
anotherbugmaster Jun 27, 2018
3f250ce
Merge branch 'develop' into fix_1808
piskvorky Jun 27, 2018
2e2714a
Fix conflicts
anotherbugmaster Jun 28, 2018
794cb7f
Fix flake8
anotherbugmaster Jun 28, 2018
dddf3ad
Fix long line
anotherbugmaster Jun 28, 2018
ba62750
Merge remote-tracking branch 'origin/develop' into fix_1808
menshikh-iv Jul 5, 2018
a7cbd9f
return back moving html files
menshikh-iv Jul 5, 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
1 change: 0 additions & 1 deletion docs/src/apiref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,6 @@ Functions
unitvec
cossim
isbow
convert_vec
kullback_leibler
jensen_shannon
hellinger
Expand Down
9 changes: 0 additions & 9 deletions docs/src/models/_utils_any2vec.rst

This file was deleted.

10 changes: 0 additions & 10 deletions docs/src/models/base_any2vec.rst

This file was deleted.

9 changes: 0 additions & 9 deletions docs/src/models/doc2vec_inner.rst

This file was deleted.

9 changes: 0 additions & 9 deletions docs/src/models/fasttext_inner.rst

This file was deleted.

9 changes: 0 additions & 9 deletions docs/src/models/utils_any2vec.rst

This file was deleted.

9 changes: 0 additions & 9 deletions docs/src/models/word2vec_inner.rst

This file was deleted.

6 changes: 3 additions & 3 deletions gensim/matutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def ismatrix(m):


def any2sparse(vec, eps=1e-9):
"""Convert a numpy.ndarray or `scipy.sparse` vector into the Gensim bag-of-words format.
"""Convert a `numpy.ndarray` or `scipy.sparse` vector into the Gensim bag-of-words format.

Parameters
----------
Expand Down Expand Up @@ -316,7 +316,7 @@ def scipy2scipy_clipped(matrix, topn, eps=1e-9):


def scipy2sparse(vec, eps=1e-9):
"""Convert a scipy.sparse vector into the Gensim bag-of-words format.
"""Convert a `scipy.sparse` vector into the Gensim bag-of-words format.

Parameters
----------
Expand Down Expand Up @@ -551,7 +551,7 @@ def __len__(self):


class Sparse2Corpus(object):
"""Convert a matrix in scipy.sparse format into a streaming Gensim corpus.
"""Convert a matrix in `scipy.sparse` format into a streaming Gensim corpus.

See Also
--------
Expand Down
6 changes: 4 additions & 2 deletions gensim/models/tfidfmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,12 @@ def __init__(self, corpus=None, id2word=None, dictionary=None, wlocal=utils.iden
Only when `pivot` is not None will pivoted document length normalization be applied.
Otherwise, regular TfIdf is used.
slope : float, optional
Parameter required by pivoted document length normalization which determines the slope to which
the `old normalization` can be tilted. This parameter only works when `pivot` is defined.
It is the parameter required by pivoted document length normalization which determines the slope to which
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regression (PR contained had a newer, fixed version).

Out of curiosity -- what was this conflict from? This branch was already up-to-date with develop.

the `old normalization` can be tilted. This parameter only works when pivot is defined by user and is not
None.

"""

self.id2word = id2word
self.wlocal, self.wglobal, self.normalize = wlocal, wglobal, normalize
self.num_docs, self.num_nnz, self.idfs = None, None, None
Expand Down