← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libbpp-phyl/saucy

« back to all changes in this revision

Viewing changes to src/Bpp/Phyl/Model/F84.cpp

  • Committer: Package Import Robot
  • Author(s): Julien Dutheil
  • Date: 2013-02-09 16:00:00 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130209160000-5v65ba68z8032nzj
Tags: 2.0.3-1
* Reorganized model hierarchy
* New pairwise models
* Several bugs fixed

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Bpp/Phyl/Model/F84.cpp
5
5
//
6
6
 
7
7
/*
8
 
Copyright or © or Copr. Bio++ Development Tools, (November 16, 2004)
 
8
Copyright or © or Copr. Bio++ Development Team, (November 16, 2004)
9
9
 
10
10
This software is a computer program whose purpose is to provide classes
11
11
for phylogenetic data analysis.
38
38
*/
39
39
 
40
40
#include "F84.h"
 
41
#include "FrequenciesSet.h"
41
42
 
42
43
#include <Bpp/Numeric/Matrix/MatrixTools.h>
43
44
 
59
60
    double piC,
60
61
    double piG,
61
62
    double piT) :
 
63
  AbstractParameterAliasable("F84."),
 
64
  AbstractSubstitutionModel(alpha, "F84."),
62
65
  AbstractReversibleSubstitutionModel(alpha, "F84."),
63
66
  kappa_(kappa), piA_(piA), piC_(piC), piG_(piG), piT_(piT), piY_(), piR_(),
64
67
  r_(), k1_(), k2_(), theta_(piG + piC), theta1_(piA / (1. - theta_)), theta2_(piG / theta_),
66
69
{
67
70
  Parameter kappaP("F84.kappa", kappa, &Parameter::R_PLUS);
68
71
  addParameter_(kappaP);
69
 
  Parameter thetaP("F84.theta" , theta_ , &Parameter::PROP_CONSTRAINT_EX);
 
72
  Parameter thetaP("F84.theta" , theta_ , &FrequenciesSet::FREQUENCE_CONSTRAINT);
70
73
  addParameter_(thetaP);
71
 
  Parameter theta1P("F84.theta1", theta1_, &Parameter::PROP_CONSTRAINT_EX);
 
74
  Parameter theta1P("F84.theta1", theta1_, &FrequenciesSet::FREQUENCE_CONSTRAINT);
72
75
  addParameter_(theta1P);
73
 
  Parameter theta2P("F84.theta2", theta2_, &Parameter::PROP_CONSTRAINT_EX);
 
76
  Parameter theta2P("F84.theta2", theta2_, &FrequenciesSet::FREQUENCE_CONSTRAINT);
74
77
  addParameter_(theta2P);
75
78
  updateMatrices();
76
79
}