Søren Lind Kristiansen
97ff496bad
Merge branch 'master' into da_ud_tokenization
2017-12-20 18:22:39 +01:00
Ines Montani
8afe767465
Merge pull request #1747 from mpuels/patch-8
...
doc: Fix typo
2017-12-20 17:04:40 +00:00
Søren Lind Kristiansen
15d13efafd
Tune Danish tokenizer to more closely match tokenization in Universal Dependencies.
2017-12-20 17:36:52 +01:00
mpuels
5dcf0c1811
doc: Fix typo
2017-12-20 17:21:29 +01:00
Ines Montani
f920574f39
Merge pull request #1735 from mdda/patch-2
...
Documentation example fix : token.head needs '==' rather than 'is'
2017-12-19 14:59:19 +00:00
Martin Andrews
200c4c6685
Merge pull request #1 from mdda/master
...
Create mdda.md
2017-12-18 18:26:49 +08:00
Martin Andrews
e4355dade2
Documentation example fix : token.head needs '==' rather than 'is'
...
(similar change to #1689 , it seems).
2017-12-18 18:12:10 +08:00
Martin Andrews
67de1ad11e
Create mdda.md
2017-12-18 18:09:27 +08:00
Ines Montani
c2159c77c5
Update CONTRIBUTING.md
2017-12-17 15:27:04 +01:00
Ines Montani
004bd24896
Merge pull request #1731 from d99kris/patch-1
...
Fix typo Span -> Token on Token API page
2017-12-17 12:45:34 +00:00
Ines Montani
a6dd746454
Merge pull request #1732 from d99kris/patch-2
...
Add d99kris to contributors
2017-12-17 12:45:11 +00:00
Ines Montani
1a400ac874
Rename d99kris to d99kris.md
2017-12-17 13:44:55 +01:00
Kristofer Berggren
cacdf4ad19
Add d99kris to contributors
...
Add myself (d99kris) to spaCy Contributor Agreement, for PR https://github.com/explosion/spaCy/pull/1731
2017-12-17 20:43:23 +08:00
Kristofer Berggren
1cb8c997fb
Fix typo Span -> Token on Token API page
...
Change Span.vector_norm to Token.vector_norm.
2017-12-17 20:32:19 +08:00
Ines Montani
4befd8bd44
Merge pull request #1724 from mpuels/patch-7
...
doc: Fix minor mistakes
2017-12-17 12:09:17 +00:00
ines
22dc744b48
Fix check for '@' in like_url (see #1715 )
2017-12-16 13:48:43 +01:00
ines
21482b391b
Fix head
2017-12-16 13:48:19 +01:00
mpuels
b3df2a2ffd
doc: Fix minor mistakes
2017-12-14 20:55:59 +01:00
Ines Montani
7a6f24a194
Merge pull request #1720 from mpuels/patch-6
...
doc: Fix minor mistakes
2017-12-13 11:11:59 +00:00
Ines Montani
aad26965bd
Merge pull request #1719 from mpuels/patch-5
...
fix: Add missing period in train data
2017-12-13 11:10:57 +00:00
mpuels
3f7bedadee
doc: Fix minor mistakes
2017-12-13 11:37:24 +01:00
mpuels
1e8147aec7
fix: Add missing period in train data
2017-12-13 10:51:05 +01:00
Ines Montani
1e61fffd0a
Merge pull request #1715 from Bri-Will/master ( resolves #1698 )
...
Update lex_attrs.py. Fix like_url from matching on e-mail
2017-12-12 10:50:10 +00:00
Ines Montani
9c1ee65268
Add regression test for #1698
2017-12-12 10:36:11 +01:00
Ines Montani
6455b574fc
Check for email address first
2017-12-12 10:25:13 +01:00
Bri-Will
afd9fc9d36
Adds contributor agreement for Bri-Will
2017-12-11 14:38:37 -08:00
Bri-Will
d77361d76c
Update lex_attrs.py. Fix like_url from matching on e-mail
2017-12-11 14:13:28 -08:00
Ines Montani
08e2c77368
Merge pull request #1710 from sorenlind/init_model_plac
...
Remove abbreviation for positional plac argument
2017-12-11 15:15:11 +00:00
Søren Lind Kristiansen
5a9d377580
Remove abbreviation for positional plac argument
2017-12-11 11:08:29 +01:00
Ines Montani
9b25605c3b
Merge pull request #1708 from IsaacHaze/issue_1622 ( fixes #1622 )
...
Fix Issue 1622
2017-12-11 01:23:59 +00:00
Isaac Sijaranamual
38021fbb00
Switch from python 3 only TemporaryDirectory to pytest's tmpdir
2017-12-11 00:16:04 +01:00
Isaac Sijaranamual
f32c6630cb
Adds contributor agreement IsaacHaze
2017-12-10 23:15:06 +01:00
Isaac Sijaranamual
20ae0c459a
Fixes "Error saving model" #1622
2017-12-10 23:07:13 +01:00
Isaac Sijaranamual
568130ce7c
Adds regression test_issue1622
2017-12-10 23:00:48 +01:00
Isaac Sijaranamual
e188b61960
Make cli/train.py not eat exception
2017-12-10 22:53:08 +01:00
ines
020a7e5d52
Allow 'fine_grained' option in displaCy (see #1703 )
...
Shows token.tag_ instead of token.pos_. Disabled by default, to not cause rendering issues for models with long fine-grained tags (e.g. merged morphological features).
2017-12-09 15:11:12 +01:00
Ines Montani
d8dd484dc0
Merge pull request #1705 from mpuels/patch-4
...
Fix typo in comment
2017-12-09 14:02:50 +00:00
mpuels
ee4d6fdd40
Fix typo in comment
2017-12-09 13:14:57 +01:00
Ines Montani
51d3ab2137
Revert contributor agreement to empty form
2017-12-07 16:22:30 +01:00
Matthew Honnibal
3b17eb7c49
Merge branch 'master' of https://github.com/explosion/spaCy
2017-12-07 10:39:32 +01:00
Matthew Honnibal
a6b43729c6
Set version to v2.0.5
2017-12-07 10:39:14 +01:00
ines
5eaa61c2b8
Fix formatting
2017-12-07 10:23:09 +01:00
ines
24e80c51b8
Document init-model command
2017-12-07 10:14:37 +01:00
Matthew Honnibal
c91f451b0f
Fix imports and CLI in init-model
2017-12-07 10:03:07 +01:00
ines
82e80ff928
Rename model command to init_model and fix formatting
2017-12-07 09:59:23 +01:00
Ines Montani
2feeb428d6
Merge pull request #1646 from GreenRiverRUS/master
...
Added model command to create models from raw data
2017-12-07 08:54:26 +00:00
Matthew Honnibal
6373d2580d
Increment version to v2.0.5.dev0
2017-12-07 09:53:59 +01:00
Matthew Honnibal
36b47e3fa6
Fix (and test) vector pickling
2017-12-07 09:53:30 +01:00
Ines Montani
2ae4755def
Merge pull request #1689 from mpuels/patch-3
...
doc: Replace 'is not' with '!=' in code example
2017-12-07 06:10:28 +00:00
mpuels
e3af19a076
doc: Replace 'is not' with '!=' in code example
...
The function `dependency_labels_to_root(token)` defined in section *Get syntactic dependencies* does not terminate. Here is a complete example:
import spacy
nlp = spacy.load('en')
doc = nlp("Apple and banana are similar. Pasta and hippo aren't.")
def dependency_labels_to_root(token):
"""Walk up the syntactic tree, collecting the arc labels."""
dep_labels = []
while token.head is not token:
dep_labels.append(token.dep)
token = token.head
return dep_labels
dep_labels = dependency_labels_to_root(doc[1])
dep_labels
Replacing `is not` with `!=` solves the issue:
import spacy
nlp = spacy.load('en')
doc = nlp("Apple and banana are similar. Pasta and hippo aren't.")
def dependency_labels_to_root(token):
"""Walk up the syntactic tree, collecting the arc labels."""
dep_labels = []
while token.head != token:
dep_labels.append(token.dep)
token = token.head
return dep_labels
dep_labels = dependency_labels_to_root(doc[1])
dep_labels
The output is
['cc', 'nsubj']
2017-12-06 20:08:42 +01:00
