# HG changeset patch # User Mike Pavone # Date 1376255521 25200 # Node ID 27ee5051b1ec0dab59f2995cf8a5b5fb9941c8b6 # Parent f864792a1b176cf2b1ed175e62848263c6e0636e# Parent 42930b0904b168c5d9346a4b235ee302fca5db87 Merge diff -r f864792a1b17 -r 27ee5051b1ec src/bv.tp --- a/src/bv.tp Sun Aug 11 14:11:47 2013 -0700 +++ b/src/bv.tp Sun Aug 11 14:12:01 2013 -0700 @@ -567,6 +567,18 @@ allOfSize: (size - 1) inFold?: 0 withOps: ops needOps: ops } + allWithMaxSize <- :size { + res <- #[] + n <- 3 + while: {n <= size} do: { + foreach: (allOfSize: n) :idx el{ + res append: el + } + n <- n + 1 + } + res + } + filterTrees <- :trees strops { ops <- strops fold: 0 with: :acc el { acc or (_names get: el withDefault: 0) @@ -634,7 +646,7 @@ trees <- (prog allOfSize: size) } foreach: trees :idx tree { - prog root! tree + prog root!: tree test: prog } } @@ -642,3 +654,4 @@ } } } +