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

Documentation and Summary page improvements #321

Merged
merged 20 commits into from
Jun 22, 2024
Merged

Conversation

gaurav
Copy link
Member

@gaurav gaurav commented Feb 28, 2024

  • Added note that definition should include qualifiers (closes Add support for documenting qualifiers in clade definitions #168)
  • Documented the CSV export format (related to Document CSV export format #257, but I won't close that until I like to it from somewhere in the interface) as a Markdown file.
  • Fixed a bug in which we were providing all the expected resolutions before all the actual resolution in the CSV file, despite the header saying that they should be interleaved (i.e. expected 1, actual 1, expected 2, actual 2).
  • The Open Tree of Life lookup code was previously recording the provenance of the phylogeny in the phylogeny description field, but since this field is no longer used, I've moved it into the phylogeny curator notes field (see example below).
  • I accidentally turned on "reformat file on save", and so my IDE changed a bunch of file formatting without me noticing. That shouldn't change any functionality and should be easier to read/maintain in the future, but it's still annoying.

This PR also closes #300 by modifying the summary table to make it clear that the final columns refer to phylogenies and replacing phylogeny descriptions (which are no longer displayed in Klados) with phylogeny curator notes.

Screenshot 2024-02-28 at 12 07 30 AM Screenshot 2024-02-28 at 12 07 42 AM

@gaurav gaurav changed the title Multiple documentation fixes Multiple documentation improvements Feb 28, 2024
@gaurav gaurav changed the title Multiple documentation improvements Documentation and Summary page improvements Feb 28, 2024
@gaurav gaurav marked this pull request as ready for review February 28, 2024 05:11
@gaurav gaurav requested a review from hlapp February 28, 2024 05:11
@gaurav
Copy link
Member Author

gaurav commented Feb 28, 2024

  • No need to add "(including qualifiers)" -- free-form text already says I can write whatever I want.

Copy link
Member

@hlapp hlapp left a comment

Choose a reason for hiding this comment

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

See inline notes. Perhaps a bit of a mess left from copy&paste?

docs/ExportFormats.md Outdated Show resolved Hide resolved
docs/ExportFormats.md Outdated Show resolved Hide resolved
docs/ExportFormats.md Outdated Show resolved Hide resolved
docs/ExportFormats.md Outdated Show resolved Hide resolved
src/components/phyloref/PhylorefView.vue Outdated Show resolved Hide resolved
docs/ExportFormats.md Outdated Show resolved Hide resolved
docs/ExportFormats.md Show resolved Hide resolved
docs/ExportFormats.md Outdated Show resolved Hide resolved
@gaurav
Copy link
Member Author

gaurav commented Apr 10, 2024

Thanks for the feedback, @hlapp! I've rewritten the "expected" and "actual" column descriptions as following:

  • Phylogeny: [Phylogeny label] expected: The label of the node in the specified phylogeny to which the phyloreference was expected to resolve by the author.
    • Example: Alligatoridae
  • Phylogeny: [Phylogeny label] actual: The label of the node actually resolved in the specified phylogeny to which the phyloreference was expected to resolve by the author.
    • Example: Alligatoridae_ott195670, or (unlabelled) if the node has no label

Is this clear?

The N in these descriptions was a defunct description of what we do if a phylogeny is unlabeled; in this case, instead of labeling this column Phylogeny: [Phylogeny label] expected, we use Phylogeny [Phylogeny index] expected, e.g. Phylogeny 1 expected. Should we include this information in this documentation as well? We could also use Phylogeny: [Phylogeny index] expected so they're a bit more similar to each other. What do you think?

@gaurav gaurav requested a review from hlapp April 10, 2024 08:03
* `Phylogeny: [Phylogeny label] expected`: The label of the node in the specified phylogeny to which the phyloreference was expected to resolve by the author.
* Example: `Alligatoridae`
* `Phylogeny: [Phylogeny label] actual`: The label of the node actually resolved in the specified phylogeny to which the phyloreference was expected to resolve by the author.
* Example: `Alligatoridae_ott195670`, or `(unlabelled)` if the node has no label
Copy link
Member

Choose a reason for hiding this comment

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

Isn't it Tidy Data practice to have NA or an equivalent value representation to signify that there is no value? Why should we make up a special string to signify the absence of a value? Or is this the special value that's already present on the phylogeny?

Copy link
Member Author

Choose a reason for hiding this comment

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

The idea behind (unlabelled) was to distinguish between the case where a phyloref doesn't resolve at all (I think we currently represent this as blank in the Phylogeny: [Phylogeny label] actual field) and the case where it does resolve, but it does so on a node that doesn't have a label. Some options:

  • NA for unlabelled node and blank for no resolution
  • (unlabelled) (or some other standard string) for unlabelled node and NA (or some other string, e.g. (could not resolve), None) for no resolution
  • NA: unlabelled node vs NA: could not resolve
  • We could use the internal node identifier, which looks something like #phylogeny0_node0, if the resolved node is unlabelled and blank if the phyloref could not be resolved
  • Add additional Phylogeny: [Phylogeny label] error column, which is blank unless the ... actual column is NA.

What do you think?

Copy link
Member

Choose a reason for hiding this comment

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

Perhaps this: We could use the internal node identifier, which looks something like #phylogeny0_node0, if the resolved node is unlabelled and blank if the phyloref could not be resolved?

But on reflection, using (unlabelled) and (could not resolve) seem at least as clear if not clearer.

Copy link
Member Author

Choose a reason for hiding this comment

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

But on reflection, using (unlabelled) and (could not resolve) seem at least as clear if not clearer.

Agreed! I've implemented this in 5464ea6.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've made this a bit clearer in d9f349f:

  • Phylogeny: [Phylogeny label] expected: The label of the node in the specified phylogeny to which the phyloreference was expected to resolve.
    • Example: Alligatoridae
    • Will be set to (none) if no expected node was found.
  • Phylogeny: [Phylogeny label] actual: The label of the node actually resolved for this phyloreference in the specified phylogeny.
    • Example: Alligatoridae_ott195670
    • Will be set to (resolution not yet run) if resolution has not yet been run.
    • Will be set to (could not resolve) if this phyloreference could not be resolved.
    • Will be set to (unlabelled) if a node was resolved, but it had no label.

@hlapp
Copy link
Member

hlapp commented Apr 10, 2024

See inline note. @gaurav can you comment, fix, and/or clarify?

@gaurav gaurav requested a review from hlapp May 8, 2024 05:59
@hlapp
Copy link
Member

hlapp commented Jun 3, 2024

I'm having trouble parsing The label of the node actually resolved in the specified phylogeny to which the phyloreference was expected to resolve by the author in contrast to The label of the node in the specified phylogeny to which the phyloreference was expected to resolve by the author. In the first case, is the node to which the phyloreference is found to resolve different from what the author seems to have expected, or is it the node's label that different from what the author seemed to have expected?

@gaurav
Copy link
Member Author

gaurav commented Jun 19, 2024

I'm having trouble parsing The label of the node actually resolved in the specified phylogeny to which the phyloreference was expected to resolve by the author in contrast to The label of the node in the specified phylogeny to which the phyloreference was expected to resolve by the author. In the first case, is the node to which the phyloreference is found to resolve different from what the author seems to have expected, or is it the node's label that different from what the author seemed to have expected?

Ugh, yes, that's a bit of a mess. How about:

  • Phylogeny: [Phylogeny label] expected: The label of the node in the specified phylogeny to which the phyloreference was expected to resolve.
  • Phylogeny: [Phylogeny label] actual: The label of the node actually resolved for this phyloreference in the specified phylogeny.

I've implemented this change in 2003205.

@gaurav gaurav requested review from hlapp and removed request for hlapp June 19, 2024 06:52
Copy link
Member

@hlapp hlapp left a comment

Choose a reason for hiding this comment

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

Looks all good, finally 👍

@gaurav gaurav merged commit fa4a8d8 into master Jun 22, 2024
@gaurav gaurav deleted the improve-documentation branch June 22, 2024 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve the Phyx summary page Add support for documenting qualifiers in clade definitions
2 participants