Replace DebugString with Describe

This change makes tree description completely open to mechanical
analysis and ensures consistency between description formats for each of
the iterator types.

Renamed StatsContainer.(Kind -> Type) for consistency.
This commit is contained in:
kortschak 2014-09-05 09:05:02 +09:30
parent b5f113203d
commit 62013d3dfc
22 changed files with 186 additions and 162 deletions

View file

@ -30,9 +30,6 @@ package iterator
// Can be seen as the dual of the HasA iterator.
import (
"fmt"
"strings"
"github.com/google/cayley/graph"
"github.com/google/cayley/quad"
)
@ -108,11 +105,14 @@ func (it *LinksTo) ResultTree() *graph.ResultTree {
return tree
}
// Print the iterator.
func (it *LinksTo) DebugString(indent int) string {
return fmt.Sprintf("%s(%s %d direction:%s\n%s)",
strings.Repeat(" ", indent),
it.Type(), it.UID(), it.dir, it.primaryIt.DebugString(indent+4))
func (it *LinksTo) Describe() graph.Description {
primary := it.primaryIt.Describe()
return graph.Description{
UID: it.UID(),
Type: it.Type().String(),
Direction: it.dir,
Iterator: &primary,
}
}
// If it checks in the right direction for the subiterator, it is a valid link