Directory src/dr/evomodel/tree/

Total Files:
48
Deleted Files:
12
Lines of Code:
5267

[root]/src/dr/evomodel/tree
                    directory in repo randomlocalmodel (4 files, 42 lines)

Lines of Code

src/dr/evomodel/tree/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
Totals 410 (100.0%) 21834 (100.0%) 53.2
alexei.drummond 77 (18.8%) 7296 (33.4%) 94.7
msuchard 85 (20.7%) 6421 (29.4%) 75.5
rambaut 108 (26.3%) 4548 (20.8%) 42.1
bloomquist 16 (3.9%) 1386 (6.3%) 86.6
jheled 58 (14.1%) 750 (3.4%) 12.9
aaron.darling 4 (1.0%) 742 (3.4%) 185.5
akaruiws 6 (1.5%) 257 (1.2%) 42.8
Sebastian.Hoehna 6 (1.5%) 190 (0.9%) 31.6
baele.guy@gmail.com 2 (0.5%) 82 (0.4%) 41.0
Michael.DefoinPLatel 3 (0.7%) 60 (0.3%) 20.0
Sibon.Li@gmail.com 4 (1.0%) 59 (0.3%) 14.7
dong.w.xie 39 (9.5%) 32 (0.1%) 0.8
alexander.alekseyenko 2 (0.5%) 11 (0.1%) 5.5

Most Recent Commits

msuchard 2013-05-09 01:55 Rev.: 5640

Fixing TreeTransform applied to EmpiricalTreeDistribution (again)

6 lines of code changed in 6 files:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+2 -2), SingleScalarTreeTransform.java (new), TreeTransform.java (+2 -1)
msuchard 2013-05-08 07:20 Rev.: 5638

Incorrectly delegated getBranchLength() such that no transformation was occurring.

17 lines of code changed in 5 files:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+2 -2), SingleScalarTreeTransform.java (+2 -2), TransformedTreeModel.java (+11 -7), TreeTransform.java (+2 -2)
msuchard 2013-05-08 04:03 Rev.: 5637

Updated MultivariateTraitTree to work with EmpiricalTreeDistribution

10 lines of code changed in 3 files:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+1 -1), SingleScalarTreeTransform.java (+2 -2), TransformedTreeModel.java (+7 -4)
msuchard 2013-05-07 07:43 Rev.: 5635

Fixing transformed trees when random

249 lines of code changed in 2 files:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+3 -2), TransformedTreeModel.java (+246 -7)
msuchard 2013-05-06 15:27 Rev.: 5631

Finally interfacing multivariate traits, although they are now generally integrated out.

64 lines of code changed in 2 files:

  • src/dr/evomodel/tree: TreeModel.java (+64 -64)
baele.guy@gmail.com 2013-04-09 00:25 Rev.: 5565

New version of an additional method to copy a proposed tree into the current treeModel.

19 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+19 -11)
baele.guy@gmail.com 2013-03-24 01:04 Rev.: 5532

First version of an additional method to copy a proposed tree (for example, from the coalescentSimulator) into the current treeModel. At the moment, copying rates and traits is not yet implemented. These may need to be copied during a separate tree traversal, if the direct access to leftChild and rightChild cannot be circumvented ...

63 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+63)
rambaut 2013-03-14 00:00 Rev.: 5482

Created an 'AttributeBranchRateModel' which exposes an attribute embedded in a tree as a branch rate model.

2 lines of code changed in 2 files:

  • src/dr/evomodel/tree: EmpiricalTreeDistributionModel.java (+2 -61)
rambaut 2013-03-13 00:12 Rev.: 5477

Temporarily removed EmpricialTrees implementation of BranchRateModel as it was confusing the TreeLikelihood parser (which picked it up as the first BranchRateModel even when it is not being used as such).

3 lines of code changed in 1 file:

  • src/dr/evomodel/tree: EmpiricalTreeDistributionModel.java (+3 -1)
rambaut 2013-03-07 21:56 Rev.: 5472

EmpiricalTreeDistributionModel can now read a rate attribute and expose it as a branchRateModel (it now implements that interface).

64 lines of code changed in 1 file:

  • src/dr/evomodel/tree: EmpiricalTreeDistributionModel.java (+64 -5)
akaruiws 2013-02-22 16:49 Rev.: 5456

Missed correction.

17 lines of code changed in 2 files:

  • src/dr/evomodel/tree: MicrosatelliteSamplerTreeModel.java (+17 -4)
rambaut 2013-01-29 22:14 Rev.: 5356

Porting fixes for issue http://code.google.com/p/beast-mcmc/issues/detail?id=671 to trunk.

18 lines of code changed in 2 files:

  • src/dr/evomodel/tree: TreeLogger.java (+18 -9)
msuchard 2013-01-10 05:20 Rev.: 5302

Added unit-IntervalLatentLiabilityLikelihood for VNTRs; plan to refactor to remove duplicated code once more fully tested.

11 lines of code changed in 1 file:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+11 -2)
rambaut 2012-12-04 19:37 Rev.: 5274

A better solution to the multithreading issue with trees that avoids thread syncs. The problem was only for empirical trees for which the branch lengths were known but not the node heights. Thus it had to compute the node heights when asked and this caused the thread conflict. Now the EmpiricalTrees object forces a node height calculation prior to evaluation.

4 lines of code changed in 1 file:

  • src/dr/evomodel/tree: EmpiricalTreeDistributionModel.java (+4)
rambaut 2012-07-19 04:41 Rev.: 5073

Overhauled the date system so that the 'height' timescale is now universal to all taxa. Previously there was an issue if you create independent trees on different taxon sets, they would have their own 'zero' point depending on their most recently sampled taxon. Now, when you call 'setDate' for a taxon (as done by the TaxonParser) it keeps track of the globally most recent sample (in a static variable) and can give the global height from a given date object using a static function. Taxon objects also have a 'getHeight' methods that uses this system. The two main sources of trees (CoalescentSimulator and NewickParser) now use these heights (simplifying their own code). Runs benchmarks correctly but keep an eye out for issues.

2 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+2 -2)
msuchard 2012-05-18 00:39 Rev.: 4984

On second thought, it might just be easier to group several TreeParameterModels together. Committing just to keep a record.

82 lines of code changed in 5 files:

  • src/dr/evomodel/tree: NewTreeParameterModel.java (new), SlicedMultivariateTreeParameterModel.java (new 70), TreeParameterModel.java (new)
msuchard 2012-05-17 21:02 Rev.: 4981

Generifying TreeParameterModel to handle multiple data-types (double, double[], int, etc.). Also base abstract class supports an includeTips flag developed in TrialTreeParameterModel (now depricated). NewTreeParameterModel should replace TreeParameterModel after extensive testing.

434 lines of code changed in 3 files:

  • src/dr/evomodel/tree: AbstractTreeParameterModel.java (new 238), MultivariateTreeParameterModel.java (new 105), NewTreeParameterModel.java (+91)
msuchard 2012-05-16 20:26 Rev.: 4970

TreeTransforms are now loggable as branch traits

66 lines of code changed in 3 files:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+2 -20), SingleScalarTreeTransform.java (+6 -1), TreeTransform.java (+58 -1)
msuchard 2012-05-15 22:19 Rev.: 4963

Fixed store/restore functionality of BetaDistributionModel

26 lines of code changed in 1 file:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+26 -1)
msuchard 2012-05-15 20:24 Rev.: 4959

Fixed error last revision introduced into TreeParameterModel

1 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeParameterModel.java (+1 -1)
msuchard 2012-05-15 01:24 Rev.: 4955

Introduced a trial TreeParameterModel that excludes external branches; created a new branch-specific Pagel estimator

152 lines of code changed in 3 files:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+44 -21), TreeParameterModel.java (+17 -10), TrialTreeParameterModel.java (new 91)
msuchard 2012-05-11 16:02 Rev.: 4952

Trying a tree transform

90 lines of code changed in 3 files:

  • src/dr/evomodel/tree: ProgressiveScalarTreeTransform.java (+88), SingleScalarTreeTransform.java (+1 -1), TreeTransform.java (+1 -1)
msuchard 2012-05-11 15:19 Rev.: 4951

Refactoring TransformedTree to make generalizations easier

137 lines of code changed in 3 files:

  • src/dr/evomodel/tree: SingleScalarTreeTransform.java (+61), TransformedTreeModel.java (+13 -21), TreeTransform.java (+63)
msuchard 2012-03-27 07:45 Rev.: 4895

Implementing transformed trees and Pagel's lambda estimator

89 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TransformedTreeModel.java (+89)
msuchard 2012-03-27 06:41 Rev.: 4894

Improved ability to co-opt an existing root height in StarTreeModel

25 lines of code changed in 2 files:

  • src/dr/evomodel/tree: StarTreeModel.java (new)
msuchard 2012-03-26 15:04 Rev.: 4888

Added ability to co-opt an existing root height in StarTreeModel

29 lines of code changed in 1 file:

  • src/dr/evomodel/tree: StarTreeModel.java (+29 -12)
msuchard 2012-01-25 07:14 Rev.: 4612

Reverting accidental change

1 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+1 -1)
msuchard 2012-01-25 07:07 Rev.: 4611

Keeping source Java 1.5 compatible.

4 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+4 -4)
rambaut 2011-11-24 19:18 Rev.: 4483

Started to implement ancestral state reconstruction at a node.

11 lines of code changed in 2 files:

  • src/dr/evomodel/tree: AncestralTrait.java (new)
rambaut 2011-11-16 05:15 Rev.: 4433

Ported sequence error models to BeagleTreeLikelihood and implemented a variant model that emits tip states rather than tip partials.

13 lines of code changed in 2 files:

  • src/dr/evomodel/tree: HiddenLinkageModel.java (+13 -7)
rambaut 2011-11-16 03:13 Rev.: 4430

Loggers weren't logging if they overrode the base class log(int state) - because it had been changed to log(long state). Put a final int version in the base class to prevent overriding.

7 lines of code changed in 9 files:

  • src/dr/evomodel/tree: ConvergenceLogger.java (new), HiddenLinkageLogger.java (+2 -2), HiddenLinkageTreeLogger.java (new), TreeLogger.java (+2 -2), TreeSummary.java (new)
rambaut 2011-11-16 00:45 Rev.: 4429

Made BranchRateModel a TreeTraitProvider so it can be logged more easily. Also added feature to TreeLoggerParser where a tree trait can be specified (with a special tag).

0 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeLogger.java (-24)
rambaut 2011-11-15 09:26 Rev.: 4424

Upgraded chain length to a 64 bit integer so that chain lengths > 2.1 billion can be done. This addresses issue 540. Runs OK, accepts long chain lengths but not actually tested a run of > 2.1 billion.

4 lines of code changed in 4 files:

  • src/dr/evomodel/tree: Convergence.java (new), ConvergenceListener.java (new)
msuchard 2011-10-25 09:17 Rev.: 4372

Skeleton for Gaussian Process coalescent model

1 lines of code changed in 1 file:

  • src/dr/evomodel/tree: StarTreeModel.java (+1 -1)
msuchard 2011-10-18 08:34 Rev.: 4365

Better way to handle star trees via a derived TreeModel

128 lines of code changed in 1 file:

  • src/dr/evomodel/tree: StarTreeModel.java (+128 -2)
msuchard 2011-10-17 03:49 Rev.: 4360

Preliminary star tree implementation as an alternative to the correlated trait models; would function better as a subclass of TreeModel than TreeLikelihood.

35 lines of code changed in 1 file:

  • src/dr/evomodel/tree: StarTreeModel.java (+35)
rambaut 2011-02-09 05:17 Rev.: 3791

Fixed a few issues with TreeEvents being fired inappropriately. Also updates to AntigenicTreeLikelihood.

2 lines of code changed in 2 files:

  • src/dr/evomodel/tree: EmpiricalTreeDistributionModel.java (-1), TreeParameterModel.java (+2 -3)
rambaut 2010-10-09 01:38 Rev.: 3621

After some more extensive testing, I have now removed the node heights bound check as default. Certain moves still may make this check.

1 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+1 -1)
rambaut 2010-10-08 21:17 Rev.: 3620

Decoupled the process of checking node heights are within bounds to confirm that an operator is correct from using it to reject a move. By default tree moves just call treeModel.endTreeEdit() to finish editing the tree. If they need to check whether the resulting tree is valid they can call checkTreeIsValid() which throws an exception if not. Most moves do not need this check if correctly implemented. Some I wasn't too sure about so I left the check in for those to give the same behaviour (but it is up to the operator whether this check is made and what to do about it).

TreeModel.endTreeEdit() can optionally make this test (switch on a flag at the top of TreeModel) but throws a runtimeException so stops the program if it fails.

13 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+13 -6)
rambaut 2010-10-08 12:04 Rev.: 3618

Whilst I test the consequence of removing the height bound checking in TreeModel.endTreeEdit(), I have reinstated the test but it now throws a RuntimeException to see if any operators rely on this test failing to check for invalid moves.

9 lines of code changed in 1 file:

  • src/dr/evomodel/tree: TreeModel.java (+9 -19)

(201 more)

Generated by StatSVN 0.7.0