akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autopilot: tidying up source code to fit to 80 cols

Browse Source
This commit is contained in:
Andras Banki-Horvath 2020-03-28 16:38:46 +01:00
parent 93cb05142a
commit 919710467e
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autopilot/betweenness_centrality.go
View File

@ -98,13 +98,13 @@ func betweennessCentrality(g *SimpleGraph, s int, centrality []float64) {
// shortest path from s to t for each node t. // shortest path from s to t for each node t.
pred := make([][]int, len(g.Nodes)) pred := make([][]int, len(g.Nodes))
// sigma[t] is the number of shortest paths between nodes s and t for // sigma[t] is the number of shortest paths between nodes s and t
// each node t. // for each node t.
sigma := make([]int, len(g.Nodes)) sigma := make([]int, len(g.Nodes))
sigma[s] = 1 sigma[s] = 1
// dist[t] holds the distance between s and t for each node t. We initialize // dist[t] holds the distance between s and t for each node t.
// this to -1 (meaning infinity) for each t != s. // We initialize this to -1 (meaning infinity) for each t != s.
dist := make([]int, len(g.Nodes)) dist := make([]int, len(g.Nodes))
for i := range dist { for i := range dist {
dist[i] = -1 dist[i] = -1
@ -178,9 +178,9 @@ func (bc *BetweennessCentrality) Refresh(graph ChannelGraph) error {
work := make(chan int) work := make(chan int)
partials := make(chan []float64, bc.workers) partials := make(chan []float64, bc.workers)
// Each worker will compute a partial result. This // Each worker will compute a partial result.
// partial result is a sum of centrality updates on // This partial result is a sum of centrality updates
// roughly N / workers nodes. // on roughly N / workers nodes.
worker := func() { worker := func() {
defer wg.Done() defer wg.Done()
partial := make([]float64, len(cache.Nodes)) partial := make([]float64, len(cache.Nodes))
@ -199,8 +199,8 @@ func (bc *BetweennessCentrality) Refresh(graph ChannelGraph) error {
go worker() go worker()
} }
// Distribute work amongst workers Should be // Distribute work amongst workers.
// fair when graph is sufficiently large. // Should be fair when the graph is sufficiently large.
for node := range cache.Nodes { for node := range cache.Nodes {
work <- node work <- node
} }

15
autopilot/betweenness_centrality_test.go
View File

@ -91,7 +91,7 @@ func buildTestGraph(t *testing.T,
for _, v := range neighbors { for _, v := range neighbors {
_, _, err := graph.addRandChannel(nodes[u], nodes[v], chanCapacity) _, _, err := graph.addRandChannel(nodes[u], nodes[v], chanCapacity)
if err != nil { if err != nil {
t.Fatalf("unexpected error while adding random channel: %v", err) t.Fatalf("unexpected error adding random channel: %v", err)
} }
} }
} }
@ -147,9 +147,12 @@ func TestBetweennessCentralityWithNonEmptyGraph(t *testing.T) {
testName := fmt.Sprintf("%v %d workers", chanGraph.name, numWorkers) testName := fmt.Sprintf("%v %d workers", chanGraph.name, numWorkers)
success := t.Run(testName, func(t1 *testing.T) { success := t.Run(testName, func(t1 *testing.T) {
centralityMetric, err := NewBetweennessCentralityMetric(numWorkers) centralityMetric, err := NewBetweennessCentralityMetric(
numWorkers,
)
if err != nil { if err != nil {
t.Fatalf("construction must succeed with positive number of workers") t.Fatalf("construction must succeed with " +
"positive number of workers")
} }
graphNodes := buildTestGraph(t1, graph, graphDesc) graphNodes := buildTestGraph(t1, graph, graphDesc)
@ -169,11 +172,13 @@ func TestBetweennessCentralityWithNonEmptyGraph(t *testing.T) {
nodeID := NewNodeID(graphNodes[node]) nodeID := NewNodeID(graphNodes[node])
calculatedCentrality, ok := centrality[nodeID] calculatedCentrality, ok := centrality[nodeID]
if !ok { if !ok {
t1.Fatalf("no result for node: %x (%v)", nodeID, node) t1.Fatalf("no result for node: %x (%v)",
nodeID, node)
} }
if nodeCentrality != calculatedCentrality { if nodeCentrality != calculatedCentrality {
t1.Errorf("centrality for node: %v should be %v, got: %v", t1.Errorf("centrality for node: %v "+
"should be %v, got: %v",
node, nodeCentrality, calculatedCentrality) node, nodeCentrality, calculatedCentrality)
} }
} }