Skip to content

Commit d418162

Browse files
style(validation_tests): output formatting
1 parent ee6752f commit d418162

1 file changed

Lines changed: 26 additions & 10 deletions

File tree

test/validation/rdkit_comparison_tests.jl

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,19 @@ function run_similarity_comparison(smiles_list::Vector{String}, calc::AbstractCa
131131
score = cosine_similarity(jl_fp, rd_fp)
132132
push!(cosine_scores, score)
133133
end
134-
@info "Completed similarity comparison for $(length(smiles_list)) molecules using $(typeof(calc))."
135-
@info "Tanimoto Similarity: Mean=$(mean(tanimoto_scores)), Min=$(minimum(tanimoto_scores)), Max=$(maximum(tanimoto_scores))"
136-
@info "Cosine Similarity: Mean=$(mean(cosine_scores)), Min=$(minimum(cosine_scores)), Max=$(maximum(cosine_scores))"
134+
@info """Completed similarity comparison:
135+
Molecules: $(length(smiles_list))
136+
Method: $(typeof(calc))
137+
138+
Tanimoto Similarity:
139+
Mean: $(mean(tanimoto_scores))
140+
Min: $(minimum(tanimoto_scores))
141+
Max: $(maximum(tanimoto_scores))
142+
143+
Cosine Similarity:
144+
Mean: $(mean(cosine_scores))
145+
Min: $(minimum(cosine_scores))
146+
Max: $(maximum(cosine_scores))"""
137147
return tanimoto_scores, cosine_scores
138148
end
139149

@@ -167,7 +177,7 @@ function run_all_tests()
167177
sample_smiles = all_datasets[1:100] # Sample 100 molecules for benchmarking
168178
for (calc_name, calc) in CALCULATORS
169179
@info "Calculator: $calc_name "
170-
@info @btime fingerprint($sample_smiles, $calc)
180+
@btime fingerprint($sample_smiles, $calc)
171181
end
172182

173183
# Benchmarking vs RDKit
@@ -212,16 +222,21 @@ function run_all_tests()
212222
# Compare top 10 results
213223
jl_top10 = sortperm(jl_scores, rev=true)[1:10]
214224
rd_top10 = sortperm(rd_scores, rev=true)[1:10]
215-
@info "Julia Top 10 Indices: $jl_top10"
216-
@info "RDKit Top 10 Indices: $rd_top10"
217-
@info "Recall@10: $(length(intersect(jl_top10, rd_top10)) / 10)"
218225
ndcg = 0.0
219226
for (rank, idx) in enumerate(jl_top10)
220227
if idx in rd_top10
221228
ndcg += 1 / log2(rank + 1)
222229
end
223230
end
224-
@info "NDCG@10: $ndcg"
231+
@info """Top 10 Comparison Results:
232+
-------------------------------------------
233+
Julia: $jl_top10
234+
RDKit: $rd_top10
235+
236+
Metrics:
237+
- Recall@10: $(length(intersect(jl_top10, rd_top10)) / 10)
238+
- NDCG@10: $ndcg
239+
-------------------------------------------"""
225240
end
226241
end
227242

@@ -271,8 +286,9 @@ function run_all_tests()
271286
end
272287
avg_recall_tanimoto = total_recall_tanimoto / num_queries
273288
avg_recall_cosine = total_recall_cosine / num_queries
274-
@info "Average Recall@10 (Tanimoto similarity): $avg_recall_tanimoto"
275-
@info "Average Recall@10 (Cosine similarity): $avg_recall_cosine"
289+
@info """Mean Performance Metrics (Recall@10):
290+
• Tanimoto: $(avg_recall_tanimoto)
291+
• Cosine: $(avg_recall_cosine)"""
276292

277293
end
278294

0 commit comments

Comments
 (0)