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

Adv+ac/phylogenetic trees #3255

Merged

Conversation

andreicomaneci
Copy link
Contributor

added phylogenetic functionalities in oscar

@benlorenz benlorenz changed the base branch from adv+ac/phylogenetic-trees to master January 30, 2024 09:09
@benlorenz
Copy link
Member

It might make sense to move the phylogenetic stuff to a separate file ?

Copy link

codecov bot commented Feb 7, 2024

Codecov Report

Merging #3255 (52f14ee) into master (f1637d7) will increase coverage by 0.02%.
Report is 1 commits behind head on master.
The diff coverage is 80.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3255      +/-   ##
==========================================
+ Coverage   81.82%   81.84%   +0.02%     
==========================================
  Files         556      557       +1     
  Lines       74358    74410      +52     
==========================================
+ Hits        60843    60903      +60     
+ Misses      13515    13507       -8     
Files Coverage Δ
src/Combinatorics/Graphs/structs.jl 100.00% <100.00%> (ø)
src/Oscar.jl 61.03% <ø> (ø)
src/Combinatorics/PhylogeneticTrees.jl 95.12% <95.12%> (ø)
src/Serialization/polymake.jl 77.27% <0.00%> (-12.21%) ⬇️
src/Serialization/Combinatorics.jl 52.00% <0.00%> (-13.00%) ⬇️

... and 1 file with indirect coverage changes

docs/src/Combinatorics/phylogenetic_trees.md Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
src/Combinatorics/PhylogeneticTrees.jl Outdated Show resolved Hide resolved
Copy link
Member

@benlorenz benlorenz left a comment

Choose a reason for hiding this comment

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

Thanks

@antonydellavecchia antonydellavecchia merged commit 88268a6 into oscar-system:master Feb 13, 2024
23 checks passed
ooinaruhugh pushed a commit to ooinaruhugh/Oscar.jl that referenced this pull request Feb 15, 2024
* Some helpful functions for MPI meeting

* phylogenetic trees

* some clean up

* get properties with julia types

* Tropical median consensus added

* export consensus

* docs for phylo functions

* doc tropical median consensus

* tropical_median_consensus to md file

* add intro doc phylogenetics

* added some test skeleton and some docs

* remove doc for now

* added more stuff to tests

* add fix for QQField matrix type

* fix printing

* fix tests

* eliminate duplicate in exports.jl

* remove the unused param T

* change where T in Varargs{phylo}

* removed spaces around where

* change deprecated where

* this might fix the export issues

* removed undefined method from exports

* trying to fix arg types

* fixing vararg

* removed swp file

* add undirected adjacency

* i think this might work

* remove vararg function

* trying again with signature

* use splat

* adjacency_tree returns a directed graph now

* update tests

* makes some type and signature fixes and adjustments to tests

* Revert "Merge remote-tracking branch 'andrei/adv+ac/phylogenetic-trees' into adv+ac/phylogenetic-trees"

This reverts commit 38f47b2, reversing
changes made to 09ac0f8.

* moves graph from edges up out of phylo trees section

* some restructuring

* Revert "some restructuring"

This reverts commit 0a9d603.

* new phylogenetic trees file

* returning graph from edges to the bottom of file + add include

* Update src/Combinatorics/Graphs/functions.jl

* removed swp file

* Update src/Combinatorics/Graphs/functions.jl

* updates from review comments

* make Phylogenetic tree immutable

* Apply suggestions from code review

Co-authored-by: Benjamin Lorenz <[email protected]>

---------

Co-authored-by: Antony Della Vecchia <[email protected]>
Co-authored-by: antonydellavecchia <[email protected]>
Co-authored-by: Andrei Comaneci <[email protected]>
Co-authored-by: Benjamin Lorenz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants