Skip to content

Commit

Permalink
Fix clippy warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@daemontus
daemontus committed Oct 22, 2024
1 parent 0588ce1 commit e910d7b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 27 deletions.
6 changes: 1 addition & 5 deletions src/bdt/_impl_bdt.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ impl Bdt {
}

pub fn get_precision(&self) -> u32 {
if let Some(precision) = self.precision {
precision
} else {
10000
}
self.precision.unwrap_or(10000)
}

/// Node ID of the tree root.
Expand Down
2 changes: 1 addition & 1 deletion src/bin/benchmark_filter.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn main() {
let model = erase_regulation_bounds(&sbml_model);

let bench_name = bench_dir.file_name().to_str().unwrap().to_string();
let aeon_file = aeon_benchmarks.join(&format!("{}_{}.aeon", i, bench_name));
let aeon_file = aeon_benchmarks.join(format!("{}_{}.aeon", i, bench_name));
std::fs::write(aeon_file, model.to_string()).unwrap();
}
}
Expand Down
42 changes: 21 additions & 21 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ fn get_attributes(node_id: String) -> BackendResponse {
let node = if let Some(node) = node {
node
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};
BackendResponse::ok(tree.attribute_gains_json(node).to_string())
} else {
Expand Down Expand Up @@ -157,7 +157,7 @@ fn get_stability_data(node_id: String, behaviour_str: String) -> BackendResponse
let node = if let Some(n) = node {
n
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};
tree.all_node_params(node)
} else {
Expand Down Expand Up @@ -217,13 +217,13 @@ fn apply_attribute(node_id: String, attribute_id: String) -> BackendResponse {
let node = if let Some(node) = node {
node
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};
let attribute = AttributeId::try_from_str(&attribute_id, tree);
let attribute = if let Some(val) = attribute {
val
} else {
return BackendResponse::err(&format!("Invalid attribute id {}.", attribute_id));
return BackendResponse::err(format!("Invalid attribute id {}.", attribute_id));
};
if let Ok((left, right)) = tree.make_decision(node, attribute) {
let changes = array![
Expand All @@ -249,7 +249,7 @@ fn revert_decision(node_id: String) -> BackendResponse {
let node = if let Some(node) = node {
node
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};
let removed = tree.revert_decision(node);
let removed = removed
Expand All @@ -273,7 +273,7 @@ fn auto_expand(node_id: String, depth: String) -> BackendResponse {
if let Ok(depth) = parsed {
depth
} else {
return BackendResponse::err(&format!("Invalid tree depth: {}", depth));
return BackendResponse::err(format!("Invalid tree depth: {}", depth));
}
};
if depth > 10 {
Expand All @@ -285,7 +285,7 @@ fn auto_expand(node_id: String, depth: String) -> BackendResponse {
let node_id: BdtNodeId = if let Some(node_id) = BdtNodeId::try_from_str(&node_id, tree) {
node_id
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};
let changed = tree.auto_expand(node_id, depth);
BackendResponse::ok(tree.to_json_partial(&changed).to_string())
Expand Down Expand Up @@ -315,7 +315,7 @@ fn get_tree_precision() -> BackendResponse {
let tree = TREE.clone();
let tree = tree.read().unwrap();
if let Some(tree) = tree.as_ref() {
BackendResponse::ok(&format!("{}", tree.get_precision()))
BackendResponse::ok(format!("{}", tree.get_precision()))
} else {
BackendResponse::err("Cannot modify decision tree.")
}
Expand Down Expand Up @@ -375,12 +375,12 @@ async fn check_update_function(data: Data<'_>) -> BackendResponse {
*lock = !(*lock);
match graph {
Ok(cardinality) => {
BackendResponse::ok(&format!("{{\"cardinality\":\"{}\"}}", cardinality))
BackendResponse::ok(format!("{{\"cardinality\":\"{}\"}}", cardinality))
}
Err(error) => BackendResponse::err(&error),
}
}
Err(error) => BackendResponse::err(&format!("{}", error)),
Err(error) => BackendResponse::err(format!("{}", error)),
}
}

Expand Down Expand Up @@ -512,7 +512,7 @@ fn get_tree_witness(node_id: String) -> BackendResponse {
let node = if let Some(node) = node {
node
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};

if let Some(params) = tree.params_for_leaf(node) {
Expand Down Expand Up @@ -559,7 +559,7 @@ fn get_stability_witness(
let node = if let Some(n) = node {
n
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};
tree.all_node_params(node)
} else {
Expand Down Expand Up @@ -683,7 +683,7 @@ fn get_tree_attractors(node_id: String) -> BackendResponse {
let node = if let Some(value) = node {
value
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};

if let Some(params) = tree.params_for_leaf(node) {
Expand Down Expand Up @@ -730,7 +730,7 @@ fn get_stability_attractors(
let node = if let Some(n) = node {
n
} else {
return BackendResponse::err(&format!("Invalid node id {}.", node_id));
return BackendResponse::err(format!("Invalid node id {}.", node_id));
};
tree.all_node_params(node)
} else {
Expand Down Expand Up @@ -964,7 +964,7 @@ async fn get_control_computation_status() -> BackendResponse {
if let Some(computation) = &*cmp {
let elapsed = computation
.finished_timestamp
.unwrap_or_else(|| SystemTime::now())
.unwrap_or_else(SystemTime::now)
.duration_since(computation.timestamp)
.unwrap();
let elapsed = u64::try_from(elapsed.as_millis()).unwrap_or(u64::MAX);
Expand Down Expand Up @@ -1259,18 +1259,18 @@ async fn start_computation(data: Data<'_>) -> BackendResponse {
let mut stream = data.open(ByteUnit::Megabyte(10)); // limit model to 10MB
let mut aeon_string = String::new();
if let Err(error) = stream.read_to_string(&mut aeon_string).await {
return BackendResponse::err(&format!("Cannot read model: {}", error));
return BackendResponse::err(format!("Cannot read model: {}", error));
}
let network = match BooleanNetwork::try_from(aeon_string.as_str()) {
Ok(network) => network,
Err(error) => {
return BackendResponse::err(&format!("Invalid network: {}", error));
return BackendResponse::err(format!("Invalid network: {}", error));
}
};
let graph = match SymbolicAsyncGraph::new(&network) {
Ok(graph) => graph,
Err(error) => {
return BackendResponse::err(&format!("Cannot create graph: {}", error));
return BackendResponse::err(format!("Cannot create graph: {}", error));
}
};
// Now we can try to start the computation...
Expand Down Expand Up @@ -1438,7 +1438,7 @@ async fn sbml_to_aeon(data: Data<'_>) -> BackendResponse {
Err(error) => BackendResponse::err(&error),
}
}
Err(error) => BackendResponse::err(&format!("{}", error)),
Err(error) => BackendResponse::err(format!("{}", error)),
}
}

Expand Down Expand Up @@ -1491,7 +1491,7 @@ async fn aeon_to_sbml(data: Data<'_>) -> BackendResponse {
}
Err(error) => BackendResponse::err(&error),
},
Err(error) => BackendResponse::err(&format!("{}", error)),
Err(error) => BackendResponse::err(format!("{}", error)),
}
}

Expand All @@ -1517,7 +1517,7 @@ async fn aeon_to_sbml_instantiated(data: Data<'_>) -> BackendResponse {
Err(error) => BackendResponse::err(&error),
}
}
Err(error) => BackendResponse::err(&format!("{}", error)),
Err(error) => BackendResponse::err(format!("{}", error)),
}
}

Expand Down

0 comments on commit e910d7b

Please sign in to comment.