Merge pull request #115 from EpistasisLab/dev

Dev
EpistasisLab · Dec 21, 2023 · 6c3a0f2 · 6c3a0f2
2 parents cb3de5a + 0ad8562
commit 6c3a0f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tpot2/individual_representations/graph_pipeline_individual/individual.py b/tpot2/individual_representations/graph_pipeline_individual/individual.py
@@ -1193,7 +1193,10 @@ def random_weighted_sort(l,weights, rng_=None):
     sorted_l = []
     indeces = {i: weights[i] for i in range(len(l))}
     while len(indeces) > 0:
-        next_item = rng.choice(list(indeces.keys()), p=list(indeces.values()))
+        keys = list(indeces.keys())
+        p = np.array([indeces[k] for k in keys])
+        p = p / p.sum()
+        next_item = rng.choice(list(indeces.keys()), p=p)
         indeces.pop(next_item)
         sorted_l.append(l[next_item])
 

diff --git a/tpot2/tpot_estimator/estimator_utils.py b/tpot2/tpot_estimator/estimator_utils.py
@@ -79,7 +79,7 @@ def get_configuration_dictionary(options, n_samples, n_features, classification,
 
 
         else:
-            config_dict.update(recursive_with_defaults(options, n_samples, n_features, classification, random_state, cv, subsets=subsets, feature_names=feature_names, n_classes=n_classes))
+            config_dict.update(recursive_with_defaults(option, n_samples, n_features, classification, random_state, cv, subsets=subsets, feature_names=feature_names, n_classes=n_classes))
 
     if len(config_dict) == 0:
         raise ValueError("No valid configuration options were provided. Please check the options you provided and try again.")