diff --git a/src/process.rs b/src/process.rs index eb3a33b9..2c45f803 100644 --- a/src/process.rs +++ b/src/process.rs @@ -143,15 +143,6 @@ impl HscDynamics { } let mut moran = exp.switch_to_moran(options_moran.distributions, options_save, filename, rng); - // save at the end of the exp phase - moran - .save( - moran.time, - &SavingCells::WholePopulation, - moran.save_sfs_only, - rng, - ) - .expect("cannot save simulation at the end of the exponential phase"); if options_moran.gillespie_options.verbosity > 0 { println!("{} simulating Moran phase", Utc::now()); } @@ -427,9 +418,6 @@ impl Moran { //! 2. else, compute the variant counts //! 3. and sample from any clone based on the weights defined by //! the variant counts - if self.verbosity > 2 { - println!("keeping the cell population constant"); - } // remove a cell from a random subclone based on the frequencies of // the clones at the current state let variants = Variants::variant_counts(&self.subclones); @@ -441,8 +429,11 @@ impl Moran { .with_context(|| "found empty subclone")?; self.tree .remove_cell_from_tree(cell2remove.id, self.verbosity)?; - if self.verbosity > 2 { - println!("removing one cell from clone {}", id2remove); + if self.verbosity > 1 { + println!( + "keep the cell pop constant by removing cell with id {} from clone {}", + cell2remove.id, id2remove + ); } Ok(()) } diff --git a/src/proliferation.rs b/src/proliferation.rs index 1e7436e7..16720797 100644 --- a/src/proliferation.rs +++ b/src/proliferation.rs @@ -164,7 +164,10 @@ impl Proliferation { self.last_id += 1; new_cell.id = self.last_id; if verbosity > 1 { - println!("Adding the sibling cell on a new node"); + println!( + "adding the sibling cell with id {} on a new node", + self.last_id + ); } assign_divisional_mutations( &mut new_cell, @@ -212,7 +215,10 @@ impl Proliferation { self.last_id += 1; new_cell.id = self.last_id; if verbosity > 1 { - println!("Adding the sibling cell on a new node"); + println!( + "adding the sibling cell with id {} on a new node", + self.last_id + ); } assign_divisional_mutations( &mut new_cell,