remove the median_chromosome implementation and just make an effort to estimate the permutable_allele_size(s)_scaled directly

Author: basvanwesting

src/genotype/multi_range.rs

@@ -612,16 +612,11 @@ where
     fn chromosome_permutations_size(&self, scale_index: Option<usize>) -> BigUint {
         if self.seed_genes_list.is_empty() {
             match self.mutation_type {
-                MutationType::Scaled => {
-                    let median_chromosome = self.median_chromosome();
-                    self.permutable_gene_values_scaled(
-                        Some(&median_chromosome),
-                        scale_index.unwrap(),
-                    )
+                MutationType::Scaled => self
+                    .permutable_allele_sizes_scaled(scale_index.unwrap())
                     .iter()
-                    .map(|v| BigUint::from(v.len()))
-                    .product()
-                }
+                    .map(|v| BigUint::from(*v))
+                    .product(),
                 MutationType::Relative => {
                     panic!("RangeGenotype is not permutable for MutationType::Relative")
                 }
@@ -710,51 +705,41 @@ where
             .collect()
     }
 
-    // pub fn permutable_gene_values_relative(
-    //     &self,
-    //     _chromosome: Option<&MultiRangeChromosome<T>>,
-    // ) -> Vec<Vec<T>> {
-    //     panic!("MultiRangeGenotype is not permutable for MutationType::Relative");
-    // }
-    //
-    // pub fn permutable_gene_values_random(
-    //     &self,
-    //     _chromosome: Option<&MultiRangeChromosome<T>>,
-    // ) -> Vec<Vec<T>> {
-    //     panic!("MultiRangeGenotype is not permutable for MutationType::Random");
-    // }
-
-    pub fn median_chromosome(&self) -> MultiRangeChromosome<T> {
-        let median_genes = self
-            .allele_ranges
+    pub fn permutable_allele_sizes_scaled(&self, scale_index: usize) -> Vec<usize> {
+        self.allele_ranges
             .clone()
             .into_iter()
             .enumerate()
             .map(|(index, allele_range)| {
-                let allele_range_start = *allele_range.start();
-                let allele_range_end = *allele_range.end();
+                let (allele_value_start, allele_value_end) =
+                    if let Some(previous_scale_index) = scale_index.checked_sub(1) {
+                        let working_range = &self.allele_mutation_scaled_ranges.as_ref().unwrap()
+                            [previous_scale_index][index];
+
+                        (*working_range.start(), *working_range.end())
+                    } else {
+                        (*allele_range.start(), *allele_range.end())
+                    };
 
-                let working_range = &self.allele_mutation_scaled_ranges.as_ref().unwrap()[0][index];
+                let working_range =
+                    &self.allele_mutation_scaled_ranges.as_ref().unwrap()[scale_index][index];
                 let working_range_step = *working_range.end();
 
-                let allele_value_iter = std::iter::successors(Some(allele_range_start), |value| {
-                    if *value < allele_range_end {
+                std::iter::successors(Some(allele_value_start), |value| {
+                    if *value < allele_value_end {
                         let next_value = *value + working_range_step;
-                        if next_value > allele_range_end {
-                            Some(allele_range_end)
+                        if next_value > allele_value_end {
+                            Some(allele_value_end)
                         } else {
                             Some(next_value)
                         }
                     } else {
                         None
                     }
-                });
-
-                let median_step = allele_value_iter.clone().count() / 2;
-                allele_value_iter.clone().nth(median_step).unwrap()
+                })
+                .count()
             })
-            .collect();
-        MultiRangeChromosome::new(median_genes)
+            .collect()
     }
 }
 

src/genotype/range.rs

@@ -554,14 +554,8 @@ where
         if self.seed_genes_list.is_empty() {
             match self.mutation_type {
                 MutationType::Scaled => {
-                    let median_chromosome = self.median_chromosome();
-                    self.permutable_gene_values_scaled(
-                        Some(&median_chromosome),
-                        scale_index.unwrap(),
-                    )
-                    .iter()
-                    .map(|v| BigUint::from(v.len()))
-                    .product()
+                    BigUint::from(self.permutable_allele_size_scaled(scale_index.unwrap()))
+                        .pow(self.genes_size() as u32)
                 }
                 MutationType::Relative => {
                     panic!("RangeGenotype is not permutable for MutationType::Relative")
@@ -647,44 +641,32 @@ where
             .collect()
     }
 
-    // pub fn permutable_gene_values_relative(
-    //     &self,
-    //     _chromosome: Option<&RangeChromosome<T>>,
-    // ) -> Vec<Vec<T>> {
-    //     panic!("RangeGenotype is not permutable for MutationType::Relative");
-    // }
-    //
-    // pub fn permutable_gene_values_random(
-    //     &self,
-    //     _chromosome: Option<&RangeChromosome<T>>,
-    // ) -> Vec<Vec<T>> {
-    //     panic!("RangeGenotype is not permutable for MutationType::Random");
-    // }
-
-    pub fn median_chromosome(&self) -> RangeChromosome<T> {
-        let allele_range_start = *self.allele_range.start();
-        let allele_range_end = *self.allele_range.end();
+    pub fn permutable_allele_size_scaled(&self, scale_index: usize) -> usize {
+        let (allele_value_start, allele_value_end) =
+            if let Some(previous_scale_index) = scale_index.checked_sub(1) {
+                let working_range =
+                    &self.allele_mutation_scaled_range.as_ref().unwrap()[previous_scale_index];
+                (*working_range.start(), *working_range.end())
+            } else {
+                (*self.allele_range.start(), *self.allele_range.end())
+            };
 
-        let working_range = &self.allele_mutation_scaled_range.as_ref().unwrap()[0];
+        let working_range = &self.allele_mutation_scaled_range.as_ref().unwrap()[scale_index];
         let working_range_step = *working_range.end();
 
-        let allele_value_iter = std::iter::successors(Some(allele_range_start), |value| {
-            if *value < allele_range_end {
+        std::iter::successors(Some(allele_value_start), |value| {
+            if *value < allele_value_end {
                 let next_value = *value + working_range_step;
-                if next_value > allele_range_end {
-                    Some(allele_range_end)
+                if next_value > allele_value_end {
+                    Some(allele_value_end)
                 } else {
                     Some(next_value)
                 }
             } else {
                 None
             }
-        });
-
-        let median_step = allele_value_iter.clone().count() / 2;
-        let median_value = allele_value_iter.clone().nth(median_step).unwrap();
-        let median_genes = (0..self.genes_size()).map(|_| median_value).collect();
-        RangeChromosome::new(median_genes)
+        })
+        .count()
     }
 }
 

tests/genotype/multi_range_test.rs

@@ -376,42 +376,6 @@ fn float_permutable_gene_values_scaled() {
     ));
 }
 
-#[test]
-fn float_median_chromosome() {
-    // large
-    let mut genotype = MultiRangeGenotype::builder()
-        .with_allele_ranges(vec![0.0..=10.0, 0.0..=5.0])
-        .with_allele_mutation_scaled_ranges(vec![vec![-1.0..=1.0, -2.0..=2.0]])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![5.0, 4.0]);
-
-    // even
-    let mut genotype = MultiRangeGenotype::builder()
-        .with_allele_ranges(vec![0.0..=1.0, 0.0..=2.0])
-        .with_allele_mutation_scaled_ranges(vec![vec![-1.0..=1.0, -2.0..=2.0]])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![1.0, 2.0]);
-
-    // odd
-    let mut genotype = MultiRangeGenotype::builder()
-        .with_allele_ranges(vec![0.0..=2.0, 0.0..=4.0])
-        .with_allele_mutation_scaled_ranges(vec![vec![-1.0..=1.0, -2.0..=2.0]])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![1.0, 2.0]);
-}
-
 #[test]
 fn float_chromosome_permutations_2_scaled() {
     let mut rng = SmallRng::seed_from_u64(0);

tests/genotype/range_test.rs

@@ -451,45 +451,6 @@ fn float_permutable_gene_values_scaled() {
     ));
 }
 
-#[test]
-fn float_median_chromosome() {
-    // large
-    let mut genotype = RangeGenotype::builder()
-        .with_genes_size(2)
-        .with_allele_range(0.0..=1.0)
-        .with_allele_mutation_scaled_range(vec![-0.1..=0.1])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![0.6, 0.6]);
-
-    // even
-    let mut genotype = RangeGenotype::builder()
-        .with_genes_size(2)
-        .with_allele_range(0.0..=0.1)
-        .with_allele_mutation_scaled_range(vec![-0.1..=0.1])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![0.1, 0.1]);
-
-    // odd
-    let mut genotype = RangeGenotype::builder()
-        .with_genes_size(2)
-        .with_allele_range(0.0..=0.2)
-        .with_allele_mutation_scaled_range(vec![-0.1..=0.1])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![0.1, 0.1]);
-}
-
 #[test]
 fn float_chromosome_permutations_2_scaled() {
     let mut rng = SmallRng::seed_from_u64(0);
@@ -864,45 +825,6 @@ fn integer_permutable_gene_values_scaled() {
     );
 }
 
-#[test]
-fn integer_median_chromosome() {
-    // large
-    let mut genotype = RangeGenotype::builder()
-        .with_genes_size(2)
-        .with_allele_range(0..=1000)
-        .with_allele_mutation_scaled_range(vec![-1..=1])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![500, 500]);
-
-    // even
-    let mut genotype = RangeGenotype::builder()
-        .with_genes_size(2)
-        .with_allele_range(0..=1)
-        .with_allele_mutation_scaled_range(vec![-1..=1])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![1, 1]);
-
-    // odd
-    let mut genotype = RangeGenotype::builder()
-        .with_genes_size(2)
-        .with_allele_range(0..=2)
-        .with_allele_mutation_scaled_range(vec![-1..=1])
-        .build()
-        .unwrap();
-    genotype.chromosomes_setup();
-
-    let chromosome = genotype.median_chromosome();
-    assert_eq!(inspect::chromosome(&chromosome), vec![1, 1]);
-}
-
 #[test]
 fn integer_chromosome_permutations_2_scaled() {
     let mut rng = SmallRng::seed_from_u64(0);