Version 2.3.2 : Improve error message in fusion_mod_xy

simonpenel · Sep 20, 2024 · 0a2e281 · 0a2e281
1 parent 92798fa
commit 0a2e281
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "light_phylogeny"
-version = "2.3.1"
+version = "2.3.2"
 authors = ["Simon Penel <simon.penel@univ-lyon1.fr>"]
 edition = "2018"
 description ="Methods and functions for phylogeny."

diff --git a/src/arena.rs b/src/arena.rs
@@ -1872,8 +1872,9 @@ pub fn shift_nodes_y_values(tree: &mut ArenaTree<String>, index: usize, y:  f32)
 /// Merge 2 nodes in the species tree (hybridation)
 pub fn fusion_mod_xy(tree: &mut ArenaTree<String>, index_1: usize, index_2: usize) {
     if ((! tree.is_leaf(index_1) )  && ( tree.is_leaf(index_2) )) || (( tree.is_leaf(index_1) )  && ( !tree.is_leaf(index_2) )) {
-        println!("Merging between {} and  {} is not allowed.",tree.arena[index_1].name,tree.arena[index_2].name);
-        panic!("Merging between a leave and an internal node is not allowed.");
+        eprintln!("[fusion_mod_xy] ERROR Unable to merge {} and {}.",tree.arena[index_1].name,tree.arena[index_2].name);
+        eprintln!("Merging between a leave and an internal node is not allowed.");
+        process::exit(1)
     }
     let dist1 = tree.arena[index_1].x;
     let dist2 = tree.arena[index_2].x;