fix issue with max_scale_index where the max index should be inclusive

rename MatrixGenotype max_index to max_index_excl for clarity
fix issue with nqueens examples where the max_index is exclusive, no need for -1, rename to genes_size for clarity

Author: basvanwesting

examples/evolve_nqueens.rs

@@ -11,9 +11,9 @@ impl Fitness for NQueensFitness {
         _genotype: &FitnessGenotype<Self>,
     ) -> Option<FitnessValue> {
         let mut score = 0;
-        let max_index = chromosome.genes.len() - 1;
-        for i in 0..max_index {
-            for j in 0..max_index {
+        let genes_size = chromosome.genes.len();
+        for i in 0..genes_size {
+            for j in 0..genes_size {
                 if i != j {
                     let dx = i.abs_diff(j);
                     let dy = chromosome.genes[i].abs_diff(chromosome.genes[j]) as usize;

examples/evolve_range_float.rs

@@ -35,7 +35,7 @@ fn main() {
             -0.01..=0.01,
             -0.001..=0.001,
             -0.0001..=0.0001,
-            -0.00001..=0.0001,
+            -0.00001..=0.00001,
         ])
         .build()
         .unwrap();

examples/hill_climb_nqueens.rs

@@ -11,9 +11,9 @@ impl Fitness for NQueensFitness {
         _genotype: &FitnessGenotype<Self>,
     ) -> Option<FitnessValue> {
         let mut score = 0;
-        let max_index = chromosome.genes.len() - 1;
-        for i in 0..max_index {
-            for j in 0..max_index {
+        let genes_size = chromosome.genes.len();
+        for i in 0..genes_size {
+            for j in 0..genes_size {
                 if i != j {
                     let dx = i.abs_diff(j);
                     let dy = chromosome.genes[i].abs_diff(chromosome.genes[j]) as usize;

examples/hill_climb_range.rs

@@ -32,7 +32,7 @@ fn main() {
             -0.01..=0.01,
             -0.001..=0.001,
             -0.0001..=0.0001,
-            -0.00001..=0.0001,
+            -0.00001..=0.00001,
         ])
         .build()
         .unwrap();

examples/permutate_range.rs

@@ -30,7 +30,7 @@ fn main() {
             -0.01..=0.01,
             -0.001..=0.001,
             -0.0001..=0.0001,
-            -0.00001..=0.0001,
+            -0.00001..=0.00001,
         ])
         .build()
         .unwrap();

examples/profile_evolve_nqueens.rs

@@ -15,9 +15,9 @@ impl Fitness for NQueensFitness {
         _genotype: &FitnessGenotype<Self>,
     ) -> Option<FitnessValue> {
         let mut score = 0;
-        let max_index = chromosome.genes.len() - 1;
-        for i in 0..max_index {
-            for j in 0..max_index {
+        let genes_size = chromosome.genes.len();
+        for i in 0..genes_size {
+            for j in 0..genes_size {
                 if i != j {
                     let dx = i.abs_diff(j);
                     let dy = chromosome.genes[i].abs_diff(chromosome.genes[j]) as usize;

examples/profile_hill_climb_nqueens.rs

@@ -15,9 +15,9 @@ impl Fitness for NQueensFitness {
         _genotype: &FitnessGenotype<Self>,
     ) -> Option<FitnessValue> {
         let mut score = 0;
-        let max_index = chromosome.genes.len() - 1;
-        for i in 0..max_index {
-            for j in 0..max_index {
+        let genes_size = chromosome.genes.len();
+        for i in 0..genes_size {
+            for j in 0..genes_size {
                 if i != j {
                     let dx = i.abs_diff(j);
                     let dy = chromosome.genes[i].abs_diff(chromosome.genes[j]) as usize;

src/genotype/dynamic_matrix.rs

@@ -282,13 +282,13 @@ where
             Bound::Excluded(&i) => i + 1,
         }
         .max(0);
-        let max_index = match range.end_bound() {
+        let max_index_excl = match range.end_bound() {
             Bound::Unbounded => self.genes_size,
             Bound::Included(&i) => i + 1,
             Bound::Excluded(&i) => i,
         }
         .min(self.genes_size);
-        (min_index..max_index, min_index..max_index)
+        (min_index..max_index_excl, min_index..max_index_excl)
     }
 }
 

src/genotype/multi_range.rs

@@ -612,7 +612,7 @@ where
     fn chromosome_permutations_size(&self) -> BigUint {
         if self.seed_genes_list.is_empty() {
             match self.mutation_type {
-                MutationType::Scaled => (0..self.max_scale_index().unwrap())
+                MutationType::Scaled => (0..=self.max_scale_index().unwrap())
                     .map(|scale_index| self.chromosome_permutations_size_scaled(scale_index))
                     .sum(),
                 MutationType::Relative => {
@@ -856,7 +856,7 @@ where
         writeln!(f, "  mutation_type: {:?}", self.mutation_type)?;
 
         if self.mutation_type_allows_permutation() {
-            let size_per_scale: Vec<BigUint> = (0..self.max_scale_index().unwrap())
+            let size_per_scale: Vec<BigUint> = (0..=self.max_scale_index().unwrap())
                 .map(|scale_index| self.chromosome_permutations_size_scaled(scale_index))
                 .collect();
             writeln!(

src/genotype/range.rs

@@ -553,7 +553,7 @@ where
     fn chromosome_permutations_size(&self) -> BigUint {
         if self.seed_genes_list.is_empty() {
             match self.mutation_type {
-                MutationType::Scaled => (0..self.max_scale_index().unwrap())
+                MutationType::Scaled => (0..=self.max_scale_index().unwrap())
                     .map(|scale_index| self.chromosome_permutations_size_scaled(scale_index))
                     .sum(),
                 MutationType::Relative => {
@@ -769,7 +769,7 @@ where
         writeln!(f, "  mutation_type: {:?}", self.mutation_type)?;
 
         if self.mutation_type_allows_permutation() {
-            let size_per_scale: Vec<BigUint> = (0..self.max_scale_index().unwrap())
+            let size_per_scale: Vec<BigUint> = (0..=self.max_scale_index().unwrap())
                 .map(|scale_index| self.chromosome_permutations_size_scaled(scale_index))
                 .collect();
             writeln!(