rename bioGraph -> bipGraph

Ubuntu · Ubuntu · commit e7958e0dfcb0 · 2018-05-17T23:21:46.000-07:00
diff --git a/graph/flowGraph.go b/graph/flowGraph.go
@@ -254,7 +254,7 @@ func relabelToFront(g flowGraph, s interface{}, t interface{}) {
 	}
 }
 
-func bioGraphMaxMatch(g graph, l []interface{}, flowAlg func(g flowGraph, s interface{}, t interface{})) graph {
+func bipGraphMaxMatch(g graph, l []interface{}, flowAlg func(g flowGraph, s interface{}, t interface{})) graph {
 	//build flow graph
 	fG := newFlowGraph()
 	s := struct{ start string }{"s"}
diff --git a/graph/flowGraph_test.go b/graph/flowGraph_test.go
@@ -55,7 +55,7 @@ func pushRelabelGolden(g flowGraph) flowGraph {
 	return flowG
 }
 
-func bioGraphMaxMatchSetup() (graph, []interface{}) {
+func bipGraphMaxMatchSetup() (graph, []interface{}) {
 	g := newGraph()
 	g.AddEdgeBi(edge{"l0", "r0"})
 	g.AddEdgeBi(edge{"l1", "r0"})
@@ -68,23 +68,23 @@ func bioGraphMaxMatchSetup() (graph, []interface{}) {
 	return g, []interface{}{"l0", "l1", "l2", "l3", "l4"}
 }
 
-func bioGraphMaxMatchGoldenByEdmondesKarp() graph {
+func bipGraphMaxMatchGoldenByEdmondesKarp() graph {
 	g := newGraph()
 	g.AddEdgeBi(edge{"l0", "r0"})
 	g.AddEdgeBi(edge{"l1", "r2"})
 	g.AddEdgeBi(edge{"l2", "r1"})
 	return g
 }
 
-func bioGraphMaxMatchGoldenByPushRelabel() graph {
+func bipGraphMaxMatchGoldenByPushRelabel() graph {
 	g := newGraph()
 	g.AddEdgeBi(edge{"l1", "r0"})
 	g.AddEdgeBi(edge{"l4", "r2"})
 	g.AddEdgeBi(edge{"l2", "r1"})
 	return g
 }
 
-func bioGraphMaxMatchGoldenByRelabelToFront() graph {
+func bipGraphMaxMatchGoldenByRelabelToFront() graph {
 	g := newGraph()
 	g.AddEdgeBi(edge{"l0", "r0"})
 	g.AddEdgeBi(edge{"l1", "r2"})
@@ -129,17 +129,17 @@ func TestRelabelToFront(t *testing.T) {
 	checkFlowGraphOutOfOrder(t, g, gGolden)
 }
 
-func TestBioGraphMaxMatch(t *testing.T) {
-	bioG, l := bioGraphMaxMatchSetup()
-	gGolden := bioGraphMaxMatchGoldenByEdmondesKarp()
-	g := bioGraphMaxMatch(bioG, l, edmondesKarp)
+func TestBipGraphMaxMatch(t *testing.T) {
+	bioG, l := bipGraphMaxMatchSetup()
+	gGolden := bipGraphMaxMatchGoldenByEdmondesKarp()
+	g := bipGraphMaxMatch(bioG, l, edmondesKarp)
 	checkGraphOutOfOrderInString(t, g, gGolden, nil)
 
-	g = bioGraphMaxMatch(bioG, l, pushRelabel)
-	gGolden = bioGraphMaxMatchGoldenByPushRelabel()
+	g = bipGraphMaxMatch(bioG, l, pushRelabel)
+	gGolden = bipGraphMaxMatchGoldenByPushRelabel()
 	checkGraphOutOfOrderInString(t, g, gGolden, nil)
 
-	g = bioGraphMaxMatch(bioG, l, relabelToFront)
-	gGolden = bioGraphMaxMatchGoldenByRelabelToFront()
+	g = bipGraphMaxMatch(bioG, l, relabelToFront)
+	gGolden = bipGraphMaxMatchGoldenByRelabelToFront()
 	checkGraphOutOfOrderInString(t, g, gGolden, nil)
 }

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ func relabelToFront(g flowGraph, s interface{}, t interface{}) {`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`257`		`-func bioGraphMaxMatch(g graph, l []interface{}, flowAlg func(g flowGraph, s interface{}, t interface{})) graph {`
	`257`	`+func bipGraphMaxMatch(g graph, l []interface{}, flowAlg func(g flowGraph, s interface{}, t interface{})) graph {`
`258`	`258`	`//build flow graph`
`259`	`259`	`fG := newFlowGraph()`
`260`	`260`	`s := struct{ start string }{"s"}`