From 2e7aba5bc7a20402ad27f7c8e7fcfabcb79559a7 Mon Sep 17 00:00:00 2001 From: Mohammad S Anwar Date: Sun, 30 Jun 2024 14:07:03 +0100 Subject: - Added solutions by Jan Krnavek. - Added solutions by Nelo Tovar. - Added solutions by Bruce Gray. - Added solutions by Simon Green. - Added solutions by Laurent Rosenfeld. --- challenge-275/laurent-rosenfeld/blog.txt | 1 + challenge-275/laurent-rosenfeld/perl/ch-2.pl | 19 + challenge-275/laurent-rosenfeld/raku/ch-2.raku | 15 + stats/pwc-current.json | 281 ++-- stats/pwc-language-breakdown-summary.json | 68 +- stats/pwc-language-breakdown.json | 1842 ++++++++++++------------ stats/pwc-leaders.json | 736 +++++----- stats/pwc-summary-1-30.json | 116 +- stats/pwc-summary-121-150.json | 40 +- stats/pwc-summary-151-180.json | 116 +- stats/pwc-summary-181-210.json | 40 +- stats/pwc-summary-211-240.json | 96 +- stats/pwc-summary-241-270.json | 44 +- stats/pwc-summary-271-300.json | 36 +- stats/pwc-summary-301-330.json | 44 +- stats/pwc-summary-31-60.json | 42 +- stats/pwc-summary-61-90.json | 104 +- stats/pwc-summary-91-120.json | 36 +- stats/pwc-summary.json | 672 ++++----- 19 files changed, 2235 insertions(+), 2113 deletions(-) create mode 100644 challenge-275/laurent-rosenfeld/blog.txt create mode 100644 challenge-275/laurent-rosenfeld/perl/ch-2.pl create mode 100644 challenge-275/laurent-rosenfeld/raku/ch-2.raku diff --git a/challenge-275/laurent-rosenfeld/blog.txt b/challenge-275/laurent-rosenfeld/blog.txt new file mode 100644 index 0000000000..8976bea039 --- /dev/null +++ b/challenge-275/laurent-rosenfeld/blog.txt @@ -0,0 +1 @@ +https://blogs.perl.org/users/laurent_r/2024/06/-perl-weekly-challenge-275-replace-digits.html diff --git a/challenge-275/laurent-rosenfeld/perl/ch-2.pl b/challenge-275/laurent-rosenfeld/perl/ch-2.pl new file mode 100644 index 0000000000..a546f33821 --- /dev/null +++ b/challenge-275/laurent-rosenfeld/perl/ch-2.pl @@ -0,0 +1,19 @@ +use strict; +use warnings; +use feature 'say'; + +sub replace_digits { + my @chars = split //, shift; + for my $i (1..$#chars) { + if ($chars[$i] =~ /\d/) { + $chars[$i] = chr( $chars[$i] + ord $chars[$i-1]); + } + } + return join "", @chars; +} + +my @tests = ('a1c1e1', 'a1b2c3d4', 'b2b', 'a16z'); +for my $test (@tests) { + printf "%-10s => ", $test; + say replace_digits $test; +} diff --git a/challenge-275/laurent-rosenfeld/raku/ch-2.raku b/challenge-275/laurent-rosenfeld/raku/ch-2.raku new file mode 100644 index 0000000000..2481d7dc1c --- /dev/null +++ b/challenge-275/laurent-rosenfeld/raku/ch-2.raku @@ -0,0 +1,15 @@ +sub replace-digits ($in) { + my @chars = $in.comb; + for 1..@chars.end -> $i { + if @chars[$i] ~~ /\d/ { + @chars[$i] = chr( @chars[$i-1].ord + @chars[$i]); + } + } + return join "", @chars; +} + +my @tests = 'a1c1e1', 'a1b2c3d4', 'b2b', 'a16z'; +for @tests -> $test { + printf "%-10s => ", $test; + say replace-digits $test; +} diff --git a/stats/pwc-current.json b/stats/pwc-current.json index 0e7fe2c666..e7f44d6e4a 100644 --- a/stats/pwc-current.json +++ b/stats/pwc-current.json @@ -1,21 +1,7 @@ { - "tooltip" : { - "followPointer" : 1, - "pointFormat" : "{point.name}: {point.y:f}
", - "headerFormat" : "{series.name}
" - }, "chart" : { "type" : "column" }, - "plotOptions" : { - "series" : { - "borderWidth" : 0, - "dataLabels" : { - "format" : "{point.y}", - "enabled" : 1 - } - } - }, "drilldown" : { "series" : [ { @@ -29,10 +15,12 @@ 1 ] ], - "name" : "Arne Sommer", - "id" : "Arne Sommer" + "id" : "Arne Sommer", + "name" : "Arne Sommer" }, { + "name" : "Athanasius", + "id" : "Athanasius", "data" : [ [ "Perl", @@ -42,9 +30,7 @@ "Raku", 2 ] - ], - "id" : "Athanasius", - "name" : "Athanasius" + ] }, { "data" : [ @@ -53,18 +39,18 @@ 2 ] ], - "name" : "Bob Lied", - "id" : "Bob Lied" + "id" : "Bob Lied", + "name" : "Bob Lied" }, { - "name" : "Cheok-Yin Fung", - "id" : "Cheok-Yin Fung", "data" : [ [ - "Perl", + "Raku", 2 ] - ] + ], + "id" : "Bruce Gray", + "name" : "Bruce Gray" }, { "data" : [ @@ -73,12 +59,12 @@ 2 ] ], - "name" : "Dave Jacoby", - "id" : "Dave Jacoby" + "id" : "Cheok-Yin Fung", + "name" : "Cheok-Yin Fung" }, { - "id" : "David Ferrone", - "name" : "David Ferrone", + "name" : "Dave Jacoby", + "id" : "Dave Jacoby", "data" : [ [ "Perl", @@ -86,6 +72,16 @@ ] ] }, + { + "data" : [ + [ + "Perl", + 2 + ] + ], + "id" : "David Ferrone", + "name" : "David Ferrone" + }, { "data" : [ [ @@ -97,16 +93,18 @@ "name" : "E. Choroba" }, { + "name" : "Feng Chang", + "id" : "Feng Chang", "data" : [ [ "Raku", 2 ] - ], - "name" : "Feng Chang", - "id" : "Feng Chang" + ] }, { + "name" : "Jaldhar H. Vyas", + "id" : "Jaldhar H. Vyas", "data" : [ [ "Perl", @@ -120,11 +118,21 @@ "Blog", 1 ] - ], - "name" : "Jaldhar H. Vyas", - "id" : "Jaldhar H. Vyas" + ] + }, + { + "name" : "Jan Krnavek", + "id" : "Jan Krnavek", + "data" : [ + [ + "Raku", + 2 + ] + ] }, { + "name" : "Joelle Maslak", + "id" : "Joelle Maslak", "data" : [ [ "Perl", @@ -134,11 +142,10 @@ "Raku", 2 ] - ], - "id" : "Joelle Maslak", - "name" : "Joelle Maslak" + ] }, { + "name" : "Jorg Sommrey", "data" : [ [ "Perl", @@ -149,66 +156,92 @@ 1 ] ], - "name" : "Jorg Sommrey", "id" : "Jorg Sommrey" }, { + "id" : "Laurent Rosenfeld", "data" : [ + [ + "Perl", + 1 + ], [ "Raku", - 2 + 1 ], [ "Blog", - 9 + 1 ] ], + "name" : "Laurent Rosenfeld" + }, + { + "name" : "Luca Ferrari", "id" : "Luca Ferrari", - "name" : "Luca Ferrari" + "data" : [ + [ + "Raku", + 2 + ], + [ + "Blog", + 9 + ] + ] }, { + "name" : "Mariano Spadaccini", + "id" : "Mariano Spadaccini", "data" : [ [ "Perl", 2 ] - ], - "id" : "Mariano Spadaccini", - "name" : "Mariano Spadaccini" + ] }, { - "name" : "Mark Anderson", - "id" : "Mark Anderson", "data" : [ [ "Raku", 2 ] - ] + ], + "id" : "Mark Anderson", + "name" : "Mark Anderson" }, { - "id" : "Matthew Neleigh", - "name" : "Matthew Neleigh", "data" : [ [ "Perl", 2 ] - ] + ], + "id" : "Matthew Neleigh", + "name" : "Matthew Neleigh" }, { + "id" : "Nelo Tovar", "data" : [ [ "Perl", 2 ] ], + "name" : "Nelo Tovar" + }, + { "id" : "Niels van Dijke", + "data" : [ + [ + "Perl", + 2 + ] + ], "name" : "Niels van Dijke" }, { "id" : "Packy Anderson", - "name" : "Packy Anderson", "data" : [ [ "Perl", @@ -222,7 +255,8 @@ "Blog", 1 ] - ] + ], + "name" : "Packy Anderson" }, { "data" : [ @@ -235,8 +269,8 @@ 1 ] ], - "name" : "Peter Campbell Smith", - "id" : "Peter Campbell Smith" + "id" : "Peter Campbell Smith", + "name" : "Peter Campbell Smith" }, { "name" : "Peter Meszaros", @@ -249,7 +283,6 @@ ] }, { - "id" : "Reinier Maliepaard", "name" : "Reinier Maliepaard", "data" : [ [ @@ -260,9 +293,11 @@ "Blog", 1 ] - ] + ], + "id" : "Reinier Maliepaard" }, { + "id" : "Robbie Hatley", "data" : [ [ "Perl", @@ -273,12 +308,11 @@ 1 ] ], - "id" : "Robbie Hatley", "name" : "Robbie Hatley" }, { - "id" : "Roger Bell_West", "name" : "Roger Bell_West", + "id" : "Roger Bell_West", "data" : [ [ "Perl", @@ -291,6 +325,21 @@ ] }, { + "name" : "Simon Green", + "data" : [ + [ + "Perl", + 2 + ], + [ + "Blog", + 1 + ] + ], + "id" : "Simon Green" + }, + { + "id" : "Thomas Kohler", "data" : [ [ "Perl", @@ -301,12 +350,9 @@ 2 ] ], - "name" : "Thomas Kohler", - "id" : "Thomas Kohler" + "name" : "Thomas Kohler" }, { - "name" : "W. Luis Mochan", - "id" : "W. Luis Mochan", "data" : [ [ "Perl", @@ -316,11 +362,13 @@ "Blog", 1 ] - ] + ], + "id" : "W. Luis Mochan", + "name" : "W. Luis Mochan" }, { - "id" : "Wanderdoc", "name" : "Wanderdoc", + "id" : "Wanderdoc", "data" : [ [ "Perl", @@ -330,8 +378,23 @@ } ] }, + "yAxis" : { + "title" : { + "text" : "Total Solutions" + } + }, + "plotOptions" : { + "series" : { + "borderWidth" : 0, + "dataLabels" : { + "enabled" : 1, + "format" : "{point.y}" + } + } + }, "series" : [ { + "name" : "The Weekly Challenge - 275", "data" : [ { "name" : "Arne Sommer", @@ -344,18 +407,23 @@ "name" : "Athanasius" }, { - "drilldown" : "Bob Lied", + "y" : 2, "name" : "Bob Lied", - "y" : 2 + "drilldown" : "Bob Lied" }, { - "drilldown" : "Cheok-Yin Fung", + "name" : "Bruce Gray", "y" : 2, - "name" : "Cheok-Yin Fung" + "drilldown" : "Bruce Gray" }, { + "name" : "Cheok-Yin Fung", "y" : 2, + "drilldown" : "Cheok-Yin Fung" + }, + { "name" : "Dave Jacoby", + "y" : 2, "drilldown" : "Dave Jacoby" }, { @@ -378,29 +446,39 @@ "name" : "Jaldhar H. Vyas", "y" : 5 }, + { + "drilldown" : "Jan Krnavek", + "y" : 2, + "name" : "Jan Krnavek" + }, { "y" : 4, "name" : "Joelle Maslak", "drilldown" : "Joelle Maslak" }, { - "drilldown" : "Jorg Sommrey", "y" : 3, - "name" : "Jorg Sommrey" + "name" : "Jorg Sommrey", + "drilldown" : "Jorg Sommrey" + }, + { + "drilldown" : "Laurent Rosenfeld", + "name" : "Laurent Rosenfeld", + "y" : 3 }, { + "drilldown" : "Luca Ferrari", "name" : "Luca Ferrari", - "y" : 11, - "drilldown" : "Luca Ferrari" + "y" : 11 }, { - "drilldown" : "Mariano Spadaccini", + "y" : 2, "name" : "Mariano Spadaccini", - "y" : 2 + "drilldown" : "Mariano Spadaccini" }, { - "y" : 2, "name" : "Mark Anderson", + "y" : 2, "drilldown" : "Mark Anderson" }, { @@ -408,25 +486,30 @@ "name" : "Matthew Neleigh", "drilldown" : "Matthew Neleigh" }, + { + "drilldown" : "Nelo Tovar", + "name" : "Nelo Tovar", + "y" : 2 + }, { "name" : "Niels van Dijke", "y" : 2, "drilldown" : "Niels van Dijke" }, { - "name" : "Packy Anderson", + "drilldown" : "Packy Anderson", "y" : 5, - "drilldown" : "Packy Anderson" + "name" : "Packy Anderson" }, { - "drilldown" : "Peter Campbell Smith", + "y" : 3, "name" : "Peter Campbell Smith", - "y" : 3 + "drilldown" : "Peter Campbell Smith" }, { "drilldown" : "Peter Meszaros", - "y" : 2, - "name" : "Peter Meszaros" + "name" : "Peter Meszaros", + "y" : 2 }, { "drilldown" : "Reinier Maliepaard", @@ -434,15 +517,20 @@ "y" : 3 }, { + "drilldown" : "Robbie Hatley", "y" : 3, - "name" : "Robbie Hatley", - "drilldown" : "Robbie Hatley" + "name" : "Robbie Hatley" }, { "y" : 4, "name" : "Roger Bell_West", "drilldown" : "Roger Bell_West" }, + { + "drilldown" : "Simon Green", + "name" : "Simon Green", + "y" : 3 + }, { "name" : "Thomas Kohler", "y" : 4, @@ -454,30 +542,29 @@ "drilldown" : "W. Luis Mochan" }, { - "y" : 2, "name" : "Wanderdoc", + "y" : 2, "drilldown" : "Wanderdoc" } ], - "name" : "The Weekly Challenge - 275", "colorByPoint" : 1 } ], - "yAxis" : { - "title" : { - "text" : "Total Solutions" - } - }, - "subtitle" : { - "text" : "[Champions: 25] Last updated at 2024-06-29 12:31:35 GMT" - }, - "legend" : { - "enabled" : 0 - }, "xAxis" : { "type" : "category" }, "title" : { "text" : "The Weekly Challenge - 275" + }, + "subtitle" : { + "text" : "[Champions: 30] Last updated at 2024-06-30 13:00:45 GMT" + }, + "tooltip" : { + "pointFormat" : "{point.name}: {point.y:f}
", + "followPointer" : 1, + "headerFormat" : "{series.name}
" + }, + "legend" : { + "enabled" : 0 } } diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json index 34632ec20d..dc979db6dc 100644 --- a/stats/pwc-language-breakdown-summary.json +++ b/stats/pwc-language-breakdown-summary.json @@ -1,63 +1,63 @@ { - "title" : { - "text" : "The Weekly Challenge Contributions [2019 - 2024]" + "yAxis" : { + "min" : 0, + "title" : { + "text" : null + } + }, + "chart" : { + "type" : "column" }, "xAxis" : { "type" : "category", "labels" : { "style" : { - "fontFamily" : "Verdana, sans-serif", - "fontSize" : "13px" + "fontSize" : "13px", + "fontFamily" : "Verdana, sans-serif" } } }, - "subtitle" : { - "text" : "Last updated at 2024-06-29 12:31:35 GMT" - }, - "yAxis" : { - "title" : { - "text" : null - }, - "min" : 0 - }, - "legend" : { - "enabled" : "false" - }, "series" : [ { "name" : "Contributions", - "dataLabels" : { - "rotation" : -90, - "y" : 10, - "style" : { - "fontSize" : "13px", - "fontFamily" : "Verdana, sans-serif" - }, - "color" : "#FFFFFF", - "format" : "{point.y:.0f}", - "enabled" : "true", - "align" : "right" - }, "data" : [ [ "Blog", - 5006 + 5008 ], [ "Perl", - 14249 + 14254 ], [ "Raku", - 8258 + 8263 ] - ] + ], + "dataLabels" : { + "rotation" : -90, + "y" : 10, + "enabled" : "true", + "color" : "#FFFFFF", + "align" : "right", + "format" : "{point.y:.0f}", + "style" : { + "fontFamily" : "Verdana, sans-serif", + "fontSize" : "13px" + } + } } ], - "chart" : { - "type" : "column" + "title" : { + "text" : "The Weekly Challenge Contributions [2019 - 2024]" + }, + "subtitle" : { + "text" : "Last updated at 2024-06-30 13:00:45 GMT" }, "tooltip" : { "pointFormat" : "{point.y:.0f}" + }, + "legend" : { + "enabled" : "false" } } diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json index af151a780c..91179da9c9 100644 --- a/stats/pwc-language-breakdown.json +++ b/stats/pwc-language-breakdown.json @@ -1,37 +1,27 @@ { - "subtitle" : { - "text" : "Click the columns to drilldown the language breakdown. Last updated at 2024-06-29 12:31:35 GMT" - }, - "yAxis" : { - "title" : { - "text" : "Total Solutions" - } - }, - "legend" : { - "enabled" : "false" - }, "series" : [ { + "name" : "The Weekly Challenge Languages", "data" : [ { - "y" : 168, + "drilldown" : "001", "name" : "#001", - "drilldown" : "001" + "y" : 168 }, { - "name" : "#002", + "drilldown" : "002", "y" : 133, - "drilldown" : "002" + "name" : "#002" }, { - "name" : "#003", + "drilldown" : "003", "y" : 91, - "drilldown" : "003" + "name" : "#003" }, { + "drilldown" : "004", "y" : 106, - "name" : "#004", - "drilldown" : "004" + "name" : "#004" }, { "y" : 82, @@ -44,9 +34,9 @@ "y" : 63 }, { - "drilldown" : "007", "y" : 71, - "name" : "#007" + "name" : "#007", + "drilldown" : "007" }, { "drilldown" : "008", @@ -59,49 +49,49 @@ "drilldown" : "009" }, { - "name" : "#010", "y" : 71, + "name" : "#010", "drilldown" : "010" }, { - "drilldown" : "011", + "name" : "#011", "y" : 91, - "name" : "#011" + "drilldown" : "011" }, { - "y" : 96, + "drilldown" : "012", "name" : "#012", - "drilldown" : "012" + "y" : 96 }, { + "drilldown" : "013", "name" : "#013", - "y" : 88, - "drilldown" : "013" + "y" : 88 }, { "drilldown" : "014", - "y" : 104, - "name" : "#014" + "name" : "#014", + "y" : 104 }, { - "name" : "#015", "y" : 103, + "name" : "#015", "drilldown" : "015" }, { "drilldown" : "016", - "name" : "#016", - "y" : 75 + "y" : 75, + "name" : "#016" }, { - "drilldown" : "017", + "name" : "#017", "y" : 87, - "name" : "#017" + "drilldown" : "017" }, { - "drilldown" : "018", + "name" : "#018", "y" : 84, - "name" : "#018" + "drilldown" : "018" }, { "y" : 105, @@ -114,14 +104,14 @@ "drilldown" : "020" }, { + "drilldown" : "021", "y" : 74, - "name" : "#021", - "drilldown" : "021" + "name" : "#021" }, { - "drilldown" : "022", "y" : 72, - "name" : "#022" + "name" : "#022", + "drilldown" : "022" }, { "drilldown" : "023", @@ -130,13 +120,13 @@ }, { "drilldown" : "024", - "name" : "#024", - "y" : 77 + "y" : 77, + "name" : "#024" }, { + "drilldown" : "025", "y" : 62, - "name" : "#025", - "drilldown" : "025" + "name" : "#025" }, { "name" : "#026", @@ -144,8 +134,8 @@ "drilldown" : "026" }, { - "y" : 64, "name" : "#027", + "y" : 64, "drilldown" : "027" }, { @@ -154,28 +144,28 @@ "name" : "#028" }, { + "drilldown" : "029", "name" : "#029", - "y" : 83, - "drilldown" : "029" + "y" : 83 }, { - "name" : "#030", "y" : 121, + "name" : "#030", "drilldown" : "030" }, { - "name" : "#031", + "drilldown" : "031", "y" : 93, - "drilldown" : "031" + "name" : "#031" }, { - "drilldown" : "032", "name" : "#032", - "y" : 98 + "y" : 98, + "drilldown" : "032" }, { - "y" : 114, "name" : "#033", + "y" : 114, "drilldown" : "033" }, { @@ -184,44 +174,44 @@ "name" : "#034" }, { - "drilldown" : "035", + "y" : 68, "name" : "#035", - "y" : 68 + "drilldown" : "035" }, { + "drilldown" : "036", "y" : 70, - "name" : "#036", - "drilldown" : "036" + "name" : "#036" }, { - "drilldown" : "037", + "y" : 70, "name" : "#037", - "y" : 70 + "drilldown" : "037" }, { - "drilldown" : "038", "name" : "#038", - "y" : 74 + "y" : 74, + "drilldown" : "038" }, { "drilldown" : "039", - "y" : 68, - "name" : "#039" + "name" : "#039", + "y" : 68 }, { "drilldown" : "040", - "y" : 77, - "name" : "#040" + "name" : "#040", + "y" : 77 }, { - "drilldown" : "041", "name" : "#041", - "y" : 80 + "y" : 80, + "drilldown" : "041" }, { - "drilldown" : "042", "y" : 98, - "name" : "#042" + "name" : "#042", + "drilldown" : "042" }, { "y" : 72, @@ -229,44 +219,44 @@ "drilldown" : "043" }, { + "drilldown" : "044", "name" : "#044", - "y" : 90, - "drilldown" : "044" + "y" : 90 }, { - "name" : "#045", "y" : 102, + "name" : "#045", "drilldown" : "045" }, { - "drilldown" : "046", + "y" : 93, "name" : "#046", - "y" : 93 + "drilldown" : "046" }, { - "drilldown" : "047", + "y" : 88, "name" : "#047", - "y" : 88 + "drilldown" : "047" }, { "drilldown" : "048", - "y" : 112, - "name" : "#048" + "name" : "#048", + "y" : 112 }, { - "y" : 93, + "drilldown" : "049", "name" : "#049", - "drilldown" : "049" + "y" : 93 }, { "drilldown" : "050", - "y" : 104, - "name" : "#050" + "name" : "#050", + "y" : 104 }, { - "name" : "#051", + "drilldown" : "051", "y" : 95, - "drilldown" : "051" + "name" : "#051" }, { "name" : "#052", @@ -274,8 +264,8 @@ "drilldown" : "052" }, { - "y" : 105, "name" : "#053", + "y" : 105, "drilldown" : "053" }, { @@ -284,34 +274,34 @@ "y" : 107 }, { + "drilldown" : "055", "y" : 92, - "name" : "#055", - "drilldown" : "055" + "name" : "#055" }, { + "drilldown" : "056", "y" : 104, - "name" : "#056", - "drilldown" : "056" + "name" : "#056" }, { "drilldown" : "057", - "name" : "#057", - "y" : 86 + "y" : 86, + "name" : "#057" }, { - "name" : "#058", "y" : 71, + "name" : "#058", "drilldown" : "058" }, { + "drilldown" : "059", "name" : "#059", - "y" : 93, - "drilldown" : "059" + "y" : 93 }, { - "drilldown" : "060", "name" : "#060", - "y" : 89 + "y" : 89, + "drilldown" : "060" }, { "name" : "#061", @@ -319,24 +309,24 @@ "drilldown" : "061" }, { - "y" : 62, "name" : "#062", + "y" : 62, "drilldown" : "062" }, { - "name" : "#063", "y" : 93, + "name" : "#063", "drilldown" : "063" }, { - "drilldown" : "064", + "y" : 84, "name" : "#064", - "y" : 84 + "drilldown" : "064" }, { + "drilldown" : "065", "name" : "#065", - "y" : 77, - "drilldown" : "065" + "y" : 77 }, { "y" : 88, @@ -344,19 +334,19 @@ "drilldown" : "066" }, { - "drilldown" : "067", "y" : 94, - "name" : "#067" + "name" : "#067", + "drilldown" : "067" }, { - "drilldown" : "068", "y" : 79, - "name" : "#068" + "name" : "#068", + "drilldown" : "068" }, { + "drilldown" : "069", "y" : 87, - "name" : "#069", - "drilldown" : "069" + "name" : "#069" }, { "name" : "#070", @@ -365,83 +355,83 @@ }, { "drilldown" : "071", - "name" : "#071", - "y" : 82 + "y" : 82, + "name" : "#071" }, { + "drilldown" : "072", "y" : 116, - "name" : "#072", - "drilldown" : "072" + "name" : "#072" }, { - "y" : 112, "name" : "#073", + "y" : 112, "drilldown" : "073" }, { - "drilldown" : "074", "y" : 117, - "name" : "#074" + "name" : "#074", + "drilldown" : "074" }, { - "drilldown" : "075", + "name" : "#075", "y" : 117, - "name" : "#075" + "drilldown" : "075" }, { + "drilldown" : "076", "name" : "#076", - "y" : 101, - "drilldown" : "076" + "y" : 101 }, { - "drilldown" : "077", "name" : "#077", - "y" : 100 + "y" : 100, + "drilldown" : "077" }, { - "drilldown" : "078", "name" : "#078", - "y" : 127 + "y" : 127, + "drilldown" : "078" }, { - "drilldown" : "079", "y" : 122, - "name" : "#079" + "name" : "#079", + "drilldown" : "079" }, { "drilldown" : "080", - "name" : "#080", - "y" : 127 + "y" : 127, + "name" : "#080" }, { "drilldown" : "081", - "y" : 114, - "name" : "#081" + "name" : "#081", + "y" : 114 }, { - "y" : 114, + "drilldown" : "082", "name" : "#082", - "drilldown" : "082" + "y" : 114 }, { "drilldown" : "083", - "name" : "#083", - "y" : 127 + "y" : 127, + "name" : "#083" }, { - "y" : 119, + "drilldown" : "084", "name" : "#084", - "drilldown" : "084" + "y" : 119 }, { - "name" : "#085", "y" : 113, + "name" : "#085", "drilldown" : "085" }, { + "drilldown" : "086", "y" : 104, - "name" : "#086", - "drilldown" : "086" + "name" : "#086" }, { "name" : "#087", @@ -449,8 +439,8 @@ "drilldown" : "087" }, { - "name" : "#088", "y" : 121, + "name" : "#088", "drilldown" : "088" }, { @@ -459,9 +449,9 @@ "drilldown" : "089" }, { - "y" : 113, + "drilldown" : "090", "name" : "#090", - "drilldown" : "090" + "y" : 113 }, { "name" : "#091", @@ -469,19 +459,19 @@ "drilldown" : "091" }, { - "name" : "#092", + "drilldown" : "092", "y" : 98, - "drilldown" : "092" + "name" : "#092" }, { - "drilldown" : "093", "name" : "#093", - "y" : 87 + "y" : 87, + "drilldown" : "093" }, { - "drilldown" : "094", + "y" : 87, "name" : "#094", - "y" : 87 + "drilldown" : "094" }, { "y" : 108, @@ -489,24 +479,24 @@ "drilldown" : "095" }, { - "drilldown" : "096", + "name" : "#096", "y" : 108, - "name" : "#096" + "drilldown" : "096" }, { "drilldown" : "097", - "y" : 111, - "name" : "#097" + "name" : "#097", + "y" : 111 }, { - "name" : "#098", "y" : 108, + "name" : "#098", "drilldown" : "098" }, { - "drilldown" : "099", + "y" : 97, "name" : "#099", - "y" : 97 + "drilldown" : "099" }, { "y" : 120, @@ -514,19 +504,19 @@ "drilldown" : "100" }, { - "name" : "#101", "y" : 83, + "name" : "#101", "drilldown" : "101" }, { - "y" : 90, + "drilldown" : "102", "name" : "#102", - "drilldown" : "102" + "y" : 90 }, { "drilldown" : "103", - "y" : 79, - "name" : "#103" + "name" : "#103", + "y" : 79 }, { "name" : "#104", @@ -534,9 +524,9 @@ "drilldown" : "104" }, { - "drilldown" : "105", + "name" : "#105", "y" : 77, - "name" : "#105" + "drilldown" : "105" }, { "y" : 97, @@ -544,8 +534,8 @@ "drilldown" : "106" }, { - "name" : "#107", "y" : 92, + "name" : "#107", "drilldown" : "107" }, { @@ -559,9 +549,9 @@ "name" : "#109" }, { + "drilldown" : "110", "y" : 110, - "name" : "#110", - "drilldown" : "110" + "name" : "#110" }, { "drilldown" : "111", @@ -569,39 +559,39 @@ "name" : "#111" }, { + "drilldown" : "112", "name" : "#112", - "y" : 94, - "drilldown" : "112" + "y" : 94 }, { - "drilldown" : "113", + "name" : "#113", "y" : 94, - "name" : "#113" + "drilldown" : "113" }, { - "y" : 110, + "drilldown" : "114", "name" : "#114", - "drilldown" : "114" + "y" : 110 }, { + "drilldown" : "115", "y" : 98, - "name" : "#115", - "drilldown" : "115" + "name" : "#115" }, { "drilldown" : "116", - "y" : 97, - "name" : "#116" + "name" : "#116", + "y" : 97 }, { - "y" : 99, "name" : "#117", + "y" : 99, "drilldown" : "117" }, { + "drilldown" : "118", "name" : "#118", - "y" : 85, - "drilldown" : "118" + "y" : 85 }, { "drilldown" : "119", @@ -609,29 +599,29 @@ "name" : "#119" }, { + "drilldown" : "120", "y" : 116, - "name" : "#120", - "drilldown" : "120" + "name" : "#120" }, { - "drilldown" : "121", + "y" : 92, "name" : "#121", - "y" : 92 + "drilldown" : "121" }, { - "drilldown" : "122", + "y" : 110, "name" : "#122", - "y" : 110 + "drilldown" : "122" }, { + "drilldown" : "123", "name" : "#123", - "y" : 105, - "drilldown" : "123" + "y" : 105 }, { - "drilldown" : "124", "name" : "#124", - "y" : 87 + "y" : 87, + "drilldown" : "124" }, { "name" : "#125", @@ -644,14 +634,14 @@ "y" : 113 }, { + "drilldown" : "127", "y" : 115, - "name" : "#127", - "drilldown" : "127" + "name" : "#127" }, { - "name" : "#128", + "drilldown" : "128", "y" : 73, - "drilldown" : "128" + "name" : "#128" }, { "drilldown" : "129", @@ -659,69 +649,69 @@ "y" : 52 }, { - "name" : "#130", + "drilldown" : "130", "y" : 75, - "drilldown" : "130" + "name" : "#130" }, { - "name" : "#131", + "drilldown" : "131", "y" : 91, - "drilldown" : "131" + "name" : "#131" }, { - "drilldown" : "132", + "y" : 78, "name" : "#132", - "y" : 78 + "drilldown" : "132" }, { "drilldown" : "133", - "name" : "#133", - "y" : 95 + "y" : 95, + "name" : "#133" }, { - "y" : 94, "name" : "#134", + "y" : 94, "drilldown" : "134" }, { + "drilldown" : "135", "y" : 104, - "name" : "#135", - "drilldown" : "135" + "name" : "#135" }, { - "drilldown" : "136", "y" : 97, - "name" : "#136" + "name" : "#136", + "drilldown" : "136" }, { - "y" : 100, "name" : "#137", + "y" : 100, "drilldown" : "137" }, { - "name" : "#138", "y" : 102, + "name" : "#138", "drilldown" : "138" }, { "drilldown" : "139", - "y" : 97, - "name" : "#139" + "name" : "#139", + "y" : 97 }, { - "drilldown" : "140", + "name" : "#140", "y" : 103, - "name" : "#140" + "drilldown" : "140" }, { "drilldown" : "141", - "y" : 102, - "name" : "#141" + "name" : "#141", + "y" : 102 }, { - "y" : 85, + "drilldown" : "142", "name" : "#142", - "drilldown" : "142" + "y" : 85 }, { "y" : 85, @@ -734,14 +724,14 @@ "drilldown" : "144" }, { - "y" : 96, "name" : "#145", + "y" : 96, "drilldown" : "145" }, { + "drilldown" : "146", "name" : "#146", - "y" : 108, - "drilldown" : "146" + "y" : 108 }, { "drilldown" : "147", @@ -759,18 +749,18 @@ "drilldown" : "149" }, { + "drilldown" : "150", "y" : 108, - "name" : "#150", - "drilldown" : "150" + "name" : "#150" }, { + "drilldown" : "151", "name" : "#151", - "y" : 78, - "drilldown" : "151" + "y" : 78 }, { - "name" : "#152", "y" : 80, + "name" : "#152", "drilldown" : "152" }, { @@ -784,13 +774,13 @@ "y" : 108 }, { + "drilldown" : "155", "name" : "#155", - "y" : 99, - "drilldown" : "155" + "y" : 99 }, { - "name" : "#156", "y" : 98, + "name" : "#156", "drilldown" : "156" }, { @@ -799,9 +789,9 @@ "drilldown" : "157" }, { - "drilldown" : "158", "y" : 107, - "name" : "#158" + "name" : "#158", + "drilldown" : "158" }, { "drilldown" : "159", @@ -810,13 +800,13 @@ }, { "drilldown" : "160", - "y" : 121, - "name" : "#160" + "name" : "#160", + "y" : 121 }, { + "drilldown" : "161", "name" : "#161", - "y" : 102, - "drilldown" : "161" + "y" : 102 }, { "drilldown" : "162", @@ -824,23 +814,23 @@ "name" : "#162" }, { + "drilldown" : "163", "y" : 118, - "name" : "#163", - "drilldown" : "163" + "name" : "#163" }, { - "drilldown" : "164", + "y" : 120, "name" : "#164", - "y" : 120 + "drilldown" : "164" }, { - "name" : "#165", + "drilldown" : "165", "y" : 80, - "drilldown" : "165" + "name" : "#165" }, { - "y" : 81, "name" : "#166", + "y" : 81, "drilldown" : "166" }, { @@ -849,19 +839,19 @@ "y" : 75 }, { - "y" : 98, + "drilldown" : "168", "name" : "#168", - "drilldown" : "168" + "y" : 98 }, { - "y" : 107, + "drilldown" : "169", "name" : "#169", - "drilldown" : "169" + "y" : 107 }, { + "drilldown" : "170", "y" : 102, - "name" : "#170", - "drilldown" : "170" + "name" : "#170" }, { "y" : 113, @@ -874,8 +864,8 @@ "drilldown" : "172" }, { - "name" : "#173", "y" : 113, + "name" : "#173", "drilldown" : "173" }, { @@ -884,18 +874,18 @@ "name" : "#174" }, { - "drilldown" : "175", + "y" : 114, "name" : "#175", - "y" : 114 + "drilldown" : "175" }, { - "y" : 114, + "drilldown" : "176", "name" : "#176", - "drilldown" : "176" + "y" : 114 }, { - "y" : 107, "name" : "#177", + "y" : 107, "drilldown" : "177" }, { @@ -904,24 +894,24 @@ "y" : 67 }, { - "name" : "#179", + "drilldown" : "179", "y" : 74, - "drilldown" : "179" + "name" : "#179" }, { - "drilldown" : "180", "name" : "#180", - "y" : 117 + "y" : 117, + "drilldown" : "180" }, { + "drilldown" : "181", "name" : "#181", - "y" : 99, - "drilldown" : "181" + "y" : 99 }, { - "drilldown" : "182", + "name" : "#182", "y" : 112, - "name" : "#182" + "drilldown" : "182" }, { "drilldown" : "183", @@ -929,29 +919,29 @@ "name" : "#183" }, { - "name" : "#184", + "drilldown" : "184", "y" : 109, - "drilldown" : "184" + "name" : "#184" }, { - "name" : "#185", "y" : 117, + "name" : "#185", "drilldown" : "185" }, { "drilldown" : "186", - "name" : "#186", - "y" : 113 + "y" : 113, + "name" : "#186" }, { - "y" : 111, + "drilldown" : "187", "name" : "#187", - "drilldown" : "187" + "y" : 111 }, { - "drilldown" : "188", "name" : "#188", - "y" : 121 + "y" : 121, + "drilldown" : "188" }, { "drilldown" : "189", @@ -964,14 +954,14 @@ "drilldown" : "190" }, { - "drilldown" : "191", + "y" : 119, "name" : "#191", - "y" : 119 + "drilldown" : "191" }, { - "drilldown" : "192", + "y" : 129, "name" : "#192", - "y" : 129 + "drilldown" : "192" }, { "drilldown" : "193", @@ -979,44 +969,44 @@ "y" : 112 }, { - "name" : "#194", + "drilldown" : "194", "y" : 113, - "drilldown" : "194" + "name" : "#194" }, { - "name" : "#195", + "drilldown" : "195", "y" : 110, - "drilldown" : "195" + "name" : "#195" }, { + "drilldown" : "196", "y" : 104, - "name" : "#196", - "drilldown" : "196" + "name" : "#196" }, { - "name" : "#197", + "drilldown" : "197", "y" : 105, - "drilldown" : "197" + "name" : "#197" }, { - "drilldown" : "198", "name" : "#198", - "y" : 119 + "y" : 119, + "drilldown" : "198" }, { - "drilldown" : "199", + "y" : 119, "name" : "#199", - "y" : 119 + "drilldown" : "199" }, { - "name" : "#200", "y" : 118, + "name" : "#200", "drilldown" : "200" }, { "drilldown" : "201", - "y" : 111, - "name" : "#201" + "name" : "#201", + "y" : 111 }, { "y" : 103, @@ -1024,8 +1014,8 @@ "drilldown" : "202" }, { - "y" : 98, "name" : "#203", + "y" : 98, "drilldown" : "203" }, { @@ -1034,29 +1024,29 @@ "drilldown" : "204" }, { - "y" : 120, + "drilldown" : "205", "name" : "#205", - "drilldown" : "205" + "y" : 120 }, { "drilldown" : "206", - "y" : 113, - "name" : "#206" + "name" : "#206", + "y" : 113 }, { - "drilldown" : "207", + "y" : 120, "name" : "#207", - "y" : 120 + "drilldown" : "207" }, { - "name" : "#208", "y" : 117, + "name" : "#208", "drilldown" : "208" }, { - "drilldown" : "209", "name" : "#209", - "y" : 107 + "y" : 107, + "drilldown" : "209" }, { "drilldown" : "210", @@ -1064,9 +1054,9 @@ "y" : 97 }, { - "name" : "#211", + "drilldown" : "211", "y" : 111, - "drilldown" : "211" + "name" : "#211" }, { "name" : "#212", @@ -1074,34 +1064,34 @@ "drilldown" : "212" }, { - "drilldown" : "213", "y" : 100, - "name" : "#213" + "name" : "#213", + "drilldown" : "213" }, { "drilldown" : "214", - "name" : "#214", - "y" : 69 + "y" : 69, + "name" : "#214" }, { - "y" : 115, "name" : "#215", + "y" : 115, "drilldown" : "215" }, { - "name" : "#216", "y" : 89, + "name" : "#216", "drilldown" : "216" }, { - "name" : "#217", + "drilldown" : "217", "y" : 115, - "drilldown" : "217" + "name" : "#217" }, { - "drilldown" : "218", "name" : "#218", - "y" : 85 + "y" : 85, + "drilldown" : "218" }, { "drilldown" : "219", @@ -1109,9 +1099,9 @@ "y" : 85 }, { - "drilldown" : "220", "y" : 100, - "name" : "#220" + "name" : "#220", + "drilldown" : "220" }, { "drilldown" : "221", @@ -1119,28 +1109,28 @@ "y" : 86 }, { - "drilldown" : "222", "y" : 107, - "name" : "#222" + "name" : "#222", + "drilldown" : "222" }, { "drilldown" : "223", - "name" : "#223", - "y" : 87 + "y" : 87, + "name" : "#223" }, { + "drilldown" : "224", "name" : "#224", - "y" : 80, - "drilldown" : "224" + "y" : 80 }, { - "y" : 115, + "drilldown" : "225", "name" : "#225", - "drilldown" : "225" + "y" : 115 }, { - "name" : "#226", "y" : 122, + "name" : "#226", "drilldown" : "226" }, { @@ -1149,18 +1139,18 @@ "drilldown" : "227" }, { + "drilldown" : "228", "y" : 121, - "name" : "#228", - "drilldown" : "228" + "name" : "#228" }, { + "drilldown" : "229", "y" : 117, - "name" : "#229", - "drilldown" : "229" + "name" : "#229" }, { - "y" : 124, "name" : "#230", + "y" : 124, "drilldown" : "230" }, { @@ -1170,28 +1160,28 @@ }, { "drilldown" : "233", - "y" : 128, - "name" : "#233" + "name" : "#233", + "y" : 128 }, { - "drilldown" : "234", "name" : "#234", - "y" : 113 + "y" : 113, + "drilldown" : "234" }, { - "drilldown" : "235", "y" : 123, - "name" : "#235" + "name" : "#235", + "drilldown" : "235" }, { + "drilldown" : "236", "y" : 118, - "name" : "#236", - "drilldown" : "236" + "name" : "#236" }, { "drilldown" : "237", - "y" : 110, - "name" : "#237" + "name" : "#237", + "y" : 110 }, { "y" : 128, @@ -1199,34 +1189,34 @@ "drilldown" : "238" }, { - "drilldown" : "239", + "y" : 130, "name" : "#239", - "y" : 130 + "drilldown" : "239" }, { - "drilldown" : "240", + "y" : 126, "name" : "#240", - "y" : 126 + "drilldown" : "240" }, { + "drilldown" : "241", "name" : "#241", - "y" : 117, - "drilldown" : "241" + "y" : 117 }, { - "y" : 128, "name" : "#242", + "y" : 128, "drilldown" : "242" }, { + "drilldown" : "243", "name" : "#243", - "y" : 127, - "drilldown" : "243" + "y" : 127 }, { + "drilldown" : "244", "y" : 122, - "name" : "#244", - "drilldown" : "244" + "name" : "#244" }, { "name" : "#245", @@ -1239,44 +1229,44 @@ "drilldown" : "246" }, { - "drilldown" : "247", + "name" : "#247", "y" : 88, - "name" : "#247" + "drilldown" : "247" }, { - "drilldown" : "248", "y" : 110, - "name" : "#248" + "name" : "#248", + "drilldown" : "248" }, { + "drilldown" : "249", "y" : 105, - "name" : "#249", - "drilldown" : "249" + "name" : "#249" }, { - "name" : "#250", "y" : 119, + "name" : "#250", "drilldown" : "250" }, { "drilldown" : "251", - "name" : "#251", - "y" : 109 + "y" : 109, + "name" : "#251" }, { - "drilldown" : "252", "name" : "#252", - "y" : 115 + "y" : 115, + "drilldown" : "252" }, { - "y" : 111, "name" : "#253", + "y" : 111, "drilldown" : "253" }, { + "drilldown" : "254", "name" : "#254", - "y" : 114, - "drilldown" : "254" + "y" : 114 }, { "name" : "#255", @@ -1284,13 +1274,13 @@ "drilldown" : "255" }, { - "name" : "#256", "y" : 117, + "name" : "#256", "drilldown" : "256" }, { - "name" : "#257", "y" : 90, + "name" : "#257", "drilldown" : "257" }, { @@ -1299,19 +1289,19 @@ "y" : 124 }, { - "drilldown" : "259", + "y" : 82, "name" : "#259", - "y" : 82 + "drilldown" : "259" }, { + "drilldown" : "260", "y" : 105, - "name" : "#260", - "drilldown" : "260" + "name" : "#260" }, { + "drilldown" : "261", "y" : 112, - "name" : "#261", - "drilldown" : "261" + "name" : "#261" }, { "y" : 118, @@ -1319,49 +1309,49 @@ "drilldown" : "262" }, { - "y" : 123, "name" : "#263", + "y" : 123, "drilldown" : "263" }, { - "drilldown" : "264", + "y" : 110, "name" : "#264", - "y" : 110 + "drilldown" : "264" }, { "drilldown" : "265", - "name" : "#265", - "y" : 112 + "y" : 112, + "name" : "#265" }, { - "drilldown" : "266", + "name" : "#266", "y" : 108, - "name" : "#266" + "drilldown" : "266" }, { + "drilldown" : "267", "y" : 101, - "name" : "#267", - "drilldown" : "267" + "name" : "#267" }, { "drilldown" : "268", - "y" : 105, - "name" : "#268" + "name" : "#268", + "y" : 105 }, { + "drilldown" : "269", "name" : "#269", - "y" : 98, - "drilldown" : "269" + "y" : 98 }, { - "y" : 87, + "drilldown" : "270", "name" : "#270", - "drilldown" : "270" + "y" : 87 }, { - "y" : 106, + "drilldown" : "271", "name" : "#271", - "drilldown" : "271" + "y" : 106 }, { "y" : 110, @@ -1369,47 +1359,43 @@ "drilldown" : "272" }, { - "name" : "#273", "y" : 122, + "name" : "#273", "drilldown" : "273" }, { -