- Added Raku solutions to the Challenge #067.

15 files changed, 1326 insertions, 1187 deletions

diff --git a/challenge-067/mohammad-anwar/raku/ch-1.raku b/challenge-067/mohammad-anwar/raku/ch-1.raku
new file mode 100644
index 0000000000..a0fb9c225a
--- /dev/null
+++ b/challenge-067/mohammad-anwar/raku/ch-1.raku
@@ -0,0 +1,26 @@
+#!/usr/bin/env raku
+
+#
+# Perl Weekly Challenge - 067
+#
+# Task #1: Number Combinations
+#
+# https://perlweeklychallenge.org/blog/perl-weekly-challenge-067/
+#
+
+use v6.d;
+
+sub MAIN(Int :$m where { $m > 0 } = 5, Int :$n where { $n > 0 } = 2) {
+    number-combinations($m, $n).say;
+}
+
+sub number-combinations(Int $m where { $m > 0 },
+                        Int $n where { $n > 0 }) {
+    $n > $m and say "ERROR: Invalid n=$n (n <= m)" and exit;
+
+    return sprintf("[ %s ]",
+           (1..$m)
+           .combinations($n)
+           .map({ '['~$_.join(',')~']' })
+           .join(', '));
+}
diff --git a/challenge-067/mohammad-anwar/raku/ch-1a.raku b/challenge-067/mohammad-anwar/raku/ch-1a.raku
new file mode 100644
index 0000000000..6694b8d44c
--- /dev/null
+++ b/challenge-067/mohammad-anwar/raku/ch-1a.raku
@@ -0,0 +1,37 @@
+#!/usr/bin/env raku
+
+#
+# Perl Weekly Challenge - 067
+#
+# Task #1: Number Combinations
+#
+# https://perlweeklychallenge.org/blog/perl-weekly-challenge-067/
+#
+
+use Test;
+
+is number-combinations(5, 2),
+   '[ [1, 2], [1, 3], [1, 4], [1, 5], [2, 3], [2, 4], [2, 5], [3, 4], [3, 5], [4, 5] ]',
+          'testing m=5, n=2';
+is number-combinations(5, 3),
+   '[ [1, 2, 3], [1, 2, 4], [1, 2, 5], [1, 3, 4], [1, 3, 5], [1, 4, 5], [2, 3, 4], [2, 3, 5], [2, 4, 5], [3, 4, 5] ]',
+   'testing m=5, n=3';
+is number-combinations(5, 4),
+   '[ [1, 2, 3, 4], [1, 2, 3, 5], [1, 2, 4, 5], [1, 3, 4, 5], [2, 3, 4, 5] ]',
+   'testing m=5, n=4';
+is number-combinations(5, 5),
+   '[ [1, 2, 3, 4, 5] ]',
+   'testing m=5, n=5';
+
+done-testing;
+
+sub number-combinations(Int $m where { $m > 0 },
+                        Int $n where { $n > 0 }) {
+    $n > $m and say "ERROR: Invalid n=$n (n <= m)" and exit;
+
+    return sprintf("[ %s ]",
+           (1..$m)
+           .combinations($n)
+           .map({ '['~$_.join(', ')~']' })
+           .join(', '));
+}
diff --git a/challenge-067/mohammad-anwar/raku/ch-2.raku b/challenge-067/mohammad-anwar/raku/ch-2.raku
new file mode 100644
index 0000000000..0204f3b869
--- /dev/null
+++ b/challenge-067/mohammad-anwar/raku/ch-2.raku
@@ -0,0 +1,32 @@
+#!/usr/bin/env raku
+
+use v6.d;
+
+sub MAIN(Str :$digits where { $digits ~~ /^ <[0..9\*\#]>+ $/ } = '35') {
+    say sprintf("[ %s ]", phone-letters($digits).join(", "));
+}
+
+sub phone-letters(Str $digits where { $digits ~~ /^ <[0..9\*\#]>+ $/ }) {
+
+    # letter phone
+    my %letter-of = (
+        '1' => '_,@',
+        '2' => 'abc',
+        '3' => 'def',
+        '4' => 'ghi',
+        '5' => 'jlk',
+        '6' => 'mno',
+        '7' => 'pqrs',
+        '8' => 'tuv',
+        '9' => 'wxyz',
+        '0' => '0',
+        '#' => '#',
+        '*' => chr(9251),
+    );
+
+    # prepare data set
+    my @data = $digits.comb.map({ [ %letter-of{$_}.comb ] });
+
+    # generate all possible combinations
+    return map {qq{'$_'}}, ([X~] @data);
+}
diff --git a/challenge-067/mohammad-anwar/raku/ch-2a.raku b/challenge-067/mohammad-anwar/raku/ch-2a.raku
new file mode 100644
index 0000000000..bd28c7ac7d
--- /dev/null
+++ b/challenge-067/mohammad-anwar/raku/ch-2a.raku
@@ -0,0 +1,40 @@
+#!/usr/bin/env raku
+
+use Test;
+
+is sprintf("[ %s ]", phone-letters('35').join(", ")),
+   "[ 'dj', 'dl', 'dk', 'ej', 'el', 'ek', 'fj', 'fl', 'fk' ]",
+   'testing "35"';
+is sprintf("[ %s ]", phone-letters('10').join(", ")),
+   "[ '_0', ',0', '@0' ]",
+   'testing "10"';
+is sprintf("[ %s ]", phone-letters('2#').join(", ")),
+   "[ 'a#', 'b#', 'c#' ]",
+   'testing "2#"';
+
+done-testing;
+
+sub phone-letters(Str $digits where { $digits ~~ /^ <[0..9\*\#]>+ $/ }) {
+
+    # letter phone
+    my %letter-of = (
+        '1' => '_,@',
+        '2' => 'abc',
+        '3' => 'def',
+        '4' => 'ghi',
+        '5' => 'jlk',
+        '6' => 'mno',
+        '7' => 'pqrs',
+        '8' => 'tuv',
+        '9' => 'wxyz',
+        '0' => '0',
+        '#' => '#',
+        '*' => chr(9251),
+    );
+
+    # prepare data set
+    my @data = $digits.comb.map({ [ %letter-of{$_}.comb ] });
+
+    # generate all possible combinations
+    return map {qq{'$_'}}, ([X~] @data);
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index 5e55b75934..1220bd33cb 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,46 +1,47 @@
 {
-   "xAxis" : {
-      "type" : "category"
+   "plotOptions" : {
+      "series" : {
+         "dataLabels" : {
+            "enabled" : 1,
+            "format" : "{point.y}"
+         },
+         "borderWidth" : 0
+      }
    },
-   "legend" : {
-      "enabled" : 0
+   "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/>"
    },
    "chart" : {
       "type" : "column"
    },
-   "tooltip" : {
-      "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>",
-      "followPointer" : 1,
-      "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>"
-   },
    "series" : [
       {
-         "colorByPoint" : 1,
-         "name" : "Perl Weekly Challenge - 067",
          "data" : [
             {
+               "name" : "Andrew Shitov",
                "drilldown" : "Andrew Shitov",
-               "y" : 2,
-               "name" : "Andrew Shitov"
+               "y" : 2
             },
             {
-               "y" : 5,
+               "name" : "Arne Sommer",
                "drilldown" : "Arne Sommer",
-               "name" : "Arne Sommer"
+               "y" : 5
             },
             {
+               "name" : "Athanasius",
                "drilldown" : "Athanasius",
-               "y" : 4,
-               "name" : "Athanasius"
+               "y" : 4
             },
             {
                "drilldown" : "Chenyf",
-               "y" : 2,
-               "name" : "Chenyf"
+               "name" : "Chenyf",
+               "y" : 2
             },
             {
-               "drilldown" : "Dave Jacoby",
                "y" : 2,
+               "drilldown" : "Dave Jacoby",
                "name" : "Dave Jacoby"
             },
             {
@@ -50,107 +51,110 @@
             },
             {
                "name" : "E. Choroba",
-               "y" : 2,
-               "drilldown" : "E. Choroba"
+               "drilldown" : "E. Choroba",
+               "y" : 2
             },
             {
                "y" : 5,
-               "drilldown" : "Javier Luque",
-               "name" : "Javier Luque"
+               "name" : "Javier Luque",
+               "drilldown" : "Javier Luque"
             },
             {
-               "y" : 2,
                "drilldown" : "Jorg Sommrey",
-               "name" : "Jorg Sommrey"
+               "name" : "Jorg Sommrey",
+               "y" : 2
             },
             {
+               "drilldown" : "Leo Manfredi",
                "name" : "Leo Manfredi",
-               "y" : 1,
-               "drilldown" : "Leo Manfredi"
+               "y" : 1
             },
             {
-               "name" : "Luca Ferrari",
                "y" : 4,
-               "drilldown" : "Luca Ferrari"
+               "drilldown" : "Luca Ferrari",
+               "name" : "Luca Ferrari"
             },
             {
-               "y" : 2,
+               "name" : "Mark Anderson",
                "drilldown" : "Mark Anderson",
-               "name" : "Mark Anderson"
+               "y" : 2
             },
             {
-               "drilldown" : "Mohammad S Anwar",
-               "y" : 2,
-               "name" : "Mohammad S Anwar"
+               "y" : 4,
+               "name" : "Mohammad S Anwar",
+               "drilldown" : "Mohammad S Anwar"
             },
             {
-               "name" : "Niels van Dijke",
                "y" : 2,
+               "name" : "Niels van Dijke",
                "drilldown" : "Niels van Dijke"
             },
             {
-               "drilldown" : "Roger Bell_West",
                "y" : 3,
-               "name" : "Roger Bell_West"
+               "name" : "Roger Bell_West",
+               "drilldown" : "Roger Bell_West"
             },
             {
-               "y" : 2,
                "drilldown" : "Simon Miner",
-               "name" : "Simon Miner"
+               "name" : "Simon Miner",
+               "y" : 2
             },
             {
+               "name" : "Simon Proctor",
                "drilldown" : "Simon Proctor",
-               "y" : 2,
-               "name" : "Simon Proctor"
+               "y" : 2
             },
             {
-               "name" : "Ulrich Rieke",
                "y" : 3,
-               "drilldown" : "Ulrich Rieke"
+               "drilldown" : "Ulrich Rieke",
+               "name" : "Ulrich Rieke"
             },
             {
                "drilldown" : "Walt Mankowski",
-               "y" : 2,
-               "name" : "Walt Mankowski"
+               "name" : "Walt Mankowski",
+               "y" : 2
             },
             {
-               "drilldown" : "Wanderdoc",
                "y" : 2,
+               "drilldown" : "Wanderdoc",
                "name" : "Wanderdoc"
             }
-         ]
+         ],
+         "colorByPoint" : 1,
+         "name" : "Perl Weekly Challenge - 067"
       }
    ],
    "subtitle" : {
-      "text" : "[Champions: 20] Last updated at 2020-07-04 13:24:08 GMT"
+      "text" : "[Champions: 20] Last updated at 2020-07-04 13:28:01 GMT"
+   },
+   "yAxis" : {
+      "title" : {
+         "text" : "Total Solutions"
+      }
+   },
+   "legend" : {
+      "enabled" : 0
+   },
+   "xAxis" : {
+      "type" : "category"
    },
    "title" : {
       "text" : "Perl Weekly Challenge - 067"
    },
-   "plotOptions" : {
-      "series" : {
-         "borderWidth" : 0,
-         "dataLabels" : {
-            "format" : "{point.y}",
-            "enabled" : 1
-         }
-      }
-   },
    "drilldown" : {
       "series" : [
          {
             "id" : "Andrew Shitov",
-            "name" : "Andrew Shitov",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "name" : "Andrew Shitov"
          },
          {
             "name" : "Arne Sommer",
-            "id" : "Arne Sommer",
             "data" : [
                [
                   "Perl",
@@ -164,9 +168,12 @@
                   "Blog",
                   1
                ]
-            ]
+            ],
+            "id" : "Arne Sommer"
          },
          {
+            "id" : "Athanasius",
+            "name" : "Athanasius",
             "data" : [
                [
                   "Perl",
@@ -176,23 +183,21 @@
                   "Raku",
                   2
                ]
-            ],
-            "id" : "Athanasius",
-            "name" : "Athanasius"
+            ]
          },
          {
+            "name" : "Chenyf",
             "data" : [
                [
                   "Raku",
                   2
                ]
             ],
-            "id" : "Chenyf",
-            "name" : "Chenyf"
+            "id" : "Chenyf"
          },
          {
-            "name" : "Dave Jacoby",
             "id" : "Dave Jacoby",
+            "name" : "Dave Jacoby",
             "data" : [
                [
                   "Perl",
@@ -201,6 +206,8 @@
             ]
          },
          {
+            "id" : "Donald Hunter",
+            "name" : "Donald Hunter",
             "data" : [
                [
                   "Raku",
@@ -210,9 +217,7 @@
                   "Blog",
                   1
                ]
-            ],
-            "name" : "Donald Hunter",
-            "id" : "Donald Hunter"
+            ]
          },
          {
             "id" : "E. Choroba",
@@ -225,6 +230,8 @@
             ]
          },
          {
+            "id" : "Javier Luque",
+            "name" : "Javier Luque",
             "data" : [
                [
                   "Perl",
@@ -238,32 +245,29 @@
                   "Blog",
                   1
                ]
-            ],
-            "id" : "Javier Luque",
-            "name" : "Javier Luque"
+            ]
          },
          {
+            "id" : "Jorg Sommrey",
             "data" : [
                [
                   "Perl",
                   2
                ]
             ],
-            "name" : "Jorg Sommrey",
-            "id" : "Jorg Sommrey"
+            "name" : "Jorg Sommrey"
          },
          {
-            "name" : "Leo Manfredi",
-            "id" : "Leo Manfredi",
             "data" : [
                [
                   "Perl",
                   1
                ]
-            ]
+            ],
+            "name" : "Leo Manfredi",
+            "id" : "Leo Manfredi"
          },
          {
-            "id" : "Luca Ferrari",
             "name" : "Luca Ferrari",
             "data" : [
                [
@@ -274,37 +278,42 @@
                   "Blog",
                   2
                ]
-            ]
+            ],
+            "id" : "Luca Ferrari"
          },
          {
             "name" : "Mark Anderson",
-            "id" : "Mark Anderson",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "id" : "Mark Anderson"
          },
          {
-            "id" : "Mohammad S Anwar",
-            "name" : "Mohammad S Anwar",
             "data" : [
                [
                   "Perl",
                   2
+               ],
+               [
+                  "Raku",
+                  2
                ]
-            ]
+            ],
+            "name" : "Mohammad S Anwar",
+            "id" : "Mohammad S Anwar"
          },
          {
-            "name" : "Niels van Dijke",
-            "id" : "Niels van Dijke",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "name" : "Niels van Dijke",
+            "id" : "Niels van Dijke"
          },
          {
             "data" : [
@@ -317,31 +326,30 @@
                   1
                ]
             ],
-            "id" : "Roger Bell_West",
-            "name" : "Roger Bell_West"
+            "name" : "Roger Bell_West",
+            "id" : "Roger Bell_West"
          },
          {
-            "name" : "Simon Miner",
             "id" : "Simon Miner",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "name" : "Simon Miner"
          },
          {
-            "name" : "Simon Proctor",
-            "id" : "Simon Proctor",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "name" : "Simon Proctor",
+            "id" : "Simon Proctor"
          },
          {
-            "id" : "Ulrich Rieke",
             "name" : "Ulrich Rieke",
             "data" : [
                [
@@ -352,33 +360,29 @@
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "id" : "Ulrich Rieke"
          },
          {
             "id" : "Walt Mankowski",
-            "name" : "Walt Mankowski",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "name" : "Walt Mankowski"
          },
          {
+            "name" : "Wanderdoc",
             "data" : [
                [
                   "Perl",
                   2
                ]
             ],
-            "id" : "Wanderdoc",
-            "name" : "Wanderdoc"
+            "id" : "Wanderdoc"
          }
       ]
-   },
-   "yAxis" : {
-      "title" : {
-         "text" : "Total Solutions"
-      }
    }
 }
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index c050d24058..f65caa41f4 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,36 +1,31 @@
 {
-   "yAxis" : {
-      "title" : {
-         "text" : null
-      },
-      "min" : 0
-   },
-   "chart" : {
-      "type" : "column"
-   },
-   "legend" : {
-      "enabled" : "false"
-   },
    "xAxis" : {
-      "type" : "category",
       "labels" : {
          "style" : {
-            "fontFamily" : "Verdana, sans-serif",
-            "fontSize" : "13px"
+            "fontSize" : "13px",
+            "fontFamily" : "Verdana, sans-serif"
          }
-      }
-   },
-   "subtitle" : {
-      "text" : "Last updated at 2020-07-04 13:24:08 GMT"
-   },
-   "tooltip" : {
-      "pointFormat" : "<b>{point.y:.0f}</b>"
+      },
+      "type" : "category"
    },
-   "title" : {
-      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
+   "legend" : {
+      "enabled" : "false"
    },
    "series" : [
       {
+         "dataLabels" : {
+            "y" : 10,
+            "enabled" : "true",
+            "format" : "{point.y:.0f}",
+            "style" : {
+               "fontFamily" : "Verdana, sans-serif",
+               "fontSize" : "13px"
+            },
+            "color" : "#FFFFFF",
+            "align" : "right",
+            "rotation" : -90
+         },
+         "name" : "Contributions",
          "data" : [
             [
                "Blog",
@@ -42,22 +37,27 @@
             ],
             [
                "Raku",
-               1771
+               1773
             ]
-         ],
-         "name" : "Contributions",
-         "dataLabels" : {
-            "align" : "right",
-            "enabled" : "true",
-            "color" : "#FFFFFF",
-            "format" : "{point.y:.0f}",
-            "y" : 10,
-            "style" : {
-               "fontFamily" : "Verdana, sans-serif",
-               "fontSize" : "13px"
-            },
-            "rotation" : -90
-         }
+         ]
       }
-   ]
+   ],
+   "yAxis" : {
+      "title" : {
+         "text" : null
+      },
+      "min" : 0
+   },
+   "subtitle" : {
+      "text" : "Last updated at 2020-07-04 13:28:01 GMT"
+   },
+   "title" : {
+      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
+   },
+   "chart" : {
+      "type" : "column"
+   },
+   "tooltip" : {
+      "pointFormat" : "<b>{point.y:.0f}</b>"
+   }
 }
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index 0e3e54de37..f1f636dae7 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,39 +1,33 @@
 {
-   "chart" : {
-      "type" : "column"
-   },
-   "legend" : {
-      "enabled" : "false"
-   },
-   "xAxis" : {
-      "type" : "category"
-   },
    "plotOptions" : {
       "series" : {
+         "borderWidth" : 0,
          "dataLabels" : {
             "enabled" : 1,
             "format" : "{point.y}"
-         },
-         "borderWidth" : 0
+         }
       }
    },
-   "title" : {
-      "text" : "Perl 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"
+   },
+   "chart" : {
+      "type" : "column"
    },
    "series" : [
       {
-         "name" : "Perl Weekly Challenge Languages",
-         "colorByPoint" : "true",
          "data" : [
             {
-               "y" : 142,
+               "name" : "#001",
                "drilldown" : "001",
-               "name" : "#001"
+               "y" : 142
             },
             {
                "y" : 109,
-               "drilldown" : "002",
-               "name" : "#002"
+               "name" : "#002",
+               "drilldown" : "002"
             },
             {
                "name" : "#003",
@@ -41,28 +35,28 @@
                "y" : 71
             },
             {
-               "y" : 91,
+               "name" : "#004",
                "drilldown" : "004",
-               "name" : "#004"
+               "y" : 91
             },
             {
                "name" : "#005",
-               "y" : 72,
-               "drilldown" : "005"
+               "drilldown" : "005",
+               "y" : 72
             },
             {
+               "drilldown" : "006",
                "name" : "#006",
-               "y" : 52,
-               "drilldown" : "006"
+               "y" : 52
             },
             {
                "drilldown" : "007",
-               "y" : 59,
-               "name" : "#007"
+               "name" : "#007",
+               "y" : 59
             },
             {
-               "name" : "#008",
                "y" : 72,
+               "name" : "#008",
                "drilldown" : "008"
             },
             {
@@ -71,34 +65,34 @@
                "y" : 68
             },
             {
+               "name" : "#010",
                "drilldown" : "010",
-               "y" : 60,
-               "name" : "#010"
+               "y" : 60
             },
             {
                "drilldown" : "011",
-               "y" : 79,
-               "name" : "#011"
+               "name" : "#011",
+               "y" : 79
             },
             {
-               "name" : "#012",
                "y" : 83,
-               "drilldown" : "012"
+               "drilldown" : "012",
+               "name" : "#012"
             },
             {
-               "y" : 76,
+               "name" : "#013",
                "drilldown" : "013",
-               "name" : "#013"
+               "y" : 76
             },
             {
-               "drilldown" : "014",
                "y" : 96,
-               "name" : "#014"
+               "name" : "#014",
+               "drilldown" : "014"
             },
             {
+               "drilldown" : "015",
                "name" : "#015",
-               "y" : 93,
-               "drilldown" : "015"
+               "y" : 93
             },
             {
                "name" : "#016",
@@ -111,18 +105,18 @@
                "y" : 79
             },
             {
-               "name" : "#018",
+               "y" : 76,
                "drilldown" : "018",
-               "y" : 76
+               "name" : "#018"
             },
             {
                "name" : "#019",
-               "y" : 97,
-               "drilldown" : "019"
+               "drilldown" : "019",
+               "y" : 97
             },
             {
-               "name" : "#020",
                "drilldown" : "020",
+               "name" : "#020",
                "y" : 95
             },
             {
@@ -131,23 +125,23 @@
                "y" : 67
             },
             {
-               "y" : 63,
+               "name" : "#022",
                "drilldown" : "022",
-               "name" : "#022"
+               "y" : 63
             },
             {
+               "y" : 91,
                "name" : "#023",
-               "drilldown" : "023",
-               "y" : 91
+               "drilldown" : "023"
             },
             {
-               "name" : "#024",
                "drilldown" : "024",
+               "name" : "#024",
                "y" : 70
             },
             {
-               "drilldown" : "025",
                "y" : 55,
+               "drilldown" : "025",
                "name" : "#025"
             },
             {
@@ -156,9 +150,9 @@
                "y" : 70
             },
             {
-               "y" : 58,
                "drilldown" : "027",
-               "name" : "#027"
+               "name" : "#027",
+               "y" : 58
             },
             {
                "y" : 78,
@@ -167,47 +161,47 @@
             },
             {
                "y" : 77,
-               "drilldown" : "029",
-               "name" : "#029"
+               "name" : "#029",
+               "drilldown" : "029"
             },
             {
+               "drilldown" : "030",
                "name" : "#030",
-               "y" : 115,
-               "drilldown" : "030"
+               "y" : 115
             },
             {
-               "drilldown" : "031",
                "y" : 87,
-               "name" : "#031"
+               "name" : "#031",
+               "drilldown" : "031"
             },
             {
-               "name" : "#032",
                "y" : 92,
+               "name" : "#032",
                "drilldown" : "032"
             },
             {
-               "y" : 108,
                "drilldown" : "033",
-               "name" : "#033"
+               "name" : "#033",
+               "y" : 108
             },
             {
                "name" : "#034",
-               "y" : 62,
-               "drilldown" : "034"
+               "drilldown" : "034",
+               "y" : 62
             },
             {
+               "name" : "#035",
                "drilldown" : "035",
-               "y" : 62,
-               "name" : "#035"
+               "y" : 62
             },
             {
-               "y" : 66,
                "drilldown" : "036",
-               "name" : "#036"
+               "name" : "#036",
+               "y" : 66
             },
             {
-               "name" : "#037",
                "drilldown" : "037",
+               "name" : "#037",
                "y" : 65
             },
             {
@@ -227,33 +221,33 @@
             },
             {
                "name" : "#041",
-               "y" : 74,
-               "drilldown" : "041"
+               "drilldown" : "041",
+               "y" : 74
             },
             {
+               "name" : "#042",
                "drilldown" : "042",
-               "y" : 88,
-               "name" : "#042"
+               "y" : 88
             },
             {
-               "name" : "#043",
+               "y" : 66,
                "drilldown" : "043",
-               "y" : 66
+               "name" : "#043"
             },
             {
-               "drilldown" : "044",
                "y" : 82,
-               "name" : "#044"
+               "name" : "#044",
+               "drilldown" : "044"
             },
             {
                "y" : 94,
-               "drilldown" : "045",
-               "name" : "#045"
+               "name" : "#045",
+               "drilldown" : "045"
             },
             {
                "drilldown" : "046",
-               "y" : 85,
-               "name" : "#046"
+               "name" : "#046",
+               "y" : 85
             },
             {
                "name" : "#047",
@@ -261,24 +255,24 @@
                "y" : 82
             },
             {
+               "drilldown" : "048",
                "name" : "#048",
-               "y" : 106,
-               "drilldown" : "048"
+               "y" : 106
             },
             {
-               "drilldown" : "049",
                "y" : 85,
-               "name" : "#049"
+               "name" : "#049",
+               "drilldown" : "049"
             },
             {
-               "drilldown" : "050",
                "y" : 96,
+