From 46980e6c9a34be5c9f61c35350faea7cc370e1ec Mon Sep 17 00:00:00 2001 From: gebele Date: Thu, 16 Mar 2017 13:18:06 +0000 Subject: sort --- compare_validation_reports.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compare_validation_reports.rb b/compare_validation_reports.rb index 8852a34..415adac 100644 --- a/compare_validation_reports.rb +++ b/compare_validation_reports.rb @@ -55,15 +55,15 @@ end if options[:dir] if options[:verbose] if !options[:classification] && !options[:regression] - json = Dir[options[:dir]+'*.json'].map { |f| JSON.parse File.read(f) }.flatten + json = Dir[options[:dir]+'*.json'].sort.map { |f| JSON.parse File.read(f) }.flatten puts JSON.pretty_generate json end if options[:classification] - json = Dir[options[:dir]+'*_classification_*.json'].map { |f| JSON.parse File.read(f) }.flatten + json = Dir[options[:dir]+'*_classification_*.json'].sort.map { |f| JSON.parse File.read(f) }.flatten puts JSON.pretty_generate json end if options[:regression] - json = Dir[options[:dir]+'*_regression_*.json'].map { |f| JSON.parse File.read(f) }.flatten + json = Dir[options[:dir]+'*_regression_*.json'].sort.map { |f| JSON.parse File.read(f) }.flatten puts JSON.pretty_generate json end else @@ -71,11 +71,11 @@ if options[:dir] main = {} if !options[:classification] && !options[:regression] && !options[:verbose] - json = Dir[options[:dir]+'*.json'].map { |f| JSON.parse File.read(f) }.flatten + json = Dir[options[:dir]+'*.json'].sort.map { |f| JSON.parse File.read(f) }.flatten puts JSON.pretty_generate json end if options[:classification] - json = Dir[options[:dir]+'*_classification_*.json'].map { |f| JSON.parse File.read(f) }.flatten + json = Dir[options[:dir]+'*_classification_*.json'].sort.map { |f| JSON.parse File.read(f) }.flatten json.each do |report| main[report["endpoint"]] ||= [] main[report["endpoint"]] << [report["species"], report["created_at"], report["crossvalidations"].map{|cv| {"accuracy": cv[1]["statistics"]["accuracy"], "weighted_accuracy": cv[1]["statistics"]["weighted_accuracy"], "true_rate": cv[1]["statistics"]["true_rate"], "predictivity": cv[1]["statistics"]["predictivity"]}}.flatten] @@ -83,7 +83,7 @@ if options[:dir] puts JSON.pretty_generate main end if options[:regression] - json = Dir[options[:dir]+'*_regression_*.json'].map { |f| JSON.parse File.read(f) }.flatten + json = Dir[options[:dir]+'*_regression_*.json'].sort.map { |f| JSON.parse File.read(f) }.flatten json.each do |report| main[report["endpoint"]] ||= [] main[report["endpoint"]] << [report["species"], report["created_at"], report["crossvalidations"].map{|cv| {"rmse": cv[1]["statistics"]["rmse"], "r_squared": cv[1]["statistics"]["r_squared"]}}.flatten] -- cgit v1.2.3