Add special permutable_allele_size_scaled to RangeGenoype and MultiRangeGenotype

Author: basvanwesting

CHANGELOG.md

@@ -22,6 +22,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     `StaticMatrixGenotype`, as matrix has no use for permutation_
   * _Note: Scales should be symmetrical around zero, as always, but good to
     remember_
+  * _Note: As an added benefit the generic `StrategyBuilder` with deferred
+    specialization can now also be used for `RangeGenotype` and
+    `MultiRangeGenotype`_
 * Keep track of `scale_generation` next to `current_generation` in
   `StrategyState`, resets every scale increment
 * Add `mutation_type_allows_permutation()` guard on `Genotype` and check in
@@ -600,7 +603,7 @@ This is a major breaking release, see Changed:
   * Rename `MutateSingleGeneRandomDynamic` to `MutateSingleGeneDynamic` as it just calls `mutate_chromosome()` on `Genotype`
   * Rename `MutateMultiGeneRandom` to `MutateMultiGene` as it just calls `mutate_chromosome()` on `Genotype`
   * Rename `MutateMultiGeneRandomDynamic` to `MutateMultiGeneDynamic`as it just calls `mutate_chromosome()` on `Genotype`
-  * Rename `allele_neighbour_range` to `allele_mutation_range` in `RangeGenoype` (incl. Multi) to define relative mutation
+  * Rename `allele_neighbour_range` to `allele_mutation_range` in `RangeGenotype` (incl. Multi) to define relative mutation
   * Add `allele_mutation_scaled_range` to `RangeGenotype` (incl. Multi) to define scaled mutation
 * All changes to `RangeGenotype` are reflected in `MultiRangeGenotype` as well
 

src/genotype/multi_range.rs

@@ -741,6 +741,13 @@ where
             })
             .collect()
     }
+
+    pub fn chromosome_permutations_size_scaled(&self, scale_index: usize) -> BigUint {
+        self.permutable_allele_sizes_scaled(scale_index)
+            .iter()
+            .map(|v| BigUint::from(*v))
+            .product()
+    }
 }
 
 impl<T: RangeAllele + Into<f64>> ChromosomeManager<Self> for MultiRange<T>
@@ -849,7 +856,16 @@ where
         writeln!(f, "genotype:")?;
         writeln!(f, "  genes_size: {}", self.genes_size)?;
         writeln!(f, "  mutation_type: {:?}", self.mutation_type)?;
-        writeln!(f, "  chromosome_permutations_size: uncountable")?;
+
+        if let Some(max_scale_index) = self.max_scale_index() {
+            let sizes: Vec<BigUint> = (0..max_scale_index)
+                .map(|scale_index| self.chromosome_permutations_size_scaled(scale_index))
+                .collect();
+            writeln!(f, "  chromosome_permutations_size (per scale): {:?}", sizes)?;
+        } else {
+            writeln!(f, "  chromosome_permutations_size: uncountable")?;
+        }
+
         writeln!(
             f,
             "  neighbouring_population_size: {}",

src/genotype/range.rs

@@ -668,6 +668,10 @@ where
         })
         .count()
     }
+
+    pub fn chromosome_permutations_size_scaled(&self, scale_index: usize) -> BigUint {
+        BigUint::from(self.permutable_allele_size_scaled(scale_index)).pow(self.genes_size() as u32)
+    }
 }
 
 impl<T: RangeAllele> ChromosomeManager<Self> for Range<T>
@@ -767,7 +771,7 @@ where
 
         if let Some(max_scale_index) = self.max_scale_index() {
             let sizes: Vec<BigUint> = (0..max_scale_index)
-                .map(|scale_index| self.chromosome_permutations_size(Some(scale_index)))
+                .map(|scale_index| self.chromosome_permutations_size_scaled(scale_index))
                 .collect();
             writeln!(f, "  chromosome_permutations_size (per scale): {:?}", sizes)?;
         } else {

tests/genotype/multi_range_test.rs

@@ -398,7 +398,7 @@ fn float_chromosome_permutations_2_scaled() {
     ));
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(0)),
+        genotype.chromosome_permutations_size_scaled(0),
         BigUint::from(9u32)
     );
     let chromosomes = genotype
@@ -422,7 +422,7 @@ fn float_chromosome_permutations_2_scaled() {
     ));
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(1)),
+        genotype.chromosome_permutations_size_scaled(1),
         BigUint::from(25u32)
     );
     let chromosomes = genotype
@@ -462,7 +462,7 @@ fn float_chromosome_permutations_2_scaled() {
     ));
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(2)),
+        genotype.chromosome_permutations_size_scaled(2),
         BigUint::from(24u32)
     );
     let chromosomes = genotype

tests/genotype/range_test.rs

@@ -470,7 +470,7 @@ fn float_chromosome_permutations_2_scaled() {
     ));
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(0)),
+        genotype.chromosome_permutations_size_scaled(0),
         BigUint::from(9u32)
     );
     let chromosomes = genotype
@@ -494,7 +494,7 @@ fn float_chromosome_permutations_2_scaled() {
     ));
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(1)),
+        genotype.chromosome_permutations_size_scaled(1),
         BigUint::from(36u32)
     );
     let chromosomes = genotype
@@ -545,7 +545,7 @@ fn float_chromosome_permutations_2_scaled() {
     ));
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(2)),
+        genotype.chromosome_permutations_size_scaled(2),
         BigUint::from(25u32)
     );
     let chromosomes = genotype
@@ -840,7 +840,7 @@ fn integer_chromosome_permutations_2_scaled() {
     assert_eq!(inspect::chromosome(&chromosome), vec![4, 4]);
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(0)),
+        genotype.chromosome_permutations_size_scaled(0),
         BigUint::from(9u32)
     );
     let chromosomes = genotype
@@ -862,7 +862,7 @@ fn integer_chromosome_permutations_2_scaled() {
     );
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(1)),
+        genotype.chromosome_permutations_size_scaled(1),
         BigUint::from(36u32)
     );
     let chromosomes = genotype
@@ -911,7 +911,7 @@ fn integer_chromosome_permutations_2_scaled() {
     );
 
     assert_eq!(
-        genotype.chromosome_permutations_size(Some(2)),
+        genotype.chromosome_permutations_size_scaled(2),
         BigUint::from(25u32)
     );
     let chromosomes = genotype