Directory src/dr/app/beagle/evomodel/treelikelihood/

Total Files:
14
Deleted Files:
2
Lines of Code:
1342

[root]/src/dr/app/beagle/evomodel/treelikelihood

Lines of Code

src/dr/app/beagle/evomodel/treelikelihood/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
Totals 232 (100.0%) 12747 (100.0%) 54.9
rambaut 91 (39.2%) 7393 (58.0%) 81.2
msuchard 123 (53.0%) 5042 (39.6%) 40.9
fbielejec 15 (6.5%) 300 (2.4%) 20.0
jheled 1 (0.4%) 11 (0.1%) 11.0
sibon.li 2 (0.9%) 1 (0.0%) 0.5

Most Recent Commits

msuchard 2013-04-19 06:30 Rev.: 5599

Debugging flag to check for thread-level parallelization of likelihood evaluations

5 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: AbstractTreeLikelihood.java (+5 -5)
msuchard 2013-04-06 05:11 Rev.: 5559

Reconstructions from AncestralStateBeagleTreeLikelihood now follow useAmbiguities=true/false setting.

9 lines of code changed in 4 files:

  • src/dr/app/beagle/evomodel/treelikelihood: AncestralStateBeagleTreeLikelihood.java (+2 -2), BeagleTreeLikelihood.java (+7)
fbielejec 2013-03-22 00:10 Rev.: 5519

no need for site count, this information can be parsed from partitions

3 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+3 -1)
fbielejec 2013-01-30 20:49 Rev.: 5362

split the condition to avoid compiler warnings

24 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (new)
msuchard 2013-01-30 10:26 Rev.: 5361

Added a flag to debug and profile epoch models in series; option should probably be elevated to a system property.

53 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+53 -45)
rambaut 2013-01-29 04:45 Rev.: 5349

The code as written requires at least eigenCount extra buffers to be able to guarantee to convolve matrices along a branch. Put a check in for this if convolution is being used. Also fixed a possible error where we run out of buffers midway through compiling a set of convolutions for a branch. Now if it knows it will not have enough buffers, it computes the current list and then continues, rather than waiting until it runs out.

36 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+36 -34)
fbielejec 2013-01-29 03:57 Rev.: 5348

minor changes to Utils and partition element parser

1 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+1 -1)
fbielejec 2013-01-29 03:54

starting to work on reportable timers for update and convolve operations

64 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+9 -1), SubstitutionModelDelegate.java (+55 -6)
rambaut 2013-01-27 00:52 Rev.: 5341

I think the convolution buffer issue is now fixed. Had to create a single extra reserve buffer that was used to free up the convolution list when all the other buffers had been used. Now runs - can't promise correctness so probably ought to be compared to older implementation.

59 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+59 -44)
rambaut 2013-01-27 00:17 Rev.: 5340

Towards making the spare buffer stack working. The convolveMatrices() was not completing the convolution operation that it had interrupted to free up some buffers. There is still a bug though - if this method runs out of buffers on the first convolution then it has nothing to free up. More thinking required.

8 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+8 -1)
msuchard 2013-01-26 09:34 Rev.: 5339

Can now set BEAGLE extra buffer count from system properties

20 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+12 -2), SubstitutionModelDelegate.java (+8 -2)
msuchard 2013-01-26 09:15 Rev.: 5338

Some buffers not returned to pool; but error still persists in code.

14 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+14)
msuchard 2013-01-15 11:50 Rev.: 5323

Added getRootFrequencyModel to BranchModel interface. Consider deprecating getRootSubstitutionModel() as there are no substitutions occurring at the root. Also commented out @Override to interface functions since this is not Java 1.5 compatible.

2 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+2 -3)
msuchard 2012-12-21 11:28 Rev.: 5293

Standardizing output for markov jumps

55 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: MarkovJumpsBeagleTreeLikelihood.java (new)
rambaut 2012-12-20 22:07 Rev.: 5289

SubstitutionModelDelegate returns the root substitution model's frequencies.

2 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+2 -1)
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.

2 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+2 -8)
rambaut 2012-12-04 11:21 Rev.: 5273

There was an issue when multiple BTL tried to get node heights from the same tree in different threads giving negative branch length errors. Synchronizing on the tree fixes this - might have other implications.

10 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+10 -2)
rambaut 2012-12-03 02:59 Rev.: 5268

Removing a debug exit()

5 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+5 -6)
msuchard 2012-12-03 02:51 Rev.: 5267

Fixed bug in SubstitutionModelDelegate; new and old BeagleTreeLikelihood now return same values.

15 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+15 -9)
rambaut 2012-11-30 21:58 Rev.: 5264

New BeagleTreeLikelihood was not updating correctly for a rescale after an underflow.

1 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+1 -1)
msuchard 2012-11-28 10:34 Rev.: 5260

Incomplete implementation of multi-state stochastic Dollo under BEAGLE. Needs considerably more work.

124 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: ALSBeagleTreeLikelihood.java (new 117), BeagleTreeLikelihood.java (+7 -20)
rambaut 2012-11-27 10:41 Rev.: 5257

Old TL/ASTL/MJTL in parser list.

2 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+2 -1)
rambaut 2012-11-27 09:33 Rev.: 5255

Inserting the old MJTL back in to the deep inheritance chain of OTL. For testing purposes only. If it has a line through it - it is going to go at some point.

584 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: OldMarkovJumpsBeagleTreeLikelihood.java (new 584)
rambaut 2012-11-27 09:23 Rev.: 5254

Inserting the old ASTL back in to the deep inheritance chain of OTL. MJTL next.

533 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: OldAncestralStateBeagleTreeLikelihood.java (new 533)
fbielejec 2012-11-16 21:15 Rev.: 5235

switching the simulator to new interfaces

31 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+30 -32), SubstitutionModelDelegate.java (+1 -2)
rambaut 2012-11-16 00:54 Rev.: 5232

Renamed NewTreeLikelihood to BeagleTreeLikelihood

1282 lines of code changed in 5 files:

  • src/dr/app/beagle/evomodel/treelikelihood: AncestralStateBeagleTreeLikelihood.java (+1 -3), BeagleTreeLikelihood.java (+1279), NewBeagleTreeLikelihood.java (del), OldBeagleTreeLikelihood.java (+2 -2)
rambaut 2012-11-16 00:50 Rev.: 5231

Renamed BeagleTreeLikelihood to OldBeagleTreeLikelihood

1322 lines of code changed in 5 files:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (del), NewBeagleTreeLikelihood.java (new 11), OldBeagleTreeLikelihood.java (+1302), StarTreeLikelihood.java (+1 -1)
rambaut 2012-11-15 14:45 Rev.: 5230

Updated copyright messages.

108 lines of code changed in 15 files:

  • src/dr/app/beagle/evomodel/treelikelihood: AbstractTreeLikelihood.java (+1 -1), AncestralStateBeagleTreeLikelihood.java (+25), BeagleOperationReport.java (new), BeagleTreeLikelihood.java (new), BufferIndexHelper.java (+25), MarkovJumpsBeagleTreeLikelihood.java (+25), NewBeagleTreeLikelihood.java (+2 -2), PartialsRescalingScheme.java (new), SplitBySiteTraitLogger.java (new), StarTreeLikelihood.java (+1 -1), SubstitutionModelDelegate.java (+2 -2)
rambaut 2012-11-15 14:41 Rev.: 5229

Branch specific substitution models now working. NewTreeLikelihood will replace BeagleTreeLikelihood in a future commit. AncestralStateTL and MarkovJumpsTL now descend from NewTreeLikelihood. EpochBranchModel uses a different XML format from EpochBranchSubstitutionModel (now depreciated). Also implemented a branch-specific substitution model.

64 lines of code changed in 5 files:

  • src/dr/app/beagle/evomodel/treelikelihood: AncestralStateBeagleTreeLikelihood.java (+14 -15), BeagleTreeLikelihood.java (+2), MarkovJumpsBeagleTreeLikelihood.java (+15 -10), NewBeagleTreeLikelihood.java (+19 -11), SubstitutionModelDelegate.java (+14 -7)
rambaut 2012-11-10 05:19 Rev.: 5227

Debuggin'

4 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: NewBeagleTreeLikelihood.java (+2 -2), SubstitutionModelDelegate.java (+2 -2)
rambaut 2012-11-10 03:30 Rev.: 5226

Parsers for the new epoch implementations.

2 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+2)
rambaut 2012-11-10 01:43 Rev.: 5225

Implemented eventuality where the delegate runs out of spare buffers - it now shunts of what it has so far and then continues.

99 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: SubstitutionModelDelegate.java (+99 -10)
rambaut 2012-11-10 00:11 Rev.: 5224

NewBeagleTreeLikelihood evaluation seems to work for Epoch models.

30 lines of code changed in 2 files:

  • src/dr/app/beagle/evomodel/treelikelihood: NewBeagleTreeLikelihood.java (+16 -6), SubstitutionModelDelegate.java (+14 -13)
rambaut 2012-11-09 23:39 Rev.: 5223

Stuff

35 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: NewBeagleTreeLikelihood.java (+35 -23)
rambaut 2012-11-09 23:24 Rev.: 5222

Test main for NewBeagleTreeLikelihood

91 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: NewBeagleTreeLikelihood.java (+91 -4)
rambaut 2012-11-09 22:40 Rev.: 5219

Finished first implementation of new SubstitutionModelDelegate for BranchModels (which allow changing substitution model by branch).

1410 lines of code changed in 3 files:

  • src/dr/app/beagle/evomodel/treelikelihood: NewBeagleTreeLikelihood.java (+1166), NewScalingBeagleTreeLikelihood.java (del), SubstitutionModelDelegate.java (+244)
rambaut 2012-08-04 03:49 Rev.: 5097

Porting fixes from 1.7.3 back into the trunk

12 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+12 -3)
msuchard 2012-07-10 15:52 Rev.: 5062

Fixed more -1s in thread-pools and add limited dialogue support for SSE (which sidesteps known bug in SSE phylogeography)

7 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+7 -2)
msuchard 2012-06-01 03:47 Rev.: 5004

Reducing over-logging on underflows

1 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+1 -1)
rambaut 2012-03-08 21:41 Rev.: 4793

Added BEAGLE rescaling options to BEAST UI dialog. Added command line option to control the rescaling frequency in dynamic scaling.

18 lines of code changed in 1 file:

  • src/dr/app/beagle/evomodel/treelikelihood: BeagleTreeLikelihood.java (+18 -5)

(109 more)

Generated by StatSVN 0.7.0