Integrated hingetree optimization, some fixes to GYO

algorithms/algorithms.go

@@ -5,6 +5,7 @@ import . "github.com/cem-okulmus/BalancedGo/lib"
 type Algorithm interface {
 	Name() string
 	FindDecomp(K int) Decomp
+	FindDecompGraph(G Graph, K int) Decomp
 }
 
 type UpdateAlgorithm interface {

algorithms/balDetKDecomp.go

@@ -212,6 +212,10 @@ func (b BalDetKDecomp) FindDecomp(K int) Decomp {
 	return b.FindGHD(K, b.Graph, []Special{})
 }
 
+func (b BalDetKDecomp) FindDecompGraph(G Graph, K int) Decomp {
+	return b.FindGHD(K, G, []Special{})
+}
+
 func (b BalDetKDecomp) FindDecompUpdate(K int, currentGraph Graph, Sp []Special) Decomp {
 
 	fmt.Println("Ghost edges", b.Graph.Edges)

algorithms/balKDecomp.go

@@ -118,6 +118,10 @@ func (b BalKDecomp) FindDecomp(K int) Decomp {
 	return b.findDecompParallelFull(K, b.Graph)
 }
 
+func (b BalKDecomp) FindDecompGraph(G Graph, K int) Decomp {
+	return b.findDecompParallelFull(K, G)
+}
+
 func (b BalKDecomp) Name() string {
 	return "Akatov"
 }

algorithms/balsepGlobal.go

@@ -475,6 +475,10 @@ func (g BalSepGlobal) FindDecomp(K int) Decomp {
 	return g.findDecompParallelFull(K, g.Graph, []Special{})
 }
 
+func (b BalSepGlobal) FindDecompGraph(G Graph, K int) Decomp {
+	return b.findDecompParallelFull(K, G, []Special{})
+}
+
 func (g BalSepGlobal) Name() string {
 	return "BalSep Global"
 }

algorithms/balsepLocal.go

@@ -440,6 +440,10 @@ func (g BalSepLocal) FindDecomp(K int) Decomp {
 	return g.findDecompParallelFull(K, g.Graph, []Special{})
 }
 
+func (g BalSepLocal) FindDecompGraph(G Graph, K int) Decomp {
+	return g.findDecompParallelFull(K, G, []Special{})
+}
+
 func (g BalSepLocal) Name() string {
 	return "BalSep Local"
 }

algorithms/detKDecomp.go

@@ -326,6 +326,10 @@ func (d DetKDecomp) Name() string {
 	}
 }
 
+func (d DetKDecomp) FindDecompGraph(G Graph, K int) Decomp {
+	return d.FindHD(K, G, []Special{})
+}
+
 func (d DetKDecomp) FindDecompUpdate(K int, currentGraph Graph, Sp []Special) Decomp {
 	fmt.Println("Ghost edges", d.Graph.Edges)
 	return d.FindHD(K, d.Graph, Sp)

algorithms/divideKDecomp.go

@@ -544,6 +544,13 @@ func (d DivideKDecomp) FindDecomp(K int) Decomp {
 	return output
 }
 
+func (d DivideKDecomp) FindDecompGraph(G Graph, K int) Decomp {
+	output := d.decomp(DivideComp{Edges: G.Edges})
+	output.Root = postProcess(output.Root, []int{})
+
+	return output
+}
+
 func (d DivideKDecomp) Name() string {
 	return "DivideK"
 }
@@ -564,6 +571,15 @@ func (d DivideKDecompPar) FindDecomp(K int) Decomp {
 	return output
 }
 
+func (d DivideKDecompPar) FindDecompGraph(G Graph, K int) Decomp {
+	div := DivideKDecomp{Graph: d.Graph, K: d.K, BalFactor: d.BalFactor}
+
+	output := div.decompParallel(DivideComp{Edges: G.Edges})
+	output.Root = postProcess(output.Root, []int{})
+
+	return output
+}
+
 func (d DivideKDecompPar) Name() string {
 	return "DivideK-Par"
 }

balanced.go

@@ -35,7 +35,7 @@ var Version string
 var Date string
 var Build string
 
-func outputStanza(algorithm string, decomp Decomp, msec float64, parsedGraph Graph, gml string, K int, heuristic float64) {
+func outputStanza(algorithm string, decomp Decomp, msec float64, parsedGraph Graph, gml string, K int, heuristic float64, hinge float64) {
 	decomp.RestoreSubedges()
 
 	fmt.Println("Used algorithm: " + algorithm + " @" + Version)
@@ -51,6 +51,9 @@ func outputStanza(algorithm string, decomp Decomp, msec float64, parsedGraph Gra
 			fmt.Print("(", msec/60000.0, "min )")
 		}
 	}
+	if hinge > 0.0 {
+		fmt.Println("\nHingeTree: ", hinge, " ms")
+	}
 
 	fmt.Println("\nWidth: ", decomp.CheckWidth())
 	correct := decomp.Correct(parsedGraph)
@@ -84,7 +87,7 @@ func main() {
 	useHeuristic := flagSet.Int("heuristic", 0, "turn on to activate edge ordering\n\t1 ... Degree Ordering\n\t2 ... Max. Separator Ordering\n\t3 ... MCSO\n\t4 ... Edge Degree Ordering")
 	gyö := flagSet.Bool("g", false, "perform a GYÖ reduct")
 	typeC := flagSet.Bool("t", false, "perform a Type Collapse")
-	//hingeFlag := flagSet.Bool("hinge", false, "use isHinge Optimization")
+	hingeFlag := flagSet.Bool("h", false, "use hingeTree Optimization")
 	numCPUs := flagSet.Int("cpu", -1, "Set number of CPUs to use")
 	bench := flagSet.Bool("bench", false, "Benchmark mode, reduces unneeded output (incompatible with -log flag)")
 	akatovTest := flagSet.Bool("akatov", false, "Use Balanced Decomposition algorithm")
@@ -251,6 +254,23 @@ func main() {
 		fmt.Println("Graph with subedges \n", parsedGraph)
 	}
 
+	var hinget Hingetree
+	var msecHinge float64
+
+	if *hingeFlag {
+		startHinge := time.Now()
+
+		hinget = GetHingeTree(parsedGraph)
+
+		dHinge := time.Now().Sub(startHinge)
+		msecHinge = dHinge.Seconds() * float64(time.Second/time.Millisecond)
+
+		if !*bench {
+			fmt.Println("Produced Hingetree: ")
+			fmt.Println(hinget)
+		}
+	}
+
 	if *update {
 		var solver UpdateAlgorithm
 
@@ -289,7 +309,7 @@ func main() {
 				}
 			}
 
-			outputStanza(solver.Name(), decomp, msec, parsedGraph, *gml, *width, heuristic)
+			outputStanza(solver.Name(), decomp, msec, parsedGraph, *gml, *width, heuristic, msecHinge)
 			return
 		}
 
@@ -358,13 +378,22 @@ func main() {
 			k := 1
 			solved := false
 			for !solved {
-				decomp = solver.FindDecomp(k)
+				if *hingeFlag {
+					decomp = hinget.DecompHinge(solver, k, parsedGraph)
+				} else {
+					decomp = solver.FindDecomp(k)
+				}
+
 				solved = decomp.Correct(parsedGraph)
 				k++
 			}
 			*width = k - 1 // for correct output
 		} else {
-			decomp = solver.FindDecomp(*width)
+			if *hingeFlag {
+				decomp = hinget.DecompHinge(solver, *width, parsedGraph)
+			} else {
+				decomp = solver.FindDecomp(*width)
+			}
 		}
 
 		if *akatovTest {
@@ -390,7 +419,7 @@ func main() {
 			}
 		}
 
-		outputStanza(solver.Name(), decomp, msec, parsedGraph, *gml, *width, heuristic)
+		outputStanza(solver.Name(), decomp, msec, parsedGraph, *gml, *width, heuristic, msecHinge)
 		return
 	}