From 367e95adee6a7efbbe85468ac180f06402873a2f Mon Sep 17 00:00:00 2001 From: Nick White Date: Wed, 23 Jan 2019 23:17:13 +0000 Subject: Create general BucketUp function, use it for line-conf-buckets --- line-conf-buckets/line-conf-buckets.go | 97 ++++------------------------------ 1 file changed, 9 insertions(+), 88 deletions(-) (limited to 'line-conf-buckets') diff --git a/line-conf-buckets/line-conf-buckets.go b/line-conf-buckets/line-conf-buckets.go index 1c33ba4..65c85b8 100644 --- a/line-conf-buckets/line-conf-buckets.go +++ b/line-conf-buckets/line-conf-buckets.go @@ -4,62 +4,14 @@ import ( "bufio" "flag" "fmt" - "io" "log" "os" - "path/filepath" "sort" - "strconv" - "strings" "git.rescribe.xyz/testingtools/parse" "git.rescribe.xyz/testingtools/parse/prob" ) -// TODO: this is just a placeholder, do this more sensibly, as -tess does (hint: full txt should already be in the LineDetail) -func copyline(filebase string, dirname string, basename string, avgconf string, outdir string, todir string, l parse.LineDetail) (err error) { - outname := filepath.Join(outdir, todir, filepath.Base(dirname) + "_" + basename + "_" + avgconf) - //log.Fatalf("I'd use '%s' as outname, and '%s' as filebase\n", outname, filebase) - - for _, extn := range []string{".txt"} { - infile, err := os.Open(filebase + extn) - if err != nil { - fmt.Fprintf(os.Stderr, "Failed to open %s\n", filebase + extn) - return err - } - defer infile.Close() - - err = os.MkdirAll(filepath.Join(outdir, todir), 0700) - if err != nil { - return err - } - - outfile, err := os.Create(outname + extn) - if err != nil { - fmt.Fprintf(os.Stderr, "Failed to create %s\n", outname + extn) - return err - } - defer outfile.Close() - - _, err = io.Copy(outfile, infile) - if err != nil { - return err - } - } - - f, err := os.Create(outname + ".bin.png") - if err != nil { - return err - } - defer f.Close() - err = l.Img.CopyLineTo(f) - if err != nil { - return err - } - - return err -} - func main() { flag.Usage = func() { fmt.Fprintf(os.Stderr, "Usage: line-conf-buckets prob1 [prob2] [...]\n") @@ -99,47 +51,16 @@ func main() { sort.Sort(lines) - worstnum := 0 - mediumnum := 0 - bestnum := 0 - - outdir := "buckets" // TODO: set this from cmdline - todir := "" - - for _, l := range lines { - switch { - case l.Avgconf < 0.95: - todir = "bad" - worstnum++ - case l.Avgconf < 0.98: - todir = "95to98" - mediumnum++ - default: - todir = "98plus" - bestnum++ - } - - avgstr := strconv.FormatFloat(l.Avgconf, 'G', -1, 64) - if len(avgstr) > 2 { - avgstr = avgstr[2:] - } - filebase := strings.Replace(l.Name, ".prob", "", 1) - basename := filepath.Base(filebase) - err := copyline(filebase, l.OcrName, basename, avgstr, outdir, todir, l) - if err != nil { - log.Fatal(err) - } + //var b parse.BucketSpecs + b := parse.BucketSpecs{ + { 0, "bad" }, + { 0.95, "95to98" }, + { 0.98, "98plus" }, } - total := worstnum + mediumnum + bestnum - - if total == 0 { - log.Fatal("No lines copied") + // TODO: set bucket dirname from cmdline + err := parse.BucketUp(lines, b, "newbuckets") + if err != nil { + log.Fatal(err) } - - fmt.Printf("Copied lines to %s\n", outdir) - fmt.Printf("---------------------------------\n") - fmt.Printf("Lines 98%%+ quality: %d%%\n", 100 * bestnum / total) - fmt.Printf("Lines 95-98%% quality: %d%%\n", 100 * mediumnum / total) - fmt.Printf("Lines <95%% quality: %d%%\n", 100 * worstnum / total) } -- cgit v1.2.1-24-ge1ad