diff --git a/acr/parsimony.go b/acr/parsimony.go index fd2703b..00bd42e 100644 --- a/acr/parsimony.go +++ b/acr/parsimony.go @@ -15,6 +15,7 @@ const ( ALGO_DELTRAN = iota ALGO_ACCTRAN ALGO_DOWNPASS + ALGO_NONE ) // Will annotate the tree nodes with ancestral characters @@ -66,6 +67,8 @@ func ParsimonyAcr(t *tree.Tree, tipCharacters map[string]string, algo int, rando parsimonyDELTRAN(t.Root(), nil, states, stateIndices, randomResolve) case ALGO_ACCTRAN: parsimonyACCTRAN(t.Root(), nil, states, stateIndices, randomResolve) + case ALGO_NONE: + // No pass after uppass default: return nil, fmt.Errorf("Parsimony algorithm %d unkown", algo) } diff --git a/asr/parsimony.go b/asr/parsimony.go index 6bbcbef..eab903a 100644 --- a/asr/parsimony.go +++ b/asr/parsimony.go @@ -15,6 +15,7 @@ const ( ALGO_DELTRAN = iota ALGO_ACCTRAN ALGO_DOWNPASS + ALGO_NONE ) // Will annotate the tree nodes with ancestral sequences diff --git a/cmd/acr.go b/cmd/acr.go index dde9427..96a1edf 100644 --- a/cmd/acr.go +++ b/cmd/acr.go @@ -31,6 +31,7 @@ Depending on the chosen algorithm, it will run: a) DOWN-PASS or b) DOWN-PASS+DELTRAN or c) ACCTRAN + d) NONE Should work on multifurcated trees. @@ -52,6 +53,8 @@ randomly before going deeper in the tree. algo = acr.ALGO_DELTRAN case "downpass": algo = acr.ALGO_DOWNPASS + case "none": + algo = acr.ALGO_NONE default: io.ExitWithMessage(fmt.Errorf("Unkown parsimony algorithm: %s", parsimonyAlgo)) } diff --git a/cmd/asr.go b/cmd/asr.go index 44089d5..98c79d6 100644 --- a/cmd/asr.go +++ b/cmd/asr.go @@ -34,6 +34,7 @@ Depending on the chosen algorithm, it will run: a) DOWN-PASS or b) DOWN-PASS+DELTRAN or c) ACCTRAN + d) NONE Should work on multifurcated trees @@ -56,6 +57,8 @@ randomly before going deeper in the tree. algo = asr.ALGO_DELTRAN case "downpass": algo = asr.ALGO_DOWNPASS + case "none": + algo = asr.ALGO_NONE default: io.ExitWithMessage(fmt.Errorf("Unkown parsimony algorithm: %s", parsimonyAlgo)) }