X-Git-Url: http://nitlanguage.org diff --git a/src/metrics/mendel_metrics.nit b/src/metrics/mendel_metrics.nit index 1ee1db2..dbd2122 100644 --- a/src/metrics/mendel_metrics.nit +++ b/src/metrics/mendel_metrics.nit @@ -81,24 +81,28 @@ private class MendelMetricsPhase metrics.collect(mclasses) if csv then metrics.to_csv.save("{out}/mendel.csv") - print toolcontext.format_h4("\tlarge mclasses (threshold: {cnblp.threshold})") - for mclass in cnblp.above_threshold do - print toolcontext.format_p("\t {mclass.name}: {cnblp.values[mclass]}") + var threshold = cnblp.threshold + print toolcontext.format_h4("\tlarge mclasses (threshold: {threshold})") + for mclass in cnblp.sort do + var val = cnblp.values[mclass] + if val.to_f < threshold then break + print toolcontext.format_p("\t {mclass.name}: {val}") end - print toolcontext.format_h4("\tbudding mclasses (threshold: {cnvi.threshold})") - for mclass in cnvi.above_threshold do - print toolcontext.format_p("\t {mclass.name}: {cnvi.values[mclass]}") + threshold = cnvi.threshold + print toolcontext.format_h4("\tbudding mclasses (threshold: {threshold})") + for mclass in cnvi.sort do + var val = cnvi.values[mclass] + if val.to_f < threshold then break + print toolcontext.format_p("\t {mclass.name}: {val}") end - print toolcontext.format_h4("\tblooming mclasses (threshold: {cnvs.threshold})") - for mclass in cnvs.above_threshold do - print toolcontext.format_p("\t {mclass.name}: {cnvs.values[mclass]}") - end - - print toolcontext.format_h4("\tblooming mclasses (threshold: {cnvs.threshold})") - for mclass in cnvs.above_threshold do - print toolcontext.format_p("\t {mclass.name}: {cnvs.values[mclass]}") + threshold = cnvs.threshold + print toolcontext.format_h4("\tblooming mclasses (threshold: {threshold})") + for mclass in cnvs.sort do + var val = cnvs.values[mclass] + if val.to_f < threshold then break + print toolcontext.format_p("\t {mclass.name}: {val}") end if csv then @@ -131,7 +135,6 @@ class CBMS redef fun desc do return "branch mean size, mean number of introduction available among ancestors" var mainmodule: MModule - init(mainmodule: MModule) do self.mainmodule = mainmodule redef fun collect(mclasses) do for mclass in mclasses do @@ -151,7 +154,6 @@ class CNVI redef fun desc do return "class novelty index, contribution of the class to its branch in term of introductions" var mainmodule: MModule - init(mainmodule: MModule) do self.mainmodule = mainmodule redef fun collect(mclasses) do var cbms = new CBMS(mainmodule) @@ -180,7 +182,6 @@ class CNVS redef fun desc do return "class novelty score, importance of the contribution of the class to its branch" var mainmodule: MModule - init(mainmodule: MModule) do self.mainmodule = mainmodule redef fun collect(mclasses) do var cnvi = new CNVI(mainmodule)