Directory UNIT_TESTER/run/consense/2/

Directory Created:
2012-03-09 13:33
Total Files:
Deleted Files:
Lines of Code:


Lines of Code

UNIT_TESTER/run/consense/2/ Lines of Code


Author Changes Lines of Code Lines per Change
westram 13 (100.0%) 1468 (100.0%) 112.9

Most Recent Commits

westram 2014-04-13 13:39 Rev.: 12014

* reintegrates 'fix' into 'trunk'
- slightly changes consensus tree generation
* adds:
- log:branches/fix@12008,12012:12013

40 lines of code changed in 1 file:

  • UNIT_TESTER/run/consense/2: consense2_expected.tree (+40 -40)
westram 2013-12-26 12:48 Rev.: 11401

* reintegrates 'tree' into 'trunk':
- consensus trees:
* support for merging partial trees ("worked" before, but results were crap; implements #65)
* generated trees are automatically re-rooted and -ordered
* always list source trees in consensus-tree-comment; show info about partial trees
* fixed progress bar
- made GBT_TREE a base class of other tree classes (implements #31)
- save tree properties in properties (not in DB)
- new functions 'Remove zombies/marked from ALL trees'
- tree load/save: layout fixes
- unit tests
* added tests for basic tree modifications (PARSIMONY)
- performance:
* compute_tree updates tree information in one traversal
* tree generators are now capable to generate any type of tree (w/o needing to copy it once)
- bugfixes:
* NNI (of marked species) was also always performed for colored species
* centered beautify-order is stable now
* improved 'search optimal root'
* adds:
- log:branches/tree@10500:10534,10542:11182,11184:11186,11188:11400
- log:branches/treeTests@11198:11335

182 lines of code changed in 2 files:

  • UNIT_TESTER/run/consense/2: consense2_expected.tree (new 182), consense_expected.tree (del)
westram 2012-03-20 12:03 Rev.: 8507

* use double for weights ([0..1] instead of [0..10000])
* added tests using weights != 1
- fixed weight/length calculation to make generated consense tree independent from used weight (as long as the same weight is used for all added trees)
* no longer generates zero-bootstrap at root
- strictly speaking it is wrong now (since the edge from virtual root to tree cant exist, ergo it's probability should be zero)
- practically
* that zero probability would be a special case (and is an error at all other edges)
* a probability of 100% is used (which gets skipped when saving the tree)

2 lines of code changed in 1 file:

  • UNIT_TESTER/run/consense/2: consense_expected.tree (+2 -2)
westram 2012-03-14 09:54 Rev.: 8481

* define a strict order on partitions. criteria are
- partition-freq / "leaf-edgeness"
- min. edge->tip distance
- branchlen to subtree
- unique partition id
* insert partitions in that order + strictly sort sons at furcations
- generated trees no longer depend on hashkey, hence it no longer depends on names-order
- removed code to sort names before tree-generation
- removed code to sort trees afterwards
* insert leaf-edges as final step (they always fit)
* do not insert root-edge as final-step (often a leaf edge was used)
- instead insert it as first step (using the most-probable non-leaf-edge as root-edge)
* updated test-results
* removed ARB-legend from help
- there never was any smart method which removed "wandering" species from consensus trees, it just was an ancient bug

145 lines of code changed in 1 file:

  • UNIT_TESTER/run/consense/2: consense_expected.tree (+145 -145)
westram 2012-03-12 13:34 Rev.: 8475

* insert all childs at multifurcations with more than 2 subtrees
- now consense trees always contain all species of all input trees (fixes #182)
- generates multifurcations in tree
* update test-results
- since species were added to test-trees 2+3, their intree distances have grown

90 lines of code changed in 1 file:

  • UNIT_TESTER/run/consense/2: consense_expected.tree (+90 -36)
westram 2012-03-12 10:55 Rev.: 8471

* part_key generated negative hash keys
- that caused several lost partitions, resulting in invalid trees under certain circumstances
- fix changes test-results (tree generation depends on hash-keys)

112 lines of code changed in 1 file:

  • UNIT_TESTER/run/consense/2: consense_expected.tree (+112 -16)
westram 2012-03-11 18:03 Rev.: 8468

* branch-order (but not topology) of CONSENSUS_TREE depends on the order of the names passed to ctree_init [sic]
- the order of the names defines which species corresponds to which bit in partitions; these bits go into hash key which influences the order in which subtrees are added
- workaround: for tests, sort names before calling ctree_init => behaves deterministic
* !OccurCount was broken (same species in different input trees were handles as separate species)
* reactivated all tests
- updated expected results
- test-data no longer generates an invalid tree (as intended by [8455])
* arb_consensus_tree logs how many species have been inserted into the output tree
* use copies for save/expected name (behaved different in NDEBUG mode)

17 lines of code changed in 1 file:

  • UNIT_TESTER/run/consense/2: consense_expected.tree (+17 -158)
westram 2012-03-09 13:33 Rev.: 8458

* added second test (which drops some tree nodes)
- deactivated 1st test (due to non-deterministic behavior)
- DRYed both tests

880 lines of code changed in 5 files:

  • UNIT_TESTER/run/consense/2: bootstrapped_1.tree (new 178), bootstrapped_2.tree (new 178), bootstrapped_3.tree (new 178), bootstrapped_4.tree (new 178), consense_expected.tree (new 168)
Generated by StatSVN 0.7.0