Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.3.4-binary' of https://github.com/sjspielman/hyphy in…
…to 2.3.4
- Loading branch information
Showing
4 changed files
with
202 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| LoadFunctionLibrary ("../all-terms.bf"); | ||
| LoadFunctionLibrary ("frequencies.bf"); | ||
|
|
||
| /** @module models.binary */ | ||
|
|
||
|
|
||
|
|
||
| /* Alphabet */ | ||
| models.binary.alphabet = {{"0","1"}}; | ||
| models.binary.dimensions = 2; | ||
|
|
||
|
|
||
| /** | ||
| * @name models.binary.generic.DefineQMatrix | ||
| * @param {Dictionary} modelSpec | ||
| * @param {String} namespace | ||
| */ | ||
| function models.binary.generic.DefineQMatrix (modelSpec, namespace) { | ||
|
|
||
| __alphabet = modelSpec [terms.alphabet]; | ||
| assert (Type (__alphabet) == "Matrix" && Columns (__alphabet) == models.binary.dimensions, "Unsupported or missing alphabet '" + __alphabet + "'"); | ||
|
|
||
| __modelType = modelSpec[terms.model.type]; | ||
| if (Type (__modelType) == "None" || Type (__modelType) == "Number") { | ||
| __modelType = terms.global; | ||
| } | ||
| modelSpec[terms.model.type] = __modelType; | ||
| assert (__modelType == terms.local || __modelType == terms.global, "Unsupported or missing model type '" + __modelType + "'"); | ||
|
|
||
| __rate_function = modelSpec [terms.model.q_ij]; | ||
| assert (utility.IsFunction (__rate_function), "Missing q_ij callback in model specification"); | ||
|
|
||
| __time_function = modelSpec [terms.model.time]; | ||
| assert (utility.IsFunction (__time_function), "Missing time callback in model specification"); | ||
|
|
||
|
|
||
| __rate_matrix = {models.binary.dimensions, models.binary.dimensions}; | ||
| __rate_matrix [0][0] = ""; | ||
|
|
||
| __rate_variation = model.generic.get_rate_variation (modelSpec); | ||
|
|
||
|
|
||
|
|
||
| __global_cache = {}; | ||
|
|
||
| if (None != __rate_variation) { | ||
|
|
||
|
|
||
| __rp = Call (__rate_variation[terms.rate_variation.distribution], __rate_variation[terms.rate_variation.options], namespace); | ||
| __rate_variation [terms.id] = (__rp[terms.category])[terms.id]; | ||
|
|
||
| parameters.DeclareCategory (__rp[terms.category]); | ||
| parameters.helper.copy_definitions (modelSpec[terms.parameters], __rp); | ||
| } | ||
|
|
||
| for (_rowChar = 0; _rowChar < models.binary.dimensions; _rowChar +=1 ){ | ||
| for (_colChar = _rowChar + 1; _colChar < models.binary.dimensions; _colChar += 1) { | ||
| __rp = Call (__rate_function, __alphabet[_rowChar], | ||
| __alphabet[_colChar], | ||
| namespace, | ||
| __modelType); | ||
|
|
||
|
|
||
| if (None != __rate_variation) { | ||
| __rp = Call (__rate_variation[terms.rate_variation.rate_modifier], | ||
| __rp, | ||
| __alphabet[_rowChar], | ||
| __alphabet[_colChar], | ||
| namespace, | ||
| __rate_variation [terms.id]); | ||
| } | ||
|
|
||
| if (Abs (__rp[terms.model.rate_entry])) { | ||
| parameters.DeclareGlobal (__rp[terms.global], __global_cache); | ||
| parameters.helper.copy_definitions (modelSpec[terms.parameters], __rp); | ||
|
|
||
| __rate_matrix [_rowChar][_colChar] = __rp[terms.model.rate_entry]; | ||
| __rate_matrix [_colChar][_rowChar] = __rp[terms.model.rate_entry]; | ||
| continue; | ||
| } | ||
| __rate_matrix [_rowChar][_colChar] = ""; | ||
| } | ||
| } | ||
|
|
||
| __rp = Call (__time_function, __modelType); | ||
|
|
||
| if (Abs (__rp)) { | ||
| ((modelSpec[terms.parameters])[terms.local])[terms.timeParameter ()] = __rp; | ||
| modelSpec [terms.model.rate_matrix] = parameters.AddMultiplicativeTerm (__rate_matrix, __rp, 0); | ||
| } else { | ||
| modelSpec [terms.model.rate_matrix] = __rate_matrix; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * @name models.binary.generic.Time | ||
| * @param option - does nothing | ||
| * @returns default time | ||
| */ | ||
| function models.binary.generic.Time (option) { | ||
| return terms.parameters.default_time; | ||
| } | ||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| LoadFunctionLibrary("../binary.bf"); | ||
| LoadFunctionLibrary("../parameters.bf"); | ||
| LoadFunctionLibrary("../frequencies.bf"); | ||
| LoadFunctionLibrary("../../UtilityFunctions.bf"); | ||
|
|
||
| /** @module models.protein.REV */ | ||
|
|
||
| /** | ||
| * @name models.protein.REV.ModelDescription | ||
| * @param {String} type | ||
| */ | ||
|
|
||
| lfunction models.binary.ModelDescription(type) { | ||
| return { | ||
| utility.getGlobalValue("terms.alphabet"): utility.getGlobalValue("models.binary.alphabet"), | ||
| utility.getGlobalValue("terms.description"): "General time reversible model for binary characters", | ||
| utility.getGlobalValue("terms.model.canonical"): 1, // is of the r_ij \times \pi_j form | ||
| utility.getGlobalValue("terms.model.reversible"): 1, | ||
| utility.getGlobalValue("terms.model.efv_estimate_name"): utility.getGlobalValue("terms.frequencies.binary"), | ||
| utility.getGlobalValue("terms.parameters"): { | ||
| utility.getGlobalValue("terms.global"): {}, | ||
| utility.getGlobalValue("terms.local"): {}, | ||
| utility.getGlobalValue("terms.model.empirical"): 1 | ||
| }, | ||
| utility.getGlobalValue("terms.model.type"): type, | ||
| utility.getGlobalValue("terms.model.get_branch_length"): "", | ||
| utility.getGlobalValue("terms.model.set_branch_length"): "models.generic.SetBranchLength", | ||
| utility.getGlobalValue("terms.model.constrain_branch_length"): "models.generic.constrain_branch_length", | ||
| utility.getGlobalValue("terms.model.frequency_estimator"): "frequencies.empirical.binary", | ||
| utility.getGlobalValue("terms.model.q_ij"): "models.binary._GenerateRate", | ||
| utility.getGlobalValue("terms.model.time"): "models.binary.generic.Time", | ||
| utility.getGlobalValue("terms.model.defineQ"): "models.binary._DefineQ", | ||
| utility.getGlobalValue("terms.model.post_definition"): "models.generic.post.definition" | ||
| }; | ||
| } | ||
|
|
||
| lfunction models.binary._GenerateRate(fromChar, toChar, namespace, model_type) { | ||
| models.binary._generateRate.p = {}; | ||
| models.binary._generateRate.p[model_type] = {}; | ||
|
|
||
| if (fromChar > toChar) { | ||
| models.binary.parameter_name = "mu_" + toChar + fromChar; | ||
| } else { | ||
| models.binary.parameter_name = "mu_" + fromChar + toChar; | ||
| } | ||
|
|
||
| if (model_type == utility.getGlobalValue("terms.global")) { | ||
| models.binary.parameter_name = parameters.ApplyNameSpace(models.binary.parameter_name, namespace); | ||
| } | ||
|
|
||
| (models.binary._generateRate.p[model_type])[terms.binaryRate(fromChar, toChar)] = models.binary.parameter_name; | ||
|
|
||
| models.binary._generateRate.p[utility.getGlobalValue("terms.model.rate_entry")] = models.binary.parameter_name; | ||
|
|
||
| return models.binary._generateRate.p; | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * @name models.protein.REV._DefineQ | ||
| * @param {Dictionary} model definition | ||
| * @param {String} namespace | ||
| */ | ||
| lfunction models.binary._DefineQ(model_dict, namespace) { | ||
| models.binary.generic.DefineQMatrix (model_dict, namespace); | ||
| /* | ||
| if (model_dict[utility.getGlobalValue("terms.model.type")] == utility.getGlobalValue("terms.global")) { | ||
| parameters.SetConstraint( ((model_dict[utility.getGlobalValue("terms.parameters")])[utility.getGlobalValue("terms.global")])[terms.binaryRate("0", "1")], "1", "" ); | ||
| } | ||
| if (model_dict[utility.getGlobalValue("terms.model.type")] == utility.getGlobalValue("terms.local")) { | ||
| parameters.SetConstraint(((model_dict[utility.getGlobalValue("terms.parameters")])[utility.getGlobalValue("terms.local")])[terms.binaryRate("0", "1")], "1", ""); | ||
| } | ||
| */ | ||
|
|
||
| return model_dict; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters