Skip to content

Remove options to select uncommented strategies. #78

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.

Sign up for GitHub

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

Merged
sebschmi merged 1 commit into from
May 22, 2025
Merged

Remove options to select uncommented strategies. #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib_tsalign/src/a_star_aligner/configurable_a_star_align.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pub enum InputAlphabet {
#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
pub enum NodeOrdStrategySelector {
CostOnly,
// CostOnly,
AntiDiagonal,
}

Expand All @@ -129,7 +129,7 @@ pub enum MinLengthStrategySelector {
#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
pub enum ChainingStrategySelector {
None,
PrecomputeOnly,
// PrecomputeOnly,
LowerBound,
}

Expand Down Expand Up @@ -181,15 +181,15 @@ fn a_star_align_select_node_ord_strategy<AlphabetType: Alphabet + Debug + Clone
let costs = TemplateSwitchConfig::read_plain(config.costs.as_bytes()).unwrap();

match config.node_ord_strategy {
NodeOrdStrategySelector::CostOnly => {
/*a_star_align_select_template_switch_min_length_strategy::<_, _, CostOnlyNodeOrdStrategy>(
/*NodeOrdStrategySelector::CostOnly => {
a_star_align_select_template_switch_min_length_strategy::<_, _, CostOnlyNodeOrdStrategy>(
reference.as_genome_subsequence(),
query.as_genome_subsequence(),
config,
costs,
)*/
)
unimplemented!("The other option appears to always be better.");
}
}*/
NodeOrdStrategySelector::AntiDiagonal => {
a_star_align_select_template_switch_min_length_strategy::<
_,
Expand Down Expand Up @@ -250,16 +250,16 @@ fn a_star_align_select_chaining_strategy<
TemplateSwitchMinLength,
NoChainingStrategy<U64Cost>,
>(reference, query, config, costs),
ChainingStrategySelector::PrecomputeOnly => {
/*a_star_align_select_no_ts_strategy::<
/*ChainingStrategySelector::PrecomputeOnly => {
a_star_align_select_no_ts_strategy::<
_,
_,
NodeOrd,
TemplateSwitchMinLength,
PrecomputeOnlyChainingStrategy<U64Cost>,
>(reference, query, config, costs)*/
>(reference, query, config, costs)
unimplemented!("No reason to precompute without using the information.");
}
}*/
ChainingStrategySelector::LowerBound => a_star_align_select_no_ts_strategy::<
_,
_,
Expand Down
20 changes: 10 additions & 10 deletions tsalign/src/align/template_switch_distance_type_selectors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use super::Cli;

#[derive(Clone, ValueEnum)]
pub enum TemplateSwitchNodeOrdStrategySelector {
CostOnly,
// CostOnly,
AntiDiagonal,
}

Expand All @@ -50,7 +50,7 @@ pub enum TemplateSwitchMinLengthStrategySelector {
#[derive(Clone, ValueEnum)]
pub enum TemplateSwitchChainingStrategySelector {
None,
PrecomputeOnly,
// PrecomputeOnly,
LowerBound,
}

Expand Down Expand Up @@ -90,14 +90,14 @@ fn align_a_star_template_switch_distance_select_node_ord_strategy<
query_name: &str,
) {
match cli.ts_node_ord_strategy {
TemplateSwitchNodeOrdStrategySelector::CostOnly => {
/*align_a_star_template_switch_distance_select_template_switch_min_length_strategy::<
/*TemplateSwitchNodeOrdStrategySelector::CostOnly => {
align_a_star_template_switch_distance_select_template_switch_min_length_strategy::<
_,
_,
CostOnlyNodeOrdStrategy,
>(cli, reference, query, reference_name, query_name)*/
>(cli, reference, query, reference_name, query_name)
unimplemented!("The other option appears to always be better.");
}
}*/
TemplateSwitchNodeOrdStrategySelector::AntiDiagonal => {
align_a_star_template_switch_distance_select_template_switch_min_length_strategy::<
_,
Expand Down Expand Up @@ -161,16 +161,16 @@ fn align_a_star_template_switch_select_chaining_strategy<
NoChainingStrategy<U64Cost>,
>(cli, reference, query, reference_name, query_name)
}
TemplateSwitchChainingStrategySelector::PrecomputeOnly => {
/*align_a_star_template_switch_select_no_ts_strategy::<
/*TemplateSwitchChainingStrategySelector::PrecomputeOnly => {
align_a_star_template_switch_select_no_ts_strategy::<
_,
_,
NodeOrd,
TemplateSwitchMinLength,
PrecomputeOnlyChainingStrategy<U64Cost>,
>(cli, reference, query, reference_name, query_name)*/
>(cli, reference, query, reference_name, query_name)
unimplemented!("No reason to precompute without using the information.");
}
}*/
TemplateSwitchChainingStrategySelector::LowerBound => {
align_a_star_template_switch_select_no_ts_strategy::<
_,
Expand Down