From 8ba025bc0b77985daabdf02cf86f14ff221312b9 Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Wed, 4 Dec 2013 16:30:59 +0100 Subject: [PATCH] Another DBC-plot (subrec ranks in DBC's order) --- heikki/dbc-os/test2.sh | 7 ++++--- src/relevance.c | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/heikki/dbc-os/test2.sh b/heikki/dbc-os/test2.sh index 3765954..86532e7 100755 --- a/heikki/dbc-os/test2.sh +++ b/heikki/dbc-os/test2.sh @@ -136,14 +136,15 @@ echo " set term png set out \"cluster.png\" set title \"$Q\" - set yrange [0:20000] + #set yrange [0:5000] plot \"merge.data\" using 1:3 with points title \"records\", \ - \"merge.data\" using 1:4 with points title \"merged score\", \ - \"merge.data\" using 1:5 with points title \"sum score\", \ \"merge.data\" using 1:6 with points title \"avg score\" " > plot.cmd cat plot.cmd | gnuplot + #\"merge.data\" using 1:4 with points title \"merged score\", \ + #\"merge.data\" using 1:5 with points title \"sum score\", \ + echo echo "All done" diff --git a/src/relevance.c b/src/relevance.c index bd7a082..1f3eb28 100644 --- a/src/relevance.c +++ b/src/relevance.c @@ -593,6 +593,10 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist, else { // only one record, take the easy way out of merging (and don't bother plotting) mergescore = atof( score ) * 10000; + wrbuf_printf(w,"mergeplot %d x %d %f %f %d\n", clusternumber, mergescore, + 1.0*mergescore, 1.0*mergescore, nclust ); + yaz_log(YLOG_LOG,"mergeplot %d x %d %f %f %d", clusternumber, mergescore, + 1.0*mergescore, 1.0*mergescore, nclust ); } } // merge score id = getfield(bestrecord, "id"); @@ -608,7 +612,7 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist, wrbuf_printf(w,"plotline: %d %d %d %d %d %d %d # %s %s\n", norm->num, bestrecord->position, tfrel, robinscore, solrscore, normscore, mergescore, idbuf, title ); - relevance = mergescore; + relevance = normscore; } rec->relevance_score = relevance; } -- 1.7.10.4