Added more examples and test to Meronym and Holonym #28

gconnect · 2020-09-15T12:49:24Z

What this PR Does

This PR fixes #26 and #31

More examples with the link reference
Test and
Conditions
Project-specific links

Todo:

The reference example links should be clickable
Modify the XML to follow the AB style guide

edit: changed "fixes" issue from 28 to 26

fcbond · 2020-09-16T04:26:09Z

Hi,

I would rather have a single pull request with the documentation close to complete, rather than adding things bit by bit. Or make it clear what is done and what not done.

Currently, this is still missing:

checking of project specific links
- https://metacpan.org/pod/WordNet::QueryData
- plWordnet
- PWN I think is ok, ..
Examples and tests for each relation.
links to references

Linking examples to OMW can maybe be left until the macro issue is resolved

gconnect · 2020-09-16T06:15:27Z

If I get you correctly, documentation for all relations should be complete before I raise a PR? And what should I do about this particular PR after adding those extras you pointed out?

fcbond · 2020-09-16T06:25:45Z

You can either redo this PR, or withdraw it and make a new one.

…

On Wed, Sep 16, 2020 at 2:15 PM Glory Agatevure ***@***.***> wrote: If I get you correctly, documentation for all relations should be complete before I raise a PR? And what should I do about this particular PR after adding those extras you pointed out? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#28 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAIPZRQMQP5MYWZPWJRLFJLSGBJYZANCNFSM4RNCUHJQ> .

-- Francis Bond <http://www3.ntu.edu.sg/home/fcbond/> Division of Linguistics and Multilingual Studies Nanyang Technological University

goodmami · 2020-09-16T06:32:24Z

Let me interject. This is not the main branch but the gsod one. Personally I think small merges are fine, maybe even preferable. I'd rather not have to review a PR that does too many things at once.

@gconnect Before withdrawing the PR, let me talk this over with Francis and get back to you so we agree on the proper procedure.

fcbond · 2020-09-16T13:17:00Z

Apparently you don't have to withdraw, just add commits and it will update the pull request.

goodmami · 2020-09-16T13:49:55Z

@gconnect Hi, I spoke with Francis and I think we agree. Let me try to summarize. Small pull requests are fine, but it's best if they can be "complete" in some sense. This means that if the pull request is for adding information about 1 or 2 relations, all the relevant information is included. Furthermore, the pull request should not bundle unrelated changes (e.g., a UI or settings change). The purpose of these guidelines is to make reviewing the pull request easier (it's easiest when we can clearly see all the relevant changes without other noise) and to keep the Git history clean (so later we can point to where something changed).

Francis didn't realize that you can keep adding commits to the same pull request, which is why he suggested closing it and opening a new one. Since that is possible, there's no need to close this one.

I hope that clarifies things!

gconnect · 2020-09-21T11:08:37Z

Hi,

I would rather have a single pull request with the documentation close to complete, rather than adding things bit by bit. Or make it clear what is done and what not done.

Currently, this is still missing:

checking of project specific links

https://metacpan.org/pod/WordNet::QueryData

plWordnet

PWN I think is ok, ..

Examples and tests for each relation.

links to references

Linking examples to OMW can maybe be left until the macro issue is resolved

I am not sure what to do with the information provided here https://metacpan.org/pod/WordNet::QueryData

* Rebuild the sidenav bar Rebuild the sidenav bar so that we can use build.py to generate it. * Remove local jquery Use <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script> instead * fix the plus icon bug the icon bug has been fixed and the css has been revised per Francis's suggestions.

* Rebuild the sidenav bar Rebuild the sidenav bar so that we can use build.py to generate it. * Remove local jquery Use <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script> instead * fix the plus icon bug the icon bug has been fixed and the css has been revised per Francis's suggestions. Co-authored-by: yoyo-go <56577574+yoyo-go@users.noreply.github.com>

goodmami

It is hard to review this because the merged commits are showing up as diffs for this PR as well. It would be better if the new commits were rebased on the the others so only the new ones are included here.

goodmami · 2020-09-29T05:54:50Z

gwadoc/doc_en.py

 """
 relations.meronym.ex.en = "hand/finger"
 relations.meronym.exe.en = """
+ * *<sense: pwn-3.0:04574999-n:wheel>* ``meronym`` *<sense: pwn-3.0:02958343-n:automobile>*
+ * *<sense: pwn-3.0:03138534-n:crown>* ``meronym`` *<sense: pwn-3.0:03497657-n:hat>*
+ * *<sense: pwn-3.0:05217168-n:human body>* ``meronym`` *<sense: pwn-3.0:00007846-n:person>*


For these I think we will do our own substitution, so they can be changed to a form like this:

* `wheel <ILIURL/61096>`_ is a ``meronym`` of `wheeled vehicle <ILIURL/61100>`_

Where ILIURL is that exact string and it will get replaced during the build process.

I will effect the changes. Thanks

gconnect · 2020-09-29T12:38:38Z

It is hard to review this because the merged commits are showing up as diffs for this PR as well. It would be better if the new commits were rebased on the the others so only the new ones are included here.

How do I go about it?

goodmami · 2020-09-29T12:52:08Z

How do I go about it?

Actually that's a good question. I don't want to make things too difficult, so maybe we should just proceed with the duplicated commits for now, and I will cherry-pick the relevant commits when I merge the gsod branch into the master branch. In other words, don't worry about it for now.

goodmami

Just a few minor things. Once those are fixed I'll handle the merge. Please only commit the changes to doc_en.py and do not commit the generated HTML files.

gwadoc/doc_en.py

goodmami · 2020-10-04T15:02:35Z

I resolved the conflicts locally then merged. After the merge I noticed that the examples for meronym and holonym are backwards and/or need to be double-checked. I'll take a look at that tomorrow.

goodmami · 2020-10-05T02:31:54Z

I pushed fixes for the examples in 1619432

fcbond and others added 2 commits September 11, 2020 11:58

added a link to the EWN documentation

9352649

Added more examples and test

bbf508e

yoyo-go and others added 10 commits September 23, 2020 13:14

Added more examples and test

9b868a2

Changed the macros url

7b55fb6

Merge branch 'master' of https://github.com/globalwordnet/gwadoc

b23bbf8

added urls for the projects; closes globalwordnet#30

0e25c9d

Added reference link to the examples

0f37707

fixed conflict

8e5961a

fixed conflict

2b736ce

Changes to index after build

2af7273

goodmami requested changes Sep 29, 2020

View reviewed changes

Added links to the examples

4635a44

goodmami requested changes Oct 4, 2020

View reviewed changes

gwadoc/doc_en.py Outdated Show resolved Hide resolved

gwadoc/doc_en.py Outdated Show resolved Hide resolved

Added space and changed meronym to holonym

66b2f11

goodmami approved these changes Oct 4, 2020

View reviewed changes

goodmami merged commit 4845293 into globalwordnet:gsod Oct 4, 2020

gconnect mentioned this pull request Oct 10, 2020

ili links to compling which is down #31

Open

gconnect deleted the meronym-holonym-update branch November 18, 2020 15:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added more examples and test to Meronym and Holonym #28

Added more examples and test to Meronym and Holonym #28

gconnect commented Sep 15, 2020 •

edited by goodmami

Loading

fcbond commented Sep 16, 2020

gconnect commented Sep 16, 2020

fcbond commented Sep 16, 2020 via email

goodmami commented Sep 16, 2020

fcbond commented Sep 16, 2020

goodmami commented Sep 16, 2020

gconnect commented Sep 21, 2020

goodmami left a comment

goodmami Sep 29, 2020

gconnect Sep 29, 2020

gconnect commented Sep 29, 2020

goodmami commented Sep 29, 2020

goodmami left a comment

goodmami commented Oct 4, 2020

goodmami commented Oct 5, 2020

Added more examples and test to Meronym and Holonym #28

Added more examples and test to Meronym and Holonym #28

Conversation

gconnect commented Sep 15, 2020 • edited by goodmami Loading

fcbond commented Sep 16, 2020

gconnect commented Sep 16, 2020

fcbond commented Sep 16, 2020 via email

goodmami commented Sep 16, 2020

fcbond commented Sep 16, 2020

goodmami commented Sep 16, 2020

gconnect commented Sep 21, 2020

goodmami left a comment

Choose a reason for hiding this comment

goodmami Sep 29, 2020

Choose a reason for hiding this comment

gconnect Sep 29, 2020

Choose a reason for hiding this comment

gconnect commented Sep 29, 2020

goodmami commented Sep 29, 2020

goodmami left a comment

Choose a reason for hiding this comment

goodmami commented Oct 4, 2020

goodmami commented Oct 5, 2020

gconnect commented Sep 15, 2020 •

edited by goodmami

Loading