Directory src/dr/evomodel/antigenic/

Total Files:
15
Deleted Files:
6
Lines of Code:
1084

[root]/src/dr/evomodel/antigenic

Lines of Code

src/dr/evomodel/antigenic/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
Totals 181 (100.0%) 9938 (100.0%) 54.9
rambaut 103 (56.9%) 5650 (56.9%) 54.8
tbcbedford@gmail.com 72 (39.8%) 3114 (31.3%) 43.2
gcybis@yahoo.com.br 2 (1.1%) 1082 (10.9%) 541.0
msuchard 4 (2.2%) 92 (0.9%) 23.0

Most Recent Commits

tbcbedford@gmail.com 2013-04-30 22:12 Rev.: 5621

Ignore this. Testing homebrew upgrade mechanisms.

1 lines of code changed in 2 files:

  • src/dr/evomodel/antigenic: AntigenicLikelihoodSimple.java (+1)
tbcbedford@gmail.com 2013-04-19 11:05 Rev.: 5600

Change "mergeColumns" to "mergeSerumIsolates" to agree with the rest of the spec.

6 lines of code changed in 2 files:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (new)
tbcbedford@gmail.com 2013-04-12 22:16 Rev.: 5586

Fix bug in indexing. Proper number of columns now being recorded.

1 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+1 -1)
tbcbedford@gmail.com 2013-04-02 05:05 Rev.: 5556

Finalizing schema to agree with paper. Row effects -> Virus effects. Column effects -> Serum effects. Also, reordering input file to be: virus isolate, virus strain, virus year, serum isolate, serum strain, serum year, titre.

23 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+23 -20)
tbcbedford@gmail.com 2013-03-13 03:49 Rev.: 5478

This is a refactor of AntigenicLikelihood. It's been slimmed down substantially. I've tried to cut down on the all the redirection involved in setting up parameters. There is now just equal-sized vectors of names, locations, offsets and effects for both viruses and sera. "Column effects" and locations now have to refer to the same set of entities, unlike previously where locations could refer to strains and effects could refer to isolates.

This is currently broken in some way and giving "SEVERE: State was not correctly calculated after an operator move." errors.

781 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihoodSimple.java (+781)
rambaut 2013-03-07 21:58 Rev.: 5473

Undepricating this class for simple BMDS.

1 lines of code changed in 2 files:

  • src/dr/evomodel/antigenic: MultidimensionalScalingLikelihood.java (+1 -2)
rambaut 2013-02-15 03:19 Rev.: 5400

Erroneous import giving a warning in Hudson

0 lines of code changed in 2 files:

  • src/dr/evomodel/antigenic: NPAntigenicLikelihood.java (new)
tbcbedford@gmail.com 2013-01-18 05:38 Rev.: 5332

Change AntigenicDistancePrior to take new Offsets parameter (rather than Dates parameter) and remove deprecated AntigenicJumpPrior.

215 lines of code changed in 3 files:

  • src/dr/evomodel/antigenic: AntigenicDistancePrior.java (del), AntigenicDriftPrior.java (new 215), AntigenicJumpPrior.java (del)
rambaut 2013-01-13 22:20 Rev.: 5319

Renaming a class that doesn't conform to Java naming (camel case starting with a capital). Also general aversion to arbitrary acronyms in class names as this makes finding them and browsing code difficult. Added authors to comments.

601 lines of code changed in 3 files:

  • src/dr/evomodel/antigenic: DistanceDependentCRPGibbsOperator.java (new 597), NPAntigenicLikelihood.java (+4), ddCRPGibbsOperator.java (del)
rambaut 2013-01-13 22:13 Rev.: 5318

Cosmetics

27 lines of code changed in 6 files:

  • src/dr/evomodel/antigenic: DiscreteAntigenicTraitLikelihood.java (+1), DriftedLocationsStatistic.java (new), DriftedTraitsLogger.java (new)
tbcbedford@gmail.com 2013-01-13 07:38 Rev.: 5316

Implement logging of drifted tree traits.

155 lines of code changed in 2 files:

  • src/dr/evomodel/antigenic: DriftedLocationLogger.java (del), DriftedTraitsLogger.java (+155)
tbcbedford@gmail.com 2013-01-13 03:43 Rev.: 5315

Improving caching by tracking column effect and row effect updates.

24 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+24 -6)
tbcbedford@gmail.com 2013-01-12 03:37 Rev.: 5314

Small change to parameter syntax (virusOffset to virusOffsets).

30 lines of code changed in 2 files:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+22 -22), DriftedLocationsStatistic.java (+8 -8)
tbcbedford@gmail.com 2013-01-12 03:04 Rev.: 5312

Implement statistic that records drifted locations. This required storing virusDates and serumDates parameters from AntigenicLikelihood and passing these, plus the locationDriftParameter, to the new DriftedLocationsStatistic.

162 lines of code changed in 2 files:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+50), DriftedLocationsStatistic.java (+112)
tbcbedford@gmail.com 2013-01-11 23:01 Rev.: 5311

Depecrate antigenic drift priors. Now incorporated directly into antigenicLikelihood.

49 lines of code changed in 4 files:

  • src/dr/evomodel/antigenic: AntigenicDistancePrior.java (new 30), AntigenicJumpPrior.java (new 18), AntigenicSplitPrior.java (new)
tbcbedford@gmail.com 2013-01-11 10:17 Rev.: 5310

Streamline antigenic likelihood a bit, removing virusDates parameter.

19 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+19 -58)
tbcbedford@gmail.com 2013-01-10 12:18 Rev.: 5309

Reinstate linear initial conditions.

4 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+4 -4)
tbcbedford@gmail.com 2013-01-10 11:55 Rev.: 5308

Fix bug in assigning dates.

10 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+10 -8)
tbcbedford@gmail.com 2013-01-10 11:20 Rev.: 5307

Implement antigenic drift on map distances.

48 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+48 -22)
tbcbedford@gmail.com 2013-01-10 09:36 Rev.: 5306

Include antigenic drift parameter. Doesn't do anything yet.

20 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+20 -1)
rambaut 2013-01-10 05:40 Rev.: 5305

Important copyright homogenization

1 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: DriftedLocationLogger.java (new 1)
rambaut 2013-01-10 05:36 Rev.: 5304

Drifting

107 lines of code changed in 6 files:

  • src/dr/evomodel/antigenic: AntigenicTraitLikelihood.java (new), ContinuousAntigenicTraitLikelihood.java (new), DriftedLocationLogger.java (+104), MultidimensionalScalingLikelihood.java (+1)
tbcbedford@gmail.com 2013-01-09 01:02 Rev.: 5300

Fix numerical bug. If an interval likelihood is in the far tail of the distribution cdf1 == cdf2. Should return a point likelihood here, rather than 0.0, as had been the case.

16 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+16 -10)
tbcbedford@gmail.com 2012-12-22 00:15 Rev.: 5295

Fixed calculation of intervalLikelihood to properly use intervalWidth (rather than assuming 1.0).

1 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+1 -1)
tbcbedford@gmail.com 2012-12-21 23:18 Rev.: 5294

Remove truncation and make likelihood in terms of titre H_ij rather than immunological distance d_ij

28 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+28 -59)
tbcbedford@gmail.com 2012-09-27 00:36 Rev.: 5176

A virus location may exist that doesn't exist in the tree.

2 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+2 -1)
tbcbedford@gmail.com 2012-06-28 23:10 Rev.: 5055

Moving from a gamma jump distribution to an exponential jump distribution.

With a gamma distribution of year-to-year jumps I was getting a linear trend (mean = 1, sd = 0.01), but I think this came from the initial conditions. I'm thinking this is overparameterized.

5 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicJumpPrior.java (+5 -18)
tbcbedford@gmail.com 2012-06-28 22:33 Rev.: 5054

Defaulting mergeColumns to "false".

2 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+2 -2)
tbcbedford@gmail.com 2012-06-28 21:36 Rev.: 5053

Fixed dropping of virus names when duplicate sera name exists.

There was a bug in which if there was a row with the same name as a column, this row name would not be added to the virusStrains list.

14 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+14 -11)
tbcbedford@gmail.com 2012-06-28 03:32 Rev.: 5051

Implementing a more flexible "jump" prior for antigenic locations.

Instead of the linear relationship of AG1 vs time, AntigenicJumpPrior gives a hierarchical prior for picking the
movement of each year from a gamma distribution. The parameters of this gamma distribution are estimated
from the data.

306 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicJumpPrior.java (+306)
rambaut 2012-04-05 20:56 Rev.: 4919

Added a switch (mergeColumns="true/false") to specify whether every column should have a unique location or whether columns with the same strain should share locations (and share these locations with rows for that strain). Defaults to true.

20 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+20 -7)
tbcbedford@gmail.com 2012-04-04 23:43 Rev.: 4918

Changing datesParameter to virusDatesParameter to feed to AntigenicDistancePrior (along with virusLocations).

9 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+9 -9)
rambaut 2012-04-04 23:01 Rev.: 4916

Added ability to extract the locations of viruses only or sera only.

48 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+48)
tbcbedford@gmail.com 2012-04-03 23:47 Rev.: 4915

This reversion fixes the bug in the likelihood calculation. Something is off in computeMeasurementLikelihood.

19 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+19 -19)
rambaut 2012-03-31 02:48 Rev.: 4910

Sets all the tip locations now but something is still wrong.

10 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+10 -8)
rambaut 2012-03-30 12:06 Rev.: 4907

Failed to fix error.

43 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+43 -33)
rambaut 2012-03-28 05:49 Rev.: 4900

Hooks up with tree traits.

14 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicLikelihood.java (+14 -5)
tbcbedford@gmail.com 2012-03-28 04:56 Rev.: 4899

Negatively impact the likelihood is a strain known to be top branch is assigned to bottom branch. Many bit flip operations will be rejected. This appears to be working (maybe).

53 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicSplitPrior.java (+53 -8)
tbcbedford@gmail.com 2012-03-27 21:59 Rev.: 4898

Parsing topBranch strains and bottomBranch strains and assigning {0,1} based on this.

40 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicSplitPrior.java (+40 -7)
tbcbedford@gmail.com 2012-03-27 21:30 Rev.: 4897

Basics of split prior implemented. There is an assignment vector that assigns strains to top branch (0) or bottom branch (1). This is operated on with bitFlipOperator. Currently not converging nicely. Will try to help the assignment by including definite Yamagata (0) or Victoria (1) isolates.

86 lines of code changed in 1 file:

  • src/dr/evomodel/antigenic: AntigenicSplitPrior.java (+86 -35)

(89 more)

Generated by StatSVN 0.7.0