From ae5d4e36af4f4a5567e1231958179d3a50eb4466 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 7 Jun 2009 23:06:54 +0100 Subject: [PATCH] Cope with very small commodity lists. --- pctb/convert.c | 24 ++++++------- pctb/convert.h | 2 +- pctb/pages.c | 8 ++--- pctb/structure.c | 72 +++++++++++++++++++------------------ pctb/yppsc-commod-processor | 5 ++- 5 files changed, 59 insertions(+), 52 deletions(-) diff --git a/pctb/convert.c b/pctb/convert.c index ac3ceb3..e262b26 100644 --- a/pctb/convert.c +++ b/pctb/convert.c @@ -47,11 +47,11 @@ static enum { mode_all= 0111, } o_mode= mode_all; -static char *o_screenshots_fn; +static char *o_screenshot_fn; static int o_single_page, o_quiet; static const char *o_outputmode= "upload"; -FILE *screenshots_file; +FILE *screenshot_file; static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET; @@ -63,11 +63,11 @@ static void vbadusage(const char *fmt, va_list al) { } DEFINE_VWRAPPERF(static, badusage, NORET); -static void open_screenshots_file(const char *mode) { - screenshots_file= fopen(o_screenshots_fn, mode); - if (!screenshots_file) +static void open_screenshot_file(const char *mode) { + screenshot_file= fopen(o_screenshot_fn, mode); + if (!screenshot_file) fatal("could not open screenshots file `%s': %s", - o_screenshots_fn, strerror(errno)); + o_screenshot_fn, strerror(errno)); } static void run_analysis(void) { @@ -121,8 +121,8 @@ int main(int argc, char **argv) { !strcmp(arg,"--tsv") || !strcmp(arg,"--best-prices")) o_outputmode= arg+2; - else if (!strcmp(arg,"--screenshots-file")) - o_screenshots_fn= ARGVAL; + else if (!strcmp(arg,"--screenshot-file")) + o_screenshot_fn= ARGVAL; #define DF(f) \ else if (!strcmp(arg,"-D" #f)) \ debug_flags |= dbg_##f; @@ -137,8 +137,8 @@ int main(int argc, char **argv) { badusage("unknown option `%s'",arg); } - if (!o_screenshots_fn) { - r= asprintf(&o_screenshots_fn,"%s/#pages#.ppm",get_vardir()); + if (!o_screenshot_fn) { + r= asprintf(&o_screenshot_fn,"%s/#pages#.ppm",get_vardir()); sysassert(r>=0); } @@ -147,12 +147,12 @@ int main(int argc, char **argv) { find_yppclient_window(); } if (o_mode & mf_screenshot) { - open_screenshots_file("w"); + open_screenshot_file("w"); if (o_single_page) take_one_screenshot(); else take_screenshots(); } if (o_mode & mf_readscreenshot) { - open_screenshots_file("r"); + open_screenshot_file("r"); if (o_single_page) read_one_screenshot(); else read_screenshots(); } diff --git a/pctb/convert.h b/pctb/convert.h index 90e5e24..e9d00b9 100644 --- a/pctb/convert.h +++ b/pctb/convert.h @@ -47,7 +47,7 @@ void analyse(FILE *tsv_output); /*----- from convert.c -----*/ -extern FILE *screenshots_file; +extern FILE *screenshot_file; void vwarning(const char *fmt, va_list) FMT(1,0); void warning(const char *fmt, ...) FMT(1,2); diff --git a/pctb/pages.c b/pctb/pages.c index 42dd5bc..0484710 100644 --- a/pctb/pages.c +++ b/pctb/pages.c @@ -348,7 +348,7 @@ static CanonImage *convert_page(Snapshot *sn) { ShMask shiftmasks[3]; CanonImage *im; - fprintf(screenshots_file, + fprintf(screenshot_file, "P6\n" "%d %d\n" "255\n", sn->width, sn->height); @@ -369,12 +369,12 @@ static CanonImage *convert_page(Snapshot *sn) { ((xrgb << shiftmasks[i].lshift) >> shiftmasks[i].rshift) & SAMPLEMASK; rgb |= sample; - fputc(sample, screenshots_file); + fputc(sample, screenshot_file); } }); - sysassert(!ferror(screenshots_file)); - sysassert(!fflush(screenshots_file)); + sysassert(!ferror(screenshot_file)); + sysassert(!fflush(screenshot_file)); return im; } diff --git a/pctb/structure.c b/pctb/structure.c index 8141feb..49385a2 100644 --- a/pctb/structure.c +++ b/pctb/structure.c @@ -47,6 +47,7 @@ static OcrReader *rd; const CanonColourInfo canoncolourinfos[]= { { 0x475A5E, '*' }, /* edge */ { 0x2C5F7A, '*' }, /* edge just under box heading shadow */ + { 0xC5C7Ae, '*' }, /* blank area of partial commodities list */ { 0x7D9094, '+' }, /* interbox */ { 0xBDC5BF, ' ' }, /* background - pale Sugar cane, etc. */ @@ -111,20 +112,23 @@ static void mustfail2(void) { #v,(v).tl.x,(v).tl.y,(v).br.x,(v).br.y) +#define REQUIRE_RECTANGLE(tlx,tly,brx,bry,ok) \ + require_rectangle(tlx, tly, brx, bry, ok, __LINE__); + static void require_rectangle(int tlx, int tly, int brx, int bry, - const char *ok) { + const char *ok, int lineno) { Point p; for (p.x=tlx; p.x<=brx; p.x++) for (p.y=tly; p.y<=bry; p.y++) { int c= get_p(p); MUST( strchr(ok,c), ({ Rect rm={{tlx,tly},{brx,bry}}; - MR(rm);MP(p);MS(ok); + MI(lineno),MR(rm);MP(p);MS(ok); })); } } -static void require_rectangle_r(Rect rr, const char *ok) { - require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok); +static void require_rectangle_r(Rect rr, const char *ok, int lineno) { + require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok, lineno); } static void debug_rect(const char *what, int whati, Rect rr) { @@ -167,24 +171,24 @@ void find_structure(CanonImage *im) { WALK_UNTIL_MUST(mainr.br, x,+1, whole.br.x, '*'); WALK_UNTIL_MUST(mainr.br, y,+1, whole.br.y, '*'); - require_rectangle(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, "*"); - require_rectangle(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, "*"); - require_rectangle(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, "*"); - require_rectangle(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, "*"); - -#define CHECK_STRIP_BORDER(tlbr,xy,increm) \ - do { \ - Point csb_p; \ - Rect csb_r; \ - csb_p= mainr.tl; \ - csb_p.xy= mainr.tlbr.xy; \ - if (get_p(csb_p)=='+') { \ - csb_r= mainr; \ - csb_r.tl.xy= csb_p.xy; \ - csb_r.br.xy= csb_p.xy; \ - require_rectangle_r(csb_r, "+"); \ - mainr.tlbr.xy += increm; \ - } \ + REQUIRE_RECTANGLE(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, "*"); + REQUIRE_RECTANGLE(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, "*"); + REQUIRE_RECTANGLE(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, "*"); + REQUIRE_RECTANGLE(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, "*"); + +#define CHECK_STRIP_BORDER(tlbr,xy,increm) \ + do { \ + Point csb_p; \ + Rect csb_r; \ + csb_p= mainr.tl; \ + csb_p.xy= mainr.tlbr.xy; \ + if (get_p(csb_p)=='+') { \ + csb_r= mainr; \ + csb_r.tl.xy= csb_p.xy; \ + csb_r.br.xy= csb_p.xy; \ + require_rectangle_r(csb_r, "+", __LINE__); \ + mainr.tlbr.xy += increm; \ + } \ } while(0) debug_rect("mainr",0, mainr); @@ -235,7 +239,7 @@ void find_structure(CanonImage *im) { break; across.x++; - require_rectangle(across.x,mainr.tl.y, across.x,mainr.br.y, "+"); + REQUIRE_RECTANGLE(across.x,mainr.tl.y, across.x,mainr.br.y, "+"); across.x++; } MUST( colno >= MIN_COLUMNS, MI(colno);MR(mainr);MP(across); ); @@ -280,7 +284,7 @@ static void file_read_image_ppm(FILE *f) { (rgb_buf[2]); }); - sysassert(!ferror(screenshots_file)); + sysassert(!ferror(screenshot_file)); if (!(npages < MAX_PAGES)) fatal("Too many images in screenshots file; max is %d.\n", MAX_PAGES); @@ -290,28 +294,28 @@ static void file_read_image_ppm(FILE *f) { void read_one_screenshot(void) { progress("reading screenshot..."); - file_read_image_ppm(screenshots_file); + file_read_image_ppm(screenshot_file); progress_log("read screenshot."); } void read_screenshots(void) { struct stat stab; - sysassert(! fstat(fileno(screenshots_file), &stab) ); + sysassert(! fstat(fileno(screenshot_file), &stab) ); for (;;) { if (S_ISREG(stab.st_mode)) { - long pos= ftell(screenshots_file); + long pos= ftell(screenshot_file); if (pos == stab.st_size) break; } else { - int c= fgetc(screenshots_file); + int c= fgetc(screenshot_file); if (c==EOF) break; - ungetc(c, screenshots_file); + ungetc(c, screenshot_file); } progress("reading screenshot %d...",npages); - file_read_image_ppm(screenshots_file); + file_read_image_ppm(screenshot_file); } - sysassert(!ferror(screenshots_file)); + sysassert(!ferror(screenshot_file)); progress_log("read %d screenshots.",npages); } @@ -325,9 +329,9 @@ static void find_commodity(int offset, Rect *rr) { rr->br.x= mainr.br.x; if (rr->tl.y > mainr.tl.y) - require_rectangle(rr->tl.x,rr->tl.y-1, rr->br.x,rr->tl.y-1, "+"); + REQUIRE_RECTANGLE(rr->tl.x,rr->tl.y-1, rr->br.x,rr->tl.y-1, "+"); if (rr->br.y < mainr.tl.y) - require_rectangle(rr->tl.x,rr->br.y+1, rr->br.x,rr->br.y+1, "+"); + REQUIRE_RECTANGLE(rr->tl.x,rr->br.y+1, rr->br.x,rr->br.y+1, "+"); } static void find_table_entry(Rect commod, int colno, Rect *cellr) { @@ -336,7 +340,7 @@ static void find_table_entry(Rect commod, int colno, Rect *cellr) { cellr->tl.x= !colno ? commod.tl.x : colrightx[colno-1]+2; cellr->br.x= colrightx[colno]; debug_rect("cell", colno, *cellr); - require_rectangle_r(*cellr, " o"); + require_rectangle_r(*cellr, " o", __LINE__); } static void ocr_rectangle(Rect r, const OcrCellType ct, FILE *tsv_output) { diff --git a/pctb/yppsc-commod-processor b/pctb/yppsc-commod-processor index 5e4e03d..0e1a7d0 100755 --- a/pctb/yppsc-commod-processor +++ b/pctb/yppsc-commod-processor @@ -148,7 +148,10 @@ sub main__arbitrage () { } my $allprofit; - return unless @arbs; + if (!@arbs) { + print "No arbitrage opportunities.\n" or die $!; + return; + } my $bigdiv= <