diff --git a/scripts/genplot_configurable.py b/scripts/genplot_configurable.py index 2eb63bf..7e9c7a0 100755 --- a/scripts/genplot_configurable.py +++ b/scripts/genplot_configurable.py @@ -134,7 +134,9 @@ def genPGFPlot(experiments, methNames, methStyles, outputFile, xAxisField, yAxis if printSameMeth == sameMethFlag: methodData = experiments[methodId] - lines.append(LATEX_LINE % (methStyles[methodId],'\n'.join(methodData), legendEntry)) + methodData.sort() + methodDataStr = [ str(e[0]) + ' ' + str(e[1]) for e in methodData] + lines.append(LATEX_LINE % (methStyles[methodId],'\n'.join(methodDataStr), legendEntry)) lines.append('%s %s %s' % ('%', methodId, methodName)) @@ -184,7 +186,7 @@ def parseExpr(inputFile, lineNumber, row, header, xAxisField, yAxisField): methodId = row[METHOD_ID_FIELD_ID] props = methodNameAndStyle(methodId) - return [methodId, props[0], props[1], row[header[xAxisField]] + ' ' + row[header[yAxisField]]] + return [methodId, props[0], props[1], (row[header[xAxisField]], row[header[yAxisField]]) ] def genPlotLatex(inputFile, outputFile, xAxisField, yAxisField, axisType, noLegend, printXaxis, printYaxis): header = {} diff --git a/similarity_search/src/init.cc b/similarity_search/src/init.cc index 9e43957..08183f7 100644 --- a/similarity_search/src/init.cc +++ b/similarity_search/src/init.cc @@ -28,9 +28,12 @@ #include "logging.h" +#include + namespace similarity { void initLibrary(LogChoice choice, const char* pLogFile) { + std::ios_base::sync_with_stdio(false); InitializeLogger(choice, pLogFile); initSpaces(); initMethods();