aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad S Anwar <mohammad.anwar@yahoo.com>2023-07-26 23:16:10 +0100
committerMohammad S Anwar <mohammad.anwar@yahoo.com>2023-07-26 23:16:10 +0100
commitf84f38be0e67c61c44fa0769b00e53124d1bdde0 (patch)
treeca3c2b5f833306b7d3b14abb77fda783cdf998cf
parent6a31bf4676dcb9f83b0ef2d91407301686ed0cd8 (diff)
downloadperlweeklychallenge-club-f84f38be0e67c61c44fa0769b00e53124d1bdde0.tar.gz
perlweeklychallenge-club-f84f38be0e67c61c44fa0769b00e53124d1bdde0.tar.bz2
perlweeklychallenge-club-f84f38be0e67c61c44fa0769b00e53124d1bdde0.zip
- Added solutions by Arne Sommer.
- Added solutions by Laurent Rosenfeld.
-rw-r--r--challenge-227/laurent-rosenfeld/blog1.txt1
-rw-r--r--challenge-227/laurent-rosenfeld/perl/ch-2.pl63
-rw-r--r--challenge-227/laurent-rosenfeld/raku/ch-2.raku57
-rw-r--r--stats/pwc-current.json319
-rw-r--r--stats/pwc-language-breakdown-summary.json84
-rw-r--r--stats/pwc-language-breakdown.json1438
-rw-r--r--stats/pwc-leaders.json400
-rw-r--r--stats/pwc-summary-1-30.json28
-rw-r--r--stats/pwc-summary-121-150.json112
-rw-r--r--stats/pwc-summary-151-180.json48
-rw-r--r--stats/pwc-summary-181-210.json108
-rw-r--r--stats/pwc-summary-211-240.json56
-rw-r--r--stats/pwc-summary-241-270.json20
-rw-r--r--stats/pwc-summary-271-300.json38
-rw-r--r--stats/pwc-summary-31-60.json58
-rw-r--r--stats/pwc-summary-61-90.json42
-rw-r--r--stats/pwc-summary-91-120.json24
-rw-r--r--stats/pwc-summary.json50
18 files changed, 1543 insertions, 1403 deletions
diff --git a/challenge-227/laurent-rosenfeld/blog1.txt b/challenge-227/laurent-rosenfeld/blog1.txt
new file mode 100644
index 0000000000..66db4bdf8e
--- /dev/null
+++ b/challenge-227/laurent-rosenfeld/blog1.txt
@@ -0,0 +1 @@
+https://blogs.perl.org/users/laurent_r/2023/07/perl-weekly-challenge-227-roman-maths.html
diff --git a/challenge-227/laurent-rosenfeld/perl/ch-2.pl b/challenge-227/laurent-rosenfeld/perl/ch-2.pl
new file mode 100644
index 0000000000..26470af669
--- /dev/null
+++ b/challenge-227/laurent-rosenfeld/perl/ch-2.pl
@@ -0,0 +1,63 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use feature qw/say/;
+
+my %rom_tab = (I => 1, V => 5, X => 10, L => 50,
+ C => 100, D => 500, M => 1000,
+ IV => 4, IX => 9, XL => 40, XC => 90,
+ CD => 400, CM => 900);
+
+sub from_roman {
+ my $roman = uc shift;
+ my $arabic = 0;
+ my $prev_letter = "M";
+ for my $letter (split //, $roman) {
+ $arabic -= 2 * $rom_tab{$prev_letter}
+ if $rom_tab{$letter} > $rom_tab{$prev_letter};
+ $arabic += $rom_tab{$letter};
+ $prev_letter = $letter;
+ }
+ return $arabic;
+}
+
+sub to_roman {
+ my $arabic = shift;
+ warn "$arabic out of bounds"
+ unless $arabic > 0 and $arabic < 4000;
+ my $roman = "";
+ for my $key (sort { $rom_tab{$b} <=> $rom_tab{$a} }
+ keys %rom_tab) {
+ my $num = int ($arabic / $rom_tab{$key});
+ $roman .= $key x $num;
+ $arabic -= $rom_tab{$key} * $num;
+ }
+ return $roman;
+}
+sub process_input {
+ my ($rom1, $op, $rom2) = split /\s+/, $_[0];
+ my $arabic1 = from_roman $rom1;
+ my $arabic2 = from_roman $rom2;
+ my $result = $op eq '+' ? $arabic1 + $arabic2 :
+ $op eq '-' ? $arabic1 - $arabic2 :
+ $op eq '/' ? $arabic1 / $arabic2 :
+ $op eq '*' ? $arabic1 * $arabic2 :
+ $op eq '**' ? $arabic1 ** $arabic2:
+ "illegal";
+ return "nulla (they didn't have a symbol for 0)"
+ if $result == 0;
+ return "non potest (they didn't do fractions)"
+ if int($result) != $result;
+ return "non potest (they only went up to 3999)"
+ if $result >= 4000;
+ return "non potest (no negative numbers)"
+ if $result < 0;
+ return to_roman $result;
+}
+
+for my $test ("IV + V", "M - I", "X / II", "XI * VI",
+ "VII ** III", "V - V", "V / II", "MMM + M",
+ "V - X ", "X - V") {
+ printf "%-10s => ", $test;
+ say process_input $test;
+}
diff --git a/challenge-227/laurent-rosenfeld/raku/ch-2.raku b/challenge-227/laurent-rosenfeld/raku/ch-2.raku
new file mode 100644
index 0000000000..94456d0776
--- /dev/null
+++ b/challenge-227/laurent-rosenfeld/raku/ch-2.raku
@@ -0,0 +1,57 @@
+subset Roman-str of Str where $_ ~~ /^<[IVXLCDMivxlcdm]>+$/;
+
+my %rom-tab = < I 1 V 5 X 10 L 50 C 100 D 500 M 1000
+ IV 4 IX 9 XL 40 XC 90 CD 400 CM 900 >;
+my @ordered_romans = reverse sort { %rom-tab{$_} }, keys %rom-tab;
+
+sub from-roman (Roman-str $roman) {
+ my $numeric = 0;
+ my $prev_letter = "M";
+ for $roman.uc.comb -> $letter {
+ $numeric -= 2 * %rom-tab{$prev_letter}
+ if %rom-tab{$letter} > %rom-tab{$prev_letter};
+ $numeric += %rom-tab{$letter};
+ # say "$letter $numeric";
+ $prev_letter = $letter;
+ }
+ return $numeric;
+}
+
+sub to-roman (Int $arabic is copy where { 0 < $_ < 4000 }) {
+ my $roman = "";
+ for @ordered_romans -> $key {
+ my $num = ($arabic / %rom-tab{$key}).Int;
+ $roman ~= $key x $num;
+ $arabic -= %rom-tab{$key} * $num;
+ }
+ return $roman;
+}
+sub process-input (Str $in) {
+ my ($rom1, $op, $rom2) = split /\s+/, $in;
+ my $arabic1 = from-roman $rom1;
+ my $arabic2 = from-roman $rom2;
+ my $result;
+ given $op {
+ when '+' { $result = $arabic1 + $arabic2 }
+ when '-' { $result = $arabic1 - $arabic2 }
+ when '*' { $result = $arabic1 * $arabic2 }
+ when '/' { $result = $arabic1 / $arabic2 }
+ when '**' { $result = $arabic1 ** $arabic2 }
+ }
+ return "nulla (they didn't have a symbol for 0)"
+ if $result == 0;
+ return "non potest (they didn't do fractions)"
+ if $result.round != $result;
+ return "non potest (they only went up to 3999)"
+ if $result >= 4000;
+ return "non potest (no negative numbers)"
+ if $result < 0;
+ return to-roman $result.round;
+}
+
+for "IV + V", "M - I", "X / II", "XI * VI",
+ "VII ** III", "V - V", "V / II", "MMM + M",
+ "V - X ", "X - V" -> $test-expr {
+ printf "%-10s => ", $test-expr;
+ say process-input $test-expr;
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index 8321e97aba..2651e7b38d 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,128 +1,8 @@
{
- "series" : [
- {
- "colorByPoint" : 1,
- "name" : "The Weekly Challenge - 227",
- "data" : [
- {
- "name" : "Ali Moradi",
- "drilldown" : "Ali Moradi",
- "y" : 3
- },
- {
- "drilldown" : "Andrew Shitov",
- "name" : "Andrew Shitov",
- "y" : 4
- },
- {
- "drilldown" : "David Ferrone",
- "name" : "David Ferrone",
- "y" : 1
- },
- {
- "drilldown" : "E. Choroba",
- "name" : "E. Choroba",
- "y" : 2
- },
- {
- "name" : "Laurent Rosenfeld",
- "drilldown" : "Laurent Rosenfeld",
- "y" : 3
- },
- {
- "y" : 8,
- "name" : "Luca Ferrari",
- "drilldown" : "Luca Ferrari"
- },
- {
- "y" : 2,
- "drilldown" : "Mark Anderson",
- "name" : "Mark Anderson"
- },
- {
- "name" : "Peter Campbell Smith",
- "drilldown" : "Peter Campbell Smith",
- "y" : 3
- },
- {
- "drilldown" : "Peter Meszaros",
- "name" : "Peter Meszaros",
- "y" : 2
- },
- {
- "y" : 3,
- "name" : "Robbie Hatley",
- "drilldown" : "Robbie Hatley"
- },
- {
- "y" : 4,
- "name" : "Robert DiCicco",
- "drilldown" : "Robert DiCicco"
- },
- {
- "y" : 4,
- "drilldown" : "Roger Bell_West",
- "name" : "Roger Bell_West"
- },
- {
- "drilldown" : "Simon Proctor",
- "name" : "Simon Proctor",
- "y" : 1
- },
- {
- "y" : 1,
- "drilldown" : "Steven Wilson",
- "name" : "Steven Wilson"
- },
- {
- "y" : 4,
- "name" : "Thomas Kohler",
- "drilldown" : "Thomas Kohler"
- },
- {
- "name" : "W. Luis Mochan",
- "drilldown" : "W. Luis Mochan",
- "y" : 3
- }
- ]
- }
- ],
- "legend" : {
- "enabled" : 0
- },
- "subtitle" : {
- "text" : "[Champions: 16] Last updated at 2023-07-26 18:01:07 GMT"
- },
- "plotOptions" : {
- "series" : {
- "dataLabels" : {
- "format" : "{point.y}",
- "enabled" : 1
- },
- "borderWidth" : 0
- }
- },
- "title" : {
- "text" : "The Weekly Challenge - 227"
- },
- "chart" : {
- "type" : "column"
- },
- "yAxis" : {
- "title" : {
- "text" : "Total Solutions"
- }
- },
- "tooltip" : {
- "followPointer" : 1,
- "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>",
- "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>"
- },
"drilldown" : {
"series" : [
{
"id" : "Ali Moradi",
- "name" : "Ali Moradi",
"data" : [
[
"Perl",
@@ -132,7 +12,8 @@
"Blog",
1
]
- ]
+ ],
+ "name" : "Ali Moradi"
},
{
"data" : [
@@ -141,49 +22,62 @@
4
]
],
- "name" : "Andrew Shitov",
- "id" : "Andrew Shitov"
+ "id" : "Andrew Shitov",
+ "name" : "Andrew Shitov"
+ },
+ {
+ "data" : [
+ [
+ "Raku",
+ 2
+ ],
+ [
+ "Blog",
+ 1
+ ]
+ ],
+ "id" : "Arne Sommer",
+ "name" : "Arne Sommer"
},
{
- "name" : "David Ferrone",
"data" : [
[
"Perl",
1
]
],
- "id" : "David Ferrone"
+ "id" : "David Ferrone",
+ "name" : "David Ferrone"
},
{
- "id" : "E. Choroba",
+ "name" : "E. Choroba",
"data" : [
[
"Perl",
2
]
],
- "name" : "E. Choroba"
+ "id" : "E. Choroba"
},
{
- "name" : "Laurent Rosenfeld",
"data" : [
[
"Perl",
- 1
+ 2
],
[
"Raku",
- 1
+ 2
],
[
"Blog",
- 1
+ 2
]
],
- "id" : "Laurent Rosenfeld"
+ "id" : "Laurent Rosenfeld",
+ "name" : "Laurent Rosenfeld"
},
{
- "id" : "Luca Ferrari",
"name" : "Luca Ferrari",
"data" : [
[
@@ -194,7 +88,8 @@
"Blog",
6
]
- ]
+ ],
+ "id" : "Luca Ferrari"
},
{
"id" : "Mark Anderson",
@@ -207,8 +102,6 @@
"name" : "Mark Anderson"
},
{
- "id" : "Peter Campbell Smith",
- "name" : "Peter Campbell Smith",
"data" : [
[
"Perl",
@@ -218,11 +111,13 @@
"Blog",
1
]
- ]
+ ],
+ "id" : "Peter Campbell Smith",
+ "name" : "Peter Campbell Smith"
},
{
- "id" : "Peter Meszaros",
"name" : "Peter Meszaros",
+ "id" : "Peter Meszaros",
"data" : [
[
"Perl",
@@ -231,7 +126,7 @@
]
},
{
- "name" : "Robbie Hatley",
+ "id" : "Robbie Hatley",
"data" : [
[
"Perl",
@@ -242,7 +137,7 @@
1
]
],
- "id" : "Robbie Hatley"
+ "name" : "Robbie Hatley"
},
{
"id" : "Robert DiCicco",
@@ -259,6 +154,7 @@
"name" : "Robert DiCicco"
},
{
+ "name" : "Roger Bell_West",
"id" : "Roger Bell_West",
"data" : [
[
@@ -269,31 +165,30 @@
"Raku",
2
]
- ],
- "name" : "Roger Bell_West"
+ ]
},
{
- "id" : "Simon Proctor",
- "name" : "Simon Proctor",
"data" : [
[
"Raku",
1
]
- ]
+ ],
+ "id" : "Simon Proctor",
+ "name" : "Simon Proctor"
},
{
- "id" : "Steven Wilson",
"name" : "Steven Wilson",
"data" : [
[
"Perl",
1
]
- ]
+ ],
+ "id" : "Steven Wilson"
},
{
- "name" : "Thomas Kohler",
+ "id" : "Thomas Kohler",
"data" : [
[
"Perl",
@@ -304,9 +199,10 @@
2
]
],
- "id" : "Thomas Kohler"
+ "name" : "Thomas Kohler"
},
{
+ "name" : "W. Luis Mochan",
"data" : [
[
"Perl",
@@ -317,12 +213,135 @@
1
]
],
- "name" : "W. Luis Mochan",
"id" : "W. Luis Mochan"
}
]
},
+ "plotOptions" : {
+ "series" : {
+ "borderWidth" : 0,
+ "dataLabels" : {
+ "format" : "{point.y}",
+ "enabled" : 1
+ }
+ }
+ },
+ "series" : [
+ {
+ "name" : "The Weekly Challenge - 227",
+ "colorByPoint" : 1,
+ "data" : [
+ {
+ "name" : "Ali Moradi",
+ "drilldown" : "Ali Moradi",
+ "y" : 3
+ },
+ {
+ "y" : 4,
+ "name" : "Andrew Shitov",
+ "drilldown" : "Andrew Shitov"
+ },
+ {
+ "name" : "Arne Sommer",
+ "drilldown" : "Arne Sommer",
+ "y" : 3
+ },
+ {
+ "y" : 1,
+ "name" : "David Ferrone",
+ "drilldown" : "David Ferrone"
+ },
+ {
+ "y" : 2,
+ "drilldown" : "E. Choroba",
+ "name" : "E. Choroba"
+ },
+ {
+ "y" : 6,
+ "name" : "Laurent Rosenfeld",
+ "drilldown" : "Laurent Rosenfeld"
+ },
+ {
+ "y" : 8,
+ "name" : "Luca Ferrari",
+ "drilldown" : "Luca Ferrari"
+ },
+ {
+ "name" : "Mark Anderson",
+ "drilldown" : "Mark Anderson",
+ "y" : 2
+ },
+ {
+ "y" : 3,
+ "name" : "Peter Campbell Smith",
+ "drilldown" : "Peter Campbell Smith"
+ },
+ {
+ "y" : 2,
+ "name" : "Peter Meszaros",
+ "drilldown" : "Peter Meszaros"
+ },
+ {
+ "y" : 3,
+ "name" : "Robbie Hatley",
+ "drilldown" : "Robbie Hatley"
+ },
+ {
+ "drilldown" : "Robert DiCicco",
+ "name" : "Robert DiCicco",
+ "y" : 4
+ },
+ {
+ "name" : "Roger Bell_West",
+ "drilldown" : "Roger Bell_West",
+ "y" : 4
+ },
+ {
+ "y" : 1,
+ "drilldown" : "Simon Proctor",
+ "name" : "Simon Proctor"
+ },
+ {
+ "y" : 1,
+ "name" : "Steven Wilson",
+ "drilldown" : "Steven Wilson"
+ },
+ {
+ "y" : 4,
+ "drilldown" : "Thomas Kohler",
+ "name" : "Thomas Kohler"
+ },
+ {
+ "y" : 3,
+ "drilldown" : "W. Luis Mochan",
+ "name" : "W. Luis Mochan"
+ }
+ ]
+ }
+ ],
+ "tooltip" : {
+ "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>",
+ "followPointer" : 1,
+ "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>"
+ },
+ "title" : {
+ "text" : "The Weekly Challenge - 227"
+ },
+ "chart" : {
+ "type" : "column"
+ },
+ "yAxis" : {
+ "title" : {
+ "text" : "Total Solutions"
+ }
+ },
+ "subtitle" : {
+ "text" : "[Champions: 17] Last updated at 2023-07-26 22:11:56 GMT"
+ },
"xAxis" : {
"type" : "category"
+ },
+ "legend" : {
+ "enabled" : 0
}
}
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index 4728be6ae6..7756a40cbd 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,55 +1,21 @@
{
- "series" : [
- {
- "data" : [
- [
- "Blog",
- 3776
- ],
- [
- "Perl",
- 11602
- ],
- [
- "Raku",
- 6676
- ]
- ],
- "name" : "Contributions",
- "dataLabels" : {
- "style" : {
- "fontSize" : "13px",
- "fontFamily" : "Verdana, sans-serif"
- },
- "enabled" : "true",
- "y" : 10,
- "format" : "{point.y:.0f}",
- "align" : "right",
- "rotation" : -90,
- "color" : "#FFFFFF"
- }
- }
- ],
- "legend" : {
- "enabled" : "false"
- },
"subtitle" : {
- "text" : "Last updated at 2023-07-26 18:01:07 GMT"
+ "text" : "Last updated at 2023-07-26 22:11:55 GMT"
},
"title" : {
"text" : "The Weekly Challenge Contributions [2019 - 2023]"
},
+ "chart" : {
+ "type" : "column"
+ },
"yAxis" : {
+ "min" : 0,
"title" : {
"text" : null
- },
- "min" : 0
- },
- "chart" : {
- "type" : "column"
+ }
},
- "tooltip" : {
- "pointFormat" : "<b>{point.y:.0f}</b>"
+ "legend" : {
+ "enabled" : "false"
},
"xAxis" : {
"type" : "category",
@@ -59,5 +25,39 @@
"fontFamily" : "Verdana, sans-serif"
}
}
+ },
+ "series" : [
+ {
+ "name" : "Contributions",
+ "dataLabels" : {
+ "color" : "#FFFFFF",
+ "align" : "right",
+ "y" : 10,
+ "style" : {
+ "fontFamily" : "Verdana, sans-serif",
+ "fontSize" : "13px"
+ },
+ "enabled" : "true",
+ "format" : "{point.y:.0f}",
+ "rotation" : -90
+ },
+ "data" : [
+ [
+ "Blog",
+ 3778
+ ],
+ [
+ "Perl",
+ 11603
+ ],
+ [
+ "Raku",
+ 6679
+ ]
+ ]
+ }
+ ],
+ "tooltip" : {
+ "pointFormat" : "<b>{point.y:.0f}</b>"
}
}
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index 5b4233d22d..26be3f6c8b 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,64 +1,77 @@
{
+ "legend" : {
+ "enabled" : "false"
+ },
+ "xAxis" : {
+ "type" : "category"
+ },
"subtitle" : {
- "text" : "Click the columns to drilldown the language breakdown. Last updated at 2023-07-26 18:01:07 GMT"
+ "text" : "Click the columns to drilldown the language breakdown. Last updated at 2023-07-26 22:11:56 GMT"
},
- "plotOptions" : {
- "series" : {
- "borderWidth" : 0,
- "dataLabels" : {
- "enabled" : 1,
- "format" : "{point.y}"
- }
+ "yAxis" : {
+ "title" : {
+ "text" : "Total Solutions"
}
},
+ "chart" : {
+ "type" : "column"
+ },
+ "title" : {
+ "text" : "The Weekly Challenge Language"
+ },
+ "tooltip" : {
+ "headerFormat" : "<span style=\"font-size:11px\"></span>",
+ "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>",
+ "followPointer" : "true"
+ },
"series" : [
{
- "name" : "The Weekly Challenge Languages",
+ "colorByPoint" : "true",
"data" : [
{
+ "y" : 163,
"drilldown" : "001",
- "name" : "#001",
- "y" : 163
+ "name" : "#001"
},
{
+ "y" : 129,
"drilldown" : "002",
- "name" : "#002",
- "y" : 129
+ "name" : "#002"
},
{
+ "y" : 87,
"name" : "#003",
- "drilldown" : "003",
- "y" : 87
+ "drilldown" : "003"
},
{
"y" : 103,
- "name" : "#004",
- "drilldown" : "004"
+ "drilldown" : "004",
+ "name" : "#004"
},
{
- "y" : 80,
"drilldown" : "005",
- "name" : "#005"
+ "name" : "#005",
+ "y" : 80
},
{
- "drilldown" : "006",
+ "y" : 61,
"name" : "#006",
- "y" : 61
+ "drilldown" : "006"
},
{
- "y" : 69,
"drilldown" : "007",
- "name" : "#007"
+ "name" : "#007",
+ "y" : 69
},
{
- "drilldown" : "008",
+ "y" : 82,
"name" : "#008",
- "y" : 82
+ "drilldown" : "008"
},
{
- "y" : 80,
+ "drilldown" : "009",
"name" : "#009",
- "drilldown" : "009"
+ "y" : 80
},
{
"drilldown" : "010",
@@ -66,9 +79,9 @@
"y" : 69
},
{
- "y" : 89,
"name" : "#011",
- "drilldown" : "011"
+ "drilldown" : "011",
+ "y" : 89
},
{
"y" : 92,
@@ -81,19 +94,19 @@
"drilldown" : "013"
},
{
- "drilldown" : "014",
"name" : "#014",
+ "drilldown" : "014",
"y" : 102
},
{
- "y" : 101,
+ "drilldown" : "015",
"name" : "#015",
- "drilldown" : "015"
+ "y" : 101
},
{
- "drilldown" : "016",
+ "y" : 75,
"name" : "#016",
- "y" : 75
+ "drilldown" : "016"
},
{
"y" : 86,
@@ -101,14 +114,14 @@
"drilldown" : "017"
},
{
- "name" : "#018",
"drilldown" : "018",
+ "name" : "#018",
"y" : 83
},
{
- "y" : 105,
+ "name" : "#019",
"drilldown" : "019",
- "name" : "#019"
+ "y" : 105
},
{
"y" : 103,
@@ -121,14 +134,14 @@
"drilldown" : "021"
},
{
+ "y" : 72,
"drilldown" : "022",
- "name" : "#022",
- "y" : 72
+ "name" : "#022"
},
{
+ "y" : 101,
"drilldown" : "023",
- "name" : "#023",
- "y" : 101
+ "name" : "#023"
},
{
"name" : "#024",
@@ -141,9 +154,9 @@
"drilldown" : "025"
},
{
+ "y" : 76,
"name" : "#026",
- "drilldown" : "026",
- "y" : 76
+ "drilldown" : "026"
},
{
"y" : 64,
@@ -151,14 +164,14 @@
"drilldown" : "027"
},
{
- "y" : 82,
+ "name" : "#028",
"drilldown" : "028",
- "name" : "#028"
+ "y" : 82
},
{
+ "y" : 83,
"drilldown" : "029",
- "name" : "#029",
- "y" : 83
+ "name" : "#029"
},
{
"drilldown" : "030",
@@ -166,9 +179,9 @@
"y" : 121
},
{
- "drilldown" : "031",
+ "y" : 93,
"name" : "#031",
- "y" : 93
+ "drilldown" : "031"
},
{
"y" : 98,
@@ -182,23 +195,23 @@
},
{
"y" : 70,
- "name" : "#034",
- "drilldown" : "034"
+ "drilldown" : "034",
+ "name" : "#034"
},
{
- "y" : 68,
"name" : "#035",
- "drilldown" : "035"
+ "drilldown" : "035",
+ "y" : 68
},
{
- "drilldown" : "036",
"name" : "#036",
+ "drilldown" : "036",
"y" : 70
},
{
- "name" : "#037",
+ "y" : 70,
"drilldown" : "037",
- "y" : 70
+ "name" : "#037"
},
{
"y" : 74,
@@ -206,34 +219,34 @@
"name" : "#038"
},
{
- "y" : 68,
"name" : "#039",
- "drilldown" : "039"
+ "drilldown" : "039",
+ "y" : 68
},
{
"y" : 77,
- "name" : "#040",
- "drilldown" : "040"
+ "drilldown" : "040",
+ "name" : "#040"
},
{
- "y" : 80,
"drilldown" : "041",
- "name" : "#041"
+ "name" : "#041",
+ "y" : 80
},
{
+ "y" : 98,
"name" : "#042",
- "drilldown" : "042",
- "y" : 98
+ "drilldown" : "042"
},
{
- "y" : 72,
+ "drilldown" : "043",
"name" : "#043",
- "drilldown" : "043"
+ "y" : 72
},
{
- "y" : 90,
"drilldown" : "044",
- "name" : "#044"
+ "name" : "#044",
+ "y" : 90
},
{
"y" : 102,
@@ -252,12 +265,12 @@
},
{
"y" : 112,
- "name" : "#048",