From 66e046e15f2af54dfb975d7bf01ded577d91d53a Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Mon, 15 Aug 2022 00:26:11 +0100 Subject: [PATCH] Fix list parsing --- modules/chankeep.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/chankeep.py b/modules/chankeep.py index 3dc2043..48e5741 100644 --- a/modules/chankeep.py +++ b/modules/chankeep.py @@ -302,10 +302,10 @@ def keepChannels(net, listinfo, mean, sigrelay, relay): # newNums = modules.provision.provisionMultipleRelays(net, needed) # else: # newNums = [] - flist = [i[0] for i in listinfo] if len(flist) > max_chans: max_chans = len(flist)-1 chosen = sorted(flist, reverse=True, key=lambda x: x[1])[:max_chans] + flist = [i[0] for i in listinfo] debug(f"keepChannels() {net}: joining {len(chosen)}/{len(flist)} channels") trace(f"keepChannels() {net}: joining:{chosen}") populateChans(net, chosen) @@ -316,12 +316,12 @@ def keepChannels(net, listinfo, mean, sigrelay, relay): # newNums = modules.provision.provisionMultipleRelays(net, needed) # else: # newNums = [] - siglist = [i[0] for i in listinfo if int(i[1]) > mean] + siglist = [i for i in listinfo if int(i[1]) > mean] + chosen = sorted(siglist, reverse=True, key=lambda x: x[1])[:max_chans] + siglist = [i[0] for i in siglist] if len(siglist) > max_chans: max_chans = len(siglist)-1 debug(f"keepChannels() {net}: siglist:{siglist} max_chans:{max_chans} len_sig:{len(siglist)}") - - chosen = sorted(siglist, reverse=True, key=lambda x: x[1])[:max_chans] debug(f"keepChannels() {net}: joining {len(chosen)}/{len(siglist)} channels") trace(f"keepChannels() {net}: joining:{chosen}") populateChans(net, chosen)