From 3cdc53960c53c94f1f4334327697e4598e81b76e Mon Sep 17 00:00:00 2001 From: Arunima Chaudhuri Date: Thu, 9 Jan 2025 16:19:49 +0530 Subject: [PATCH] debug --- DAS/node.py | 8 +++++++- DAS/visualizor.py | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/DAS/node.py b/DAS/node.py index 690f130..223b0f2 100644 --- a/DAS/node.py +++ b/DAS/node.py @@ -653,7 +653,7 @@ class Node: growth_series = self.generate_growth_series() for num_peers_to_query in growth_series: - if retries >= max_retries: + if not peers_with_custody and not peers_with_custody_level_2: break original_retries += num_peers_to_query @@ -774,6 +774,12 @@ class Node: len(simulator.validators[p].columnIDs) >= self.shape.nbColsK): peers_with_custody_level_2.update({p}) peers_with_custody_level_2 = list(peers_with_custody_level_2) + + if self.ID in peers_with_custody: + peers_with_custody.remove(self.ID) + + if self.ID in peers_with_custody_level_2: + peers_with_custody_level_2.remove(self.ID) result, time_taken, queried_peers_list, original_retries = self.query_peer_with_retries( peers_with_custody, peers_with_custody_level_2, simulator, sample_row, sample_col diff --git a/DAS/visualizor.py b/DAS/visualizor.py index beea475..57ce869 100644 --- a/DAS/visualizor.py +++ b/DAS/visualizor.py @@ -205,7 +205,7 @@ class Visualizor: all_query_times = [time for time in result.query_total_time if time is not None] plt.boxplot(all_query_times, patch_artist=True, boxprops=dict(facecolor="lightblue")) - plt.title(f"Query Times for Different Connection Ranges", fontsize=16) + plt.title(f"Query Times", fontsize=16) plt.ylabel("Query Time (seconds)", fontsize=16) plt.grid(True, axis='y', color='gray', linestyle='--', linewidth=0.5) plt.tick_params(axis='both', which='major', labelsize=16) @@ -265,10 +265,8 @@ class Visualizor: all_original_retries = [ retry for sublist in result.all_original_retries for retry in sublist if retry is not None ] - plt.boxplot(all_original_retries, patch_artist=True, boxprops=dict(facecolor="lightgreen")) - - plt.title("Number of peers queried by each node for a sample across connection ranges", fontsize=16) + plt.title("Number of peers queried by each node for a sample", fontsize=16) plt.ylabel("Count of Queried Peers", fontsize=16) plt.grid(True, axis='y', color='gray', linestyle='--', linewidth=0.5) plt.tick_params(axis='both', which='major', labelsize=16)