Removed a dependency on some classes in dr.math on the "Parameter" class in dr.inference. The MultivariateDistribution was taking a Parameter as an argument but then extracting the values immediately. Just moved this up to the calling class MultivariateDistributionLikelihood
108 lines of code changed in 8 files:
Fixed a small bug in sclatedTreeLengthRateModel.
Made stuff for ALS model more generic.
Created a default prior for ALS model and a class that integrates over the acquisition rate. Modified the example file accordingly.
429 lines of code changed in 8 files:
Added an error Logger (set up in BEAST main) to which numerical errors during the run of the MCMC can be logged (for example CoalesentLikelihood now logs NaNs and Infinities returned from the likelihood calculator. By default, a Servere error will terminate the run but the new -errors command line option can introduct the maximum number of such errors to tolerate. Warnings can also be written for debugging purposes. Here is how to write to it:
Logger.getLogger("error").severe("CoalescentLikelihood is " + Double.toString(lnL));
121 lines of code changed in 5 files:
As I threatened, I have now deleted dr.app.beastdev (I had one yes and no complaints).
9 lines of code changed in 6 files:
A bit more cleaning up. AbstractCoalescentLikelihood is now called OldAbstractCoalescentLikelihood to indicate to authors of descendent classes that they may wish to try and use the new "AbstractCoalescentLikelihood" which is cleaner and more modular. It also allows for <include> and <exclude> of taxon lists to do subtrees. Basically, all subclasses have to do is implement calculateLogLikelihood() and call getIntervals() and getTree() to get the current intervals and tree objects. See "CoalescentLikelihood" for an example (also the parser for including and excluding taxon lists - otherwise provide nulls).
992 lines of code changed in 13 files:
I assume this was somehow left out of the update
1 lines of code changed in 1 file:
Beast was crushing when logging nodeHeightParameters because individual
Node.heightParameters.id == null. Modified Node constructor to set the id to Node's number in the owning Tree.
1 lines of code changed in 1 file:
Added the "include" and "exclude" options to CoalescentLikelihood that previously were only available in CoalescentMRCALikelihood which resulted in duplication of code.
42 lines of code changed in 2 files:
I have renamed 'NewCoalescentLikelihood' as 'CoalescentLikelihood' to clarify things a bit. NewCoalescentLikelihood was more efficient and clean implementation and it's parser was installed as the default 'coalescentLikelihood' anyway since BEAST v1.4.x.
I have renamed 'CoalescentLikelihood' to AbstractCoalescentLikelihood and removed the parser (made it abstract). This class is used as a base by a number of other classes (i.e., BayesianSkylineLikelihood). I guess that ideally, we see what of AbstractCoalescentLikelihood the descendents actually use and strip out some of it.
1402 lines of code changed in 14 files:
Added classes necessary for MSSD a.k.a. Aquisition-Loss-Substitution (ALS) a.k.a. Immigration-Mutation-Death model functionality. Added prior and integrated immigration prior correction for alternative splicing creation and loss model.
AscertainedSitePatterns -- can handle ascertainment of two types
MutationDeathType -- extends a datatype with an additional state for the death state. Slightly differently (more clean?) structured than the other datatypes in the project. Let me know if you like it.
MutationDeathModel -- extends an arbitrary SubstitutionModel to include an additional absorbing death state.
ScaledTreeLengthRateModel -- Scales the sum of all edges to a specified value (like 1.0 in my case)
testBinary.xml -- a small example of who all of this stuff work
Changes:
BeastParser: added the parsers here
SitePatterns: made comparePatterns() protected instead of private
FrequencyModel: added a function to get the frequency parameter
2142 lines of code changed in 15 files:
Changed remaining skyline's to skyride's to match up with Minin et al. resubmission.
636 lines of code changed in 7 files:
Renamed GMRFSkylineLikelihood to GMRFSkyrideLikelihood to match up with Minin et al. resubmission.
741 lines of code changed in 7 files:
An error in the BeastParser - some parsers were included twice
4 lines of code changed in 3 files:
Made significant run-time improvements to GMRFSkylineLikelihood and GMRFSkylineBlockUpdateOperator. Run-time cut by 0.5 - 0.333.
559 lines of code changed in 2 files:
Hacked a check-point into AncestralStateTreeLikelihood.calculationLikelihood() to make sure that AbstractSubstitutionModel is returning a valid eigen-decomposition. The diagonalization routines in ASM break-down for even slightly ill-conditioned matrices of large size.
42 lines of code changed in 3 files:
Added an Exponential-Logistic model. Compiles but not tested
370 lines of code changed in 4 files:
Fixed an error in TreeAnnotator when it was trying to find the modal value of a discrete trait.
35 lines of code changed in 2 files:
Updated dr.app.beast.BeastParser to contain all the parsers in dr.app.beastdev.*. Will delete dr.app.beastdev.* soon. Moved BeastMC3 across. Fixed a bug setting BSP group count in Beauti.
890 lines of code changed in 8 files:
Added 'AttributePatternsParser' which uses attributes attached to the taxa in a taxon list to construct a pattern.
109 lines of code changed in 2 files:
Upgraded commons-math library to v1.2. This now provides a numerical integrator which I have set DemographicFunction to use if required (instead of the simple embedded function that was there before).
84 lines of code changed in 3 files:
Fix for the Transmission History model.
1 lines of code changed in 2 files:
Fixed TreeAnnotator (now uses considerably less memory at the expense of reading the trees 3 times). Can now annotate very large trees.
31 lines of code changed in 3 files:
Added AncestralSequenceAnnotator (which is a rip-off of TreeAnnotator). This class takes output from BAli-Phy and resample/summarizes the internal node sequences (including indels). Sorry, but I had to add a new constructor to TreeModel that copies the tree attributes.
3130 lines of code changed in 11 files:
Added a parameter for convinience to set the credible set
18 lines of code changed in 2 files:
added some parts so that the CladeMetric works
5 lines of code changed in 1 file:
Added the entry for the missing SubtreeSlide Operator.
1 lines of code changed in 1 file:
Updated version (build number)
1 lines of code changed in 1 file:
More tweaks for DNA damage model (possibly working now)
9 lines of code changed in 1 file:
Fixes for DNA damage model
133 lines of code changed in 3 files:
Fixes for DNA damage model
189 lines of code changed in 4 files:
Fixes for DNA damage model
3 lines of code changed in 3 files:
Implemented a model of DNA damage
639 lines of code changed in 4 files:
Updated the JEBL jar in /lib
0 lines of code changed in 1 file:
Fixed the ANT build files to use 'jebl.jar' which is up to date. Should fix some compile problems.
3 lines of code changed in 3 files:
Fixed an issue with TracerApp not running on non-Mac OSs
17 lines of code changed in 1 file:
Added the ability to set an initial value to traits at nodes in TreeModel; Improved TreeAnnotator to use considerably less memory by making 3 passes of the tree file instead of 2; A few fixes to TreeStat to make it compile again.
1682 lines of code changed in 8 files:
Allowed Tracer to read scientific notation for the state number (to allow it to read Lamarc files). Now gives the line number if there is an inconsistent state spacing.
100 lines of code changed in 3 files: