From bf15ec97ab7ae2b0e2045f996346a57cdc78d2db Mon Sep 17 00:00:00 2001 From: Sudipta Basak Date: Mon, 8 Apr 2024 13:10:44 +0000 Subject: [PATCH] Modified implementation of getNodeCountPerColumn to get count for each node type --- ConnectivityTest/MaliciousNodesVsNetDegree/prog.py | 9 +++++---- ConnectivityTest/MaliciousNodesVsNumberOfNodes/prog.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ConnectivityTest/MaliciousNodesVsNetDegree/prog.py b/ConnectivityTest/MaliciousNodesVsNetDegree/prog.py index 930f931..574d4a6 100644 --- a/ConnectivityTest/MaliciousNodesVsNetDegree/prog.py +++ b/ConnectivityTest/MaliciousNodesVsNetDegree/prog.py @@ -19,8 +19,8 @@ def plotData(conf): plt.clf() def isGConnected(deg, nodes, mal): - G = nx.random_regular_graph(deg, nodes) - malNodes = random.sample(list(G.nodes()), k=mal * nodes // 100) + G = nx.random_regular_graph(deg, sum(nodes)) + malNodes = random.sample(list(G.nodes()), k=mal * sum(nodes) // 100) for mn in malNodes: G.remove_node(mn) @@ -37,9 +37,10 @@ def getNodeCountPerColumn(config): colsSelected = random.sample(list(range(1, numberOfCols + 1)), chiC1 if _ < node1Count else chiC2) for col in colsSelected: if col in nodeCountPerColumn.keys(): - nodeCountPerColumn[col] += 1 + nodeCountPerColumn[col][0 if _ < numOfNodes else 1] += 1 else: - nodeCountPerColumn[col] = 0 + nodeCountPerColumn[col] = [0, 0] + nodeCountPerColumn[col][0 if _ < numOfNodes else 1] = 1 return nodeCountPerColumn diff --git a/ConnectivityTest/MaliciousNodesVsNumberOfNodes/prog.py b/ConnectivityTest/MaliciousNodesVsNumberOfNodes/prog.py index 9ce6c9a..12d17d4 100644 --- a/ConnectivityTest/MaliciousNodesVsNumberOfNodes/prog.py +++ b/ConnectivityTest/MaliciousNodesVsNumberOfNodes/prog.py @@ -20,8 +20,8 @@ def plotData(conf): plt.clf() def isGConnected(deg, nodes, mal): - G = nx.random_regular_graph(deg, nodes) - malNodes = random.sample(list(G.nodes()), k=mal * nodes // 100) + G = nx.random_regular_graph(deg, sum(nodes)) + malNodes = random.sample(list(G.nodes()), k=mal * sum(nodes) // 100) for mn in malNodes: G.remove_node(mn) @@ -37,9 +37,10 @@ def getNodeCountPerColumn(config, numOfNodes): colsSelected = random.sample(list(range(1, numberOfCols + 1)), chiC1 if _ < node1Count else chiC2) for col in colsSelected: if col in nodeCountPerColumn.keys(): - nodeCountPerColumn[col] += 1 + nodeCountPerColumn[col][0 if _ < numOfNodes else 1] += 1 else: - nodeCountPerColumn[col] = 0 + nodeCountPerColumn[col] = [0, 0] + nodeCountPerColumn[col][0 if _ < numOfNodes else 1] = 1 return nodeCountPerColumn