Addresses minor PR feedbacks

Happy-Algorithms-League · Jul 29, 2020 · 1971747 · 1971747
1 parent 09f31ab
commit 1971747
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/cgp/genome.py b/cgp/genome.py
@@ -137,7 +137,8 @@ def __repr__(self) -> str:
         s += ")"
         return s
 
-    def determine_permissible_value_per_gene(self, gene_idx: int, region_idx: int) -> np.ndarray:
+    def determine_permissible_values_per_gene(self, gene_idx: int) -> np.ndarray:
+        region_idx = gene_idx // self._length_per_region
 
         if self._is_input_region(region_idx):
             return self._determine_permissible_values_input_region(gene_idx)
@@ -161,14 +162,11 @@ def determine_permissible_values(self) -> List[np.ndarray]:
         Returns
         ----------
         permissible_values
-            List[numpy.ndarray[int]]: List of permissible values for every gene
+            List[numpy.ndarray]: List of permissible values for every gene
         """
         permissible_values: List[np.ndarray] = []
         for gene_idx in range(self._n_genes):
-            region_idx = gene_idx // self._length_per_region
-            permissible_values_per_gene = self.determine_permissible_value_per_gene(
-                gene_idx, region_idx
-            )
+            permissible_values_per_gene = self.determine_permissible_values_per_gene(gene_idx)
             permissible_values.append(permissible_values_per_gene)
         return permissible_values
 
@@ -193,15 +191,15 @@ def _determine_permissible_values_hidden_region(
             assert False  # should never be reached
 
     def _determine_permissible_values_output_region(self, gene_idx: int,) -> np.ndarray:
-        input_index = (
-            gene_idx % self._length_per_region
-        )  # assumes that the second gene in all output regions is the index of the input
-        if input_index == 0:
+
+        if self._is_function_gene(gene_idx):
             return np.array(self._id_output_node)
-        elif input_index == 1:
-            return np.array(self._permissible_inputs_for_output_region())
         else:
-            return np.array(self._id_unused_gene)
+            input_index = gene_idx % self._length_per_region - 1
+            if input_index == 0:
+                return np.array(self._permissible_inputs_for_output_region())
+            else:
+                return np.array(self._id_unused_gene)
 
     def _create_input_region(self) -> List[int]: