v0.24.0

fraterenz · Jul 19, 2024 · 7cc9fd0 · 7cc9fd0
1 parent ca93da0
commit 7cc9fd0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.24.0
+- Increase the number of max iterations and cells
+- Save at the end of the simulation
+- Specify either years or cells to simulate in the app
+
 ## 0.23.0
 Huge update to remove useless stuff and keep only the content relevant for the PhD thesis.
 Remove `abc` in rust, do it in python.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecdna-evo"
-version = "0.23.0"
+version = "0.24.0"
 edition = "2021"
 repository = "https://github.com/fraterenz/ecdna-evo"
 description = "Evolutionary models of extra-chromosomal DNA (ecDNA)"

diff --git a/src/lib.rs b/src/lib.rs
@@ -56,19 +56,6 @@ pub mod test_util {
     use ecdna_lib::{distribution::EcDNADistribution, DNACopy};
     use quickcheck::{Arbitrary, Gen};
 
-    #[derive(Clone, Debug)]
-    struct DNACopyGreaterOne(DNACopy);
-
-    impl Arbitrary for DNACopyGreaterOne {
-        fn arbitrary(g: &mut Gen) -> DNACopyGreaterOne {
-            let mut copy = NonZeroU16::arbitrary(g);
-            if copy == NonZeroU16::new(1).unwrap() {
-                copy = NonZeroU16::new(2).unwrap();
-            }
-            DNACopyGreaterOne(copy)
-        }
-    }
-
     #[derive(Clone, Debug)]
     pub struct NonEmptyDistribtionWithNPlusCells(pub EcDNADistribution);
 

diff --git a/src/segregation.rs b/src/segregation.rs
@@ -216,7 +216,6 @@ mod tests {
     use crate::test_util::DNACopySegregatingGreatherThanOne;
 
     use super::*;
-    use quickcheck::{Arbitrary, Gen};
     use quickcheck_macros::quickcheck;
     use rand::SeedableRng;
     use rand_chacha::ChaCha8Rng;
@@ -246,19 +245,6 @@ mod tests {
         assert_eq!(u16::from(copy.0), copy_segregating.get());
     }
 
-    #[derive(Clone, Debug)]
-    struct AvoidOverflowDNACopy(DNACopy);
-
-    impl Arbitrary for AvoidOverflowDNACopy {
-        fn arbitrary(g: &mut Gen) -> AvoidOverflowDNACopy {
-            let mut copy = DNACopy::arbitrary(g);
-            while copy >= NonZeroU16::new(u16::MAX / 2).unwrap() {
-                copy = DNACopy::arbitrary(g);
-            }
-            AvoidOverflowDNACopy(copy)
-        }
-    }
-
     #[quickcheck]
     fn segregate_deterministic_test(
         copies: DNACopySegregatingGreatherThanOne,