From 7afca57a3ff692a8496d3c0322f954ca32b96df1 Mon Sep 17 00:00:00 2001 From: Goncalo Paulo <30472805+SrGonao@users.noreply.github.com> Date: Tue, 17 Jun 2025 09:37:59 +0100 Subject: [PATCH 1/2] Update simulator scoring.py --- .../oai_autointerp/explanations/scoring.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py b/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py index b703d7a5..e590625e 100644 --- a/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py +++ b/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py @@ -185,16 +185,23 @@ async def simulate_and_score( # return scored_sequence_simulations values = [] - all_activated = [] - for distance, sequence in enumerate(scored_sequence_simulations): - without_errors = [] + simulations_per_distance = {} + without_errors = [] + for sequence in enumerate(scored_sequence_simulations): + if len(sequence.simulation.expected_activations) > 0: - without_errors.append(sequence) + if sequence.quantile not in simulations_per_distance: + simulations_per_distance[sequence.quantile+1] = [] + simulations_per_distance[sequence.quantile+1].append(sequence) + without_errors.extend(sequence) + for quantile in simulations_per_distance.key(): values.append( - aggregate_scored_sequence_simulations(without_errors, distance + 1) + aggregate_scored_sequence_simulations(simulations_per_distance[quantile], quantile) ) - all_activated.extend(without_errors) + if len(non_activation_records) > 0: - all_data = all_activated + non_activating_scored_seq_simulations - values.append(aggregate_scored_sequence_simulations(all_data, 0)) + for sequence in enumerate(non_activating_records): + if len(sequence.simulation.expected_activations) > 0: + without_errors.extend(sequence) + values.append(aggregate_scored_sequence_simulations(without_errors, 0)) return values # type: ignore From 14da537946431531caf93ee0042f938d505be953 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 17 Jun 2025 08:38:36 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../simulator/oai_autointerp/explanations/scoring.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py b/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py index e590625e..9431d107 100644 --- a/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py +++ b/delphi/scorers/simulator/oai_autointerp/explanations/scoring.py @@ -188,17 +188,19 @@ async def simulate_and_score( simulations_per_distance = {} without_errors = [] for sequence in enumerate(scored_sequence_simulations): - + if len(sequence.simulation.expected_activations) > 0: if sequence.quantile not in simulations_per_distance: - simulations_per_distance[sequence.quantile+1] = [] - simulations_per_distance[sequence.quantile+1].append(sequence) + simulations_per_distance[sequence.quantile + 1] = [] + simulations_per_distance[sequence.quantile + 1].append(sequence) without_errors.extend(sequence) for quantile in simulations_per_distance.key(): values.append( - aggregate_scored_sequence_simulations(simulations_per_distance[quantile], quantile) + aggregate_scored_sequence_simulations( + simulations_per_distance[quantile], quantile + ) ) - + if len(non_activation_records) > 0: for sequence in enumerate(non_activating_records): if len(sequence.simulation.expected_activations) > 0: