luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimizations

Browse source
This commit is contained in:
Gavin Nishizawa 2023-04-25 17:19:34 -07:00
parent 9957574cc6
commit 203cc5e4af
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
d2layouts/d2grid/layout.go
View file

@ -461,6 +461,8 @@ func (gd *gridDiagram) getBestLayout(targetSize float64, columns bool) [][]*d2gr
return genLayout(gd.objects, nil) return genLayout(gd.objects, nil)
} }
var bestLayout [][]*d2graph.Object
bestDist := math.MaxFloat64
// get all options for where to place these cuts, preferring later cuts over earlier cuts // get all options for where to place these cuts, preferring later cuts over earlier cuts
// with 5 objects and 2 cuts we have these options: // with 5 objects and 2 cuts we have these options:
// . A B C │ D │ E <- these cuts would produce: ┌A─┐ ┌B─┐ ┌C─┐ // . A B C │ D │ E <- these cuts would produce: ┌A─┐ ┌B─┐ ┌C─┐
@ -469,41 +471,35 @@ func (gd *gridDiagram) getBestLayout(targetSize float64, columns bool) [][]*d2gr
// . A B │ C │ D E └────────────┘ // . A B │ C │ D E └────────────┘
// . A │ B C │ D E ┌E───────────┐ // . A │ B C │ D E ┌E───────────┐
// . A │ B │ C D E └────────────┘ // . A │ B │ C D E └────────────┘
divisions := genDivisions(gd.objects, nCuts)
var bestLayout [][]*d2graph.Object
bestDist := math.MaxFloat64
// of these divisions, find the layout with rows closest to the targetSize // of these divisions, find the layout with rows closest to the targetSize
for _, division := range divisions { iterDivisions(gd.objects, nCuts, func(division []int) {
layout := genLayout(gd.objects, division) layout := genLayout(gd.objects, division)
dist := getDistToTarget(layout, targetSize, float64(gd.horizontalGap), float64(gd.verticalGap), columns) dist := getDistToTarget(layout, targetSize, float64(gd.horizontalGap), float64(gd.verticalGap), columns)
if dist < bestDist { if dist < bestDist {
bestLayout = layout bestLayout = layout
bestDist = dist bestDist = dist
} }
} })
return bestLayout return bestLayout
} }
// get all possible divisions of objects by the number of cuts // get all possible divisions of objects by the number of cuts
func genDivisions(objects []*d2graph.Object, nCuts int) (divisions [][]int) { func iterDivisions(objects []*d2graph.Object, nCuts int, f func([]int)) {
if len(objects) < 2 || nCuts == 0 { if len(objects) < 2 || nCuts == 0 {
return nil return
} }
// we go in this order to prefer extra objects in starting rows rather than later ones // we go in this order to prefer extra objects in starting rows rather than later ones
lastObj := len(objects) - 1 lastObj := len(objects) - 1
for index := lastObj; index >= nCuts; index-- { for index := lastObj; index >= nCuts; index-- {
if nCuts > 1 { if nCuts > 1 {
for _, inner := range genDivisions(objects[:index], nCuts-1) { iterDivisions(objects[:index], nCuts-1, func(inner []int) {
divisions = append(divisions, append(inner, index-1)) f(append(inner, index-1))
} })
} else { } else {
divisions = append(divisions, []int{index - 1}) f([]int{index - 1})
} }
} }
return divisions
} }
// generate a grid of objects from the given cut indices // generate a grid of objects from the given cut indices
@ -517,6 +513,9 @@ func genLayout(objects []*d2graph.Object, cutIndices []int) [][]*d2graph.Object
} else { } else {
stop = len(objects) - 1 stop = len(objects) - 1
} }
if stop >= objIndex {
layout[i] = make([]*d2graph.Object, 0, stop-objIndex+1)
}
for ; objIndex <= stop; objIndex++ { for ; objIndex <= stop; objIndex++ {
layout[i] = append(layout[i], objects[objIndex]) layout[i] = append(layout[i], objects[objIndex])
} }