Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added new PoMo rate matrices with selection #132

Merged
merged 11 commits into from
Feb 4, 2021
Merged

Conversation

mrborges23
Copy link
Contributor

Added new PoMo rate matrices with selection:

  1. fnPoMoKN
  2. fnReversiblePoMoKN
  3. fnPoMo4N
  4. fnReversiblePoMo4N
  5. fnPoMo2N
  6. fnReversiblePoMo2N
  7. fnReversiblePoMoBalance4N
  8. fnReversiblePoMoTwo4N
  9. fnReversiblePoMoThree4N

{
argumentRules.push_back( new ArgumentRule( "N" , Natural::getClassTypeSpec(), "Number of individuals.", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
argumentRules.push_back( new ArgumentRule( "pi" , Simplex::getClassTypeSpec(), "Vector of allele frequencies.", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
argumentRules.push_back( new ArgumentRule( "rho" , ModelVector<RealPos>::getClassTypeSpec(), "Vector of mutation rates: mu=(mu_a0a1,mu_a1a0,mu_a0a2,...).", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this argument rho or mu ? is it a vector of mutation rates or exchangeabilities ? (l44)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated pomo rate matrices argument rules and committed

{
argumentRules.push_back( new ArgumentRule( "N" , Natural::getClassTypeSpec(), "Number of individuals.", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
argumentRules.push_back( new ArgumentRule( "pi" , Simplex::getClassTypeSpec(), "Vector of allele frequencies: pi=(pi_a0,pi_a1).", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
argumentRules.push_back( new ArgumentRule( "rho" , ModelVector<RealPos>::getClassTypeSpec(), "Vector of mutation rates: mu=(mu_a0a1,mu_a1a0).", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this argument rho or mu ? is it a vector of mutation rates or exchangeabilities ? (l44)

Copy link
Contributor Author

@mrborges23 mrborges23 Feb 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated pomo rate matrices argument rules and committed

argumentRules.push_back( new ArgumentRule( "K" , Natural::getClassTypeSpec(), "Number of alleles.", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
argumentRules.push_back( new ArgumentRule( "N" , Natural::getClassTypeSpec(), "Number of individuals.", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
argumentRules.push_back( new ArgumentRule( "pi" , Simplex::getClassTypeSpec(), "Vector of allele frequencies.", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
argumentRules.push_back( new ArgumentRule( "rho" , ModelVector<RealPos>::getClassTypeSpec(), "Vector of mutation rates: mu=(mu_a0a1,mu_a1a0,mu_a0a2,...).", ArgumentRule::BY_CONSTANT_REFERENCE, ArgumentRule::ANY ) );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this argument rho or mu ? is it a vector of mutation rates or exchangeabilities ? (l45)

Copy link
Contributor Author

@mrborges23 mrborges23 Feb 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated pomo rate matrices argument rules and committed

@mrborges23 mrborges23 merged commit ed350f9 into development Feb 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants