X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2Fstructurechooser%2FTDBResultAnalyser.java;h=28861d9ff365b353a7b55709ae1554b97478e496;hb=e7e3ef45b167b7b823fdc76a7d05e78ae91a7fd3;hp=e817b26bc8d18cfc4bc8934f1b60a66a949b2270;hpb=1a80985facca80167fb54ca70d9778b1c3bcf9f1;p=jalview.git diff --git a/src/jalview/gui/structurechooser/TDBResultAnalyser.java b/src/jalview/gui/structurechooser/TDBResultAnalyser.java index e817b26..28861d9 100644 --- a/src/jalview/gui/structurechooser/TDBResultAnalyser.java +++ b/src/jalview/gui/structurechooser/TDBResultAnalyser.java @@ -113,7 +113,7 @@ public class TDBResultAnalyser int idx = EXP_CATEGORIES.indexOf(upper_cat); if (idx == -1) { - System.out.println("Unknown category: '" + cat + "'"); + jalview.bin.Console.outPrintln("Unknown category: '" + cat + "'"); EXP_CATEGORIES.add(upper_cat); idx = EXP_CATEGORIES.size() - 1; } @@ -223,8 +223,8 @@ public class TDBResultAnalyser if (!o1_qualtype.equals(o2_qualtype)) { // prefer LDDT measure over others - return "pLDDT".equals(o1_prov) ? -1 - : "pLDDT".equals(o2_prov) ? 1 : 0; + return "pLDDT".equals(o1_qualtype) ? -1 + : "pLDDT".equals(o2_qualtype) ? 1 : 0; } // OR NO VALUE FOR THE QUALITY if (eitherNull(idx_mqual, o1data, o2data)) @@ -234,7 +234,8 @@ public class TDBResultAnalyser // models, so rank on qmean - b double o1_mq = (Double) o1data[idx_mqual]; double o2_mq = (Double) o2data[idx_mqual]; - return (o2_mq < o1_mq) ? 1 : (o2_mq == o1_mq) ? 0 : -1; + int res = (o2_mq < o1_mq) ? 1 : (o2_mq == o1_mq) ? 0 : -1; + return ("pLDDT".equals(o1_qualtype)) ? -res : res; } } else