Directory src/dr/evomodelxml/speciation/

Total Files:
35
Deleted Files:
0
Lines of Code:
1088

[root]/src/dr/evomodelxml/speciation

Lines of Code

src/dr/evomodelxml/speciation/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
Totals 113 (100.0%) 3345 (100.0%) 29.6
graham853@gmail.com 40 (35.4%) 1547 (46.2%) 38.6
dong.w.xie 35 (31.0%) 1220 (36.5%) 34.8
alexei.drummond 10 (8.8%) 188 (5.6%) 18.8
jheled 7 (6.2%) 156 (4.7%) 22.2
rambaut 14 (12.4%) 125 (3.7%) 8.9
msuchard 2 (1.8%) 72 (2.2%) 36.0
jheled@gmail.com 3 (2.7%) 30 (0.9%) 10.0
dong.w.xie@gmail.com 2 (1.8%) 7 (0.2%) 3.5

Most Recent Commits

graham853@gmail.com 2013-02-20 00:01 Rev.: 5435

Allopolyploid model. Added diploidRootIsRoot flag (but only tested code when true), changed formula for network prior, added error check relating to oneHybridization flag, improved debug output.

AlloppChangeNumHybridizations: added error check relating to oneHybridization flag.
AlloppChangeNumHybridizationsParser: added error relating to oneHybridization flag.
AlloppDiploidHistory.java: nicer debug output, changes for diploidRootIsRoot flag.
AlloppLeggedTree: simpler debug output.
AlloppMulLabTree: nicer debug output.
AlloppNetworkNodeSlide: Changed operateOneNodeInDiploidHistory() for diploidRootIsRoot flag.
AlloppNetworkPrior: Changed formula for prior (9.0 -> 7.0*sqrt(#diploids))
AlloppSpeciesBindings: nicer debug output.
AlloppSpeciesNetworkModel: changes for diploidRootIsRoot flag, debug output.
AlloppSpeciesNetworkModelParser: changes for diploidRootIsRoot flag.

9 lines of code changed in 2 files:

  • src/dr/evomodelxml/speciation: AlloppSpeciesNetworkModelParser.java (new)
graham853@gmail.com 2012-10-10 00:19 Rev.: 5192

Allopolyploid model. Added MCMC operator to flip legs and sequences of tetraploid tree to improve mixing. Improved sampling for initial state of network. Added statistic for number of hybridizations.

59 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: AlloppNumHybsStatisticParser.java (new 59)
graham853@gmail.com 2012-09-02 04:49 Rev.: 5149

Allopolyploid model: adding code for arbitrary numbers of diploids, tetraploids, hybridizations.

150 lines of code changed in 3 files:

  • src/dr/evomodelxml/speciation: AlloppNetworkPriorModelParser.java (+100 -9), AlloppSpeciesNetworkModelParser.java (+50 -26)
dong.w.xie@gmail.com 2012-08-13 14:17 Rev.: 5129

trunk: merge Issue 656 : fix p=0 in Birth Death Serial Sampling Model, and update Unit tests.

7 lines of code changed in 2 files:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+7 -4)
rambaut 2012-08-04 03:49 Rev.: 5097

Porting fixes from 1.7.3 back into the trunk

0 lines of code changed in 10 files:

  • src/dr/evomodelxml/speciation: PopsIOMSCoalescentParser.java (-1), PopsIOSpeciesBindingsParser.java (-1), PopsIOSpeciesBindingsSpInfoParser.java (-1), PopsIOSpeciesTreeModelParser.java (-1), PopsIOSpeciesTreePriorParser.java (new)
graham853@gmail.com 2012-07-17 02:28 Rev.: 5071

Code for n diploids, one hybridization now working. Experimental code (PopsIO) added for multispecies coalescent with population size parameters integrated out.

356 lines of code changed in 14 files:

  • src/dr/evomodelxml/speciation: AlloppNetworkPriorParser.java (+1 -15), AlloppSpeciesBindingsApSpInfoParser.java (new), AlloppSpeciesBindingsParser.java (+3 -10), AlloppSpeciesNetworkModelParser.java (+3 -11), MulSpeciesTreePriorParser.java (new), PopsIOMSCoalescentParser.java (+49), PopsIOSpeciesBindingsParser.java (+102), PopsIOSpeciesBindingsSpInfoParser.java (+45), PopsIOSpeciesTreeModelParser.java (+81), PopsIOSpeciesTreePriorParser.java (+63)
graham853@gmail.com 2012-01-09 23:59 Rev.: 4571

Adding multiply-labelled tree model. MulSpeciesTreeModel, MulMSCoalescent, MulSpeciesBindings, MulSpeciesTreePrior. Operators MulTreeNodeSlide, MulTreeSequenceReassignment. Plus parsers.

Minor updates to AlloppSpeciesBindings, AlloppSpeciesNetworkModel, the latter dues to changes in logging behaviour.

331 lines of code changed in 4 files:

  • src/dr/evomodelxml/speciation: MulMSCoalescentParser.java (new 41), MulSpeciesBindingsParser.java (new 146), MulSpeciesTreeModelParser.java (new 75), MulSpeciesTreePriorParser.java (+69)
rambaut 2011-12-21 22:43 Rev.: 4561

Minor text edit.

2 lines of code changed in 2 files:

  • src/dr/evomodelxml/speciation: BirthDeathEpidemiologyModelParser.java (new)
dong.w.xie 2011-12-09 10:03 Rev.: 4526

trunk:solve Issue 562: BEAUTi : Birth Death Epidemiology Model update

1 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathEpidemiologyModelParser.java (+1 -1)
rambaut 2011-12-07 11:27 Rev.: 4522

New parameterization of Tanja's BDSSM for epidemiology

17 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathEpidemiologyModelParser.java (+17 -17)
rambaut 2011-12-07 10:49 Rev.: 4518

New parameterization of Tanja's BDSSM for epidemiology

106 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathEpidemiologyModelParser.java (+106)
dong.w.xie 2011-12-05 14:21 Rev.: 4505

trunk: some fixes of Issue 556: BEAUti "birth-death serially sampled model" correction required

3 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+3 -3)
dong.w.xie 2011-11-15 16:33 Rev.: 4426

trunk: finish calibrated Yule, but may have bugs.

1 lines of code changed in 2 files:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (new)
dong.w.xie 2011-11-09 11:59 Rev.: 4401

improve enum CorrectionType to suit for BEAUti, and finish Calibrated Yule GUI part, but need further work on xml generator.

5 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+5 -5)
graham853@gmail.com 2011-09-03 20:28 Rev.: 4283

Allopolyploid model: Made code compatible with Java 1.5 (removed @Override's). Added citation. More sensible implementation of debugging logger.

5 lines of code changed in 9 files:

  • src/dr/evomodelxml/speciation: AlloppMSCoalescentParser.java (new), AlloppNetworkPriorModelParser.java (-1), AlloppNetworkPriorParser.java (+1 -1), AlloppSpeciesBindingsApSpInfoParser.java (-1), AlloppSpeciesBindingsIndividualParser.java (new), AlloppSpeciesBindingsParser.java (+2 -2), AlloppSpeciesNetworkModelParser.java (-1)
graham853@gmail.com 2011-09-02 00:01 Rev.: 4277

637 lines of code changed in 7 files:

  • src/dr/evomodelxml/speciation: AlloppMSCoalescentParser.java (+56), AlloppNetworkPriorModelParser.java (+63), AlloppNetworkPriorParser.java (+94), AlloppSpeciesBindingsApSpInfoParser.java (+72), AlloppSpeciesBindingsIndividualParser.java (+66), AlloppSpeciesBindingsParser.java (+148), AlloppSpeciesNetworkModelParser.java (+138)
dong.w.xie 2011-08-16 11:18 Rev.: 4189

trunk: I think Issue 463 is solved, but cannot test because of Issue 485

2 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+2 -1)
jheled@gmail.com 2011-07-19 11:47 Rev.: 4112

Add an alternative exact marginal

11 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+11 -3)
dong.w.xie 2011-07-07 11:29 Rev.: 4101

Trunk: fix BEAUti BDSS part

6 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+6 -6)
alexei.drummond 2011-07-06 13:39 Rev.: 4100

parser fix

4 lines of code changed in 2 files:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSkylineModelParser.java (new)
jheled@gmail.com 2011-07-04 13:40 Rev.: 4098

more fixes to calibration code

6 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+6 -2)
alexei.drummond 2011-07-02 08:48 Rev.: 4093

Tidied up parsers and added option to specify epoch widths from the origin rather than the tips.

8 lines of code changed in 2 files:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+2 -5), BirthDeathSerialSkylineModelParser.java (+6 -1)
alexei.drummond 2011-07-01 06:56 Rev.: 4085

likelihoods correct! phew! Late night debugging with Denise and Tanja in Zurich ;-)

131 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSkylineModelParser.java (+131)
alexei.drummond 2011-06-30 22:32 Rev.: 4080

removed final time interval

8 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+8 -10)
jheled@gmail.com 2011-06-24 21:33 Rev.: 4064

Add first version for exact marginal for the general case of N monophyletic clades

13 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+13 -4)
dong.w.xie 2011-06-09 17:13 Rev.: 4020

Trunk: add log transformation into BDSS

10 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+10 -1)
jheled 2011-06-08 18:24 Rev.: 4016


Re-organize calibration code. add experimental "approximate" marginal.

15 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+15 -32)
jheled 2011-06-06 13:56 Rev.: 4011

add all worked out closed form calibration marginals: parent of clade, two nested clades, clade and root.

66 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+66 -16)
dong.w.xie 2011-06-03 11:06 Rev.: 3999

Trunk: fix another trick bug of BDSS

7 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+7 -9)
dong.w.xie 2011-05-27 14:50 Rev.: 3989

Trunk: fix a bug of BDSS parser, and correct attribute name

8 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+8 -5)
msuchard 2011-05-11 05:12 Rev.: 3976

Attempting to standardize citations in BEAUti for a more professional look; am unclear why we did not stick with the Citable interface.

2 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+2 -1)
dong.w.xie 2011-04-01 17:53 Rev.: 3920

Trunk: A new XML for Calibration with Yule.

7 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+7 -1)
dong.w.xie 2011-03-25 16:23 Rev.: 3902

Trunk: finish Brith Death Serial Sampling in BEAUti, but some of xmls are not running.

2 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+2 -2)
dong.w.xie 2011-03-24 15:55 Rev.: 3899

Trunk: start to implement Brith Death Serial Sampling in BEAUti.

30 lines of code changed in 3 files:

  • src/dr/evomodelxml/speciation: BirthDeathModelParser.java (+14 -7), BirthDeathSerialSamplingModelParser.java (+16 -7)
dong.w.xie 2010-12-15 15:58 Rev.: 3758

Trunk: fix test and parser of MA

1 lines of code changed in 2 files:

  • src/dr/evomodelxml/speciation: ModelAveragingSpeciationLikelihoodParser.java (+1 -1)
dong.w.xie 2010-12-15 14:49 Rev.: 3757

Trunk: initial research on Model Averaging

103 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: ModelAveragingSpeciationLikelihoodParser.java (+103)
jheled 2010-11-21 17:51 Rev.: 3729

Add chs, log and exp tp RPN calculator
Add Tree height statistic parser tp .properties

Special calibration cases use RPN expression.

40 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+40 -12)
jheled 2010-11-12 15:59 Rev.: 3713

First implementation of correct calibration density for one monophyletic clade inside a Yule tree.

Allow an "explicit" correction via pre computed coefficients, used when putting additional constraints on the topology

7 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+7 -1)
jheled 2010-11-11 22:26 Rev.: 3704

First implementation of correct calibration density for one monophyletic clade inside a Yule tree.

The internal interface it a little clunky since the concept does not fit well with the current classes implementing the various speciation priors.

The XML interface is via an additional 'calibration' element inside
the speciationLikelihood. The element contains the taxa and a distribution for the root of the taxa. For a single taxon list, the distribution is for the parent of the taxon, which has no other constraints.

<speciationLikelihood id="speciationlike">
<model>
<yuleModel idref="yule"/>
</model>
<speciesTree>
<treeModel idref="treeModel"/>
</speciesTree>

<calibration>
<exponentialDistributionModel>
<mean>
<parameter id="mean" value="1"/>
</mean>
</exponentialDistributionModel>
<taxa>
<taxon idref="tip1"/>
<taxon idref="tip2"/>
</taxa>
</calibration>
</speciationLikelihood>

28 lines of code changed in 3 files:

  • src/dr/evomodelxml/speciation: SpeciationLikelihoodParser.java (+27 -6), YuleModelParser.java (+1 -2)
alexei.drummond 2010-09-29 18:56 Rev.: 3585

Added the sampling of the origin of the infection to the birth-death serial sampling model.

9 lines of code changed in 1 file:

  • src/dr/evomodelxml/speciation: BirthDeathSerialSamplingModelParser.java (+9 -2)

(9 more)

Generated by StatSVN 0.7.0