gemma: pkg/octree/vertex.go comparison

Simplified line merging in generating contour lines. Now its ~40% faster.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Tue, 09 Oct 2018 13:30:45 +0200
parents	ae1531e00344
children	6ab012d0f0c2

comparison

equal deleted inserted replaced

-:a22f66acfd96
+:be7b83638ec8
 again:
 	for head, lines := range heads {
 		for i, line := range *lines {
 			tail := quant(line[len(line)-1])
-			if hs := heads[tail]; hs != nil {
+			for hs := heads[tail]; hs != nil && len(*hs) > 0; hs = heads[tail] {
 				l := len(*hs)
 				last := (*hs)[l-1]
-				if l == 1 {
+				(*hs)[l-1] = nil
-					delete(heads, tail)
+				*hs = (*hs)[:l-1]
-				} else {
-					(*hs)[l-1] = nil
-					*hs = (*hs)[:l-1]
-				}
 				line = line.Join(last)
-				if head == quant(line[len(line)-1]) { // its a ring
+				if tail = quant(line[len(line)-1]); head == tail { // its a ring
 					out = append(out, line)
 					// remove from current lines
 					copy((*lines)[i:], (*lines)[i+1:])
 					(*lines)[len(*lines)-1] = nil
 					*lines = (*lines)[:len(*lines)-1]
-				} else {
+					goto again
-					// overwrite in current lines
-					(*lines)[i] = line
 				}
-				goto again
+				// overwrite in current lines
+				(*lines)[i] = line
 			}
 		}
 	}
 	rings := len(out)

Mercurial > gemma