- Added Perl/Raku solutions to "Lonely X" task.

16 files changed, 1369 insertions, 964 deletions

diff --git a/challenge-077/mohammad-anwar/perl/ch-2.pl b/challenge-077/mohammad-anwar/perl/ch-2.pl
new file mode 100644
index 0000000000..ef6f597b43
--- /dev/null
+++ b/challenge-077/mohammad-anwar/perl/ch-2.pl
@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+
+#
+# Perl Weekly Challenge - 077
+#
+# Task #2: Lonely X
+#
+# https://perlweeklychallenge.org/blog/perl-weekly-challenge-077/
+#
+
+use strict;
+use warnings;
+
+print "USAGE: perl $0 <row> <col>\n" and exit
+    if (defined $ARGV[0] && ($ARGV[0] eq '-h'));
+
+my $R = $ARGV[0] || 3;
+my $C = $ARGV[1] || 3;
+
+die "ERROR: Invalid rows [$R].\n" unless ($R =~ /^\d+$/ && $R >=2 );
+die "ERROR: Invalid cols [$C].\n" unless ($C =~ /^\d+$/ && $C >=2 );
+
+p(find_lonely_x(get_matrix($R, $C)));
+
+#
+#
+# METHODS
+
+sub find_lonely_x {
+    my ($matrix) = @_;
+
+    my $rows = $#$matrix;
+    my $cols = $#{$matrix->[0]};
+
+    my @lonely_x = ();
+    foreach my $row (0..$rows) {
+        foreach my $col (0..$cols) {
+            next unless $matrix->[$row][$col] eq 'X';
+
+            my @neighbours = ();
+            # top
+            push @neighbours, $matrix->[$row-1][$col] if $row > 0;
+
+            # bottom
+            push @neighbours, $matrix->[$row+1][$col] if $row < $rows;
+
+            # left
+            push @neighbours, $matrix->[$row][$col-1]   if $col > 0;
+            # diagonal top left
+            push @neighbours, $matrix->[$row-1][$col-1] if $row > 0     && $col > 0;
+            # diagonal bottom left
+            push @neighbours, $matrix->[$row+1][$col-1] if $row < $rows && $col > 0;
+
+            # right
+            push @neighbours, $matrix->[$row][$col+1]   if $col < $cols;
+            # diagonal top right
+            push @neighbours, $matrix->[$row-1][$col+1] if $row > 0     && $col < $cols;
+            # diagonal bottom right
+            push @neighbours, $matrix->[$row+1][$col+1] if $row < $rows && $col < $cols;
+
+            push @lonely_x, [$row+1, $col+1]
+                unless (grep /X/, @neighbours);
+        }
+    }
+
+    return 0 if @lonely_x == 0;
+    return @lonely_x;
+}
+
+sub p {
+    my (@data) = @_;
+
+    print "0\n" and return unless ref($data[0]);
+    foreach (@data) {
+        print sprintf("%s\n", join ", ", @$_);
+    }
+}
+
+sub get_matrix {
+    my ($rows, $cols) = @_;
+
+    my $min    = 0;
+    my $max    = 9;
+    my $array  = [ 'X', 'O', 'X', 'X', 'X', 'O', 'O', 'O', 'X', 'O' ];
+    my $matrix = [];
+
+    foreach my $r (0..$rows) {
+        foreach my $c (0..$cols) {
+            $matrix->[$r][$c] = $array->[int($min + rand($max - $min))];
+        }
+    }
+
+    display($matrix);
+    return $matrix;
+}
+
+sub display {
+    my ($matrix) = @_;
+
+    print "Matrix:\n";
+    foreach my $r (0..$#$matrix) {
+        print sprintf("[ %s ]\n", join ', ', @{$matrix->[$r]});
+    }
+    print "\n";
+}
diff --git a/challenge-077/mohammad-anwar/perl/ch-2.t b/challenge-077/mohammad-anwar/perl/ch-2.t
new file mode 100644
index 0000000000..4d0acb685b
--- /dev/null
+++ b/challenge-077/mohammad-anwar/perl/ch-2.t
@@ -0,0 +1,112 @@
+#!/usr/bin/perl
+
+#
+# Perl Weekly Challenge - 077
+#
+# Task #2: Lonely X
+#
+# https://perlweeklychallenge.org/blog/perl-weekly-challenge-077/
+#
+
+use strict;
+use warnings;
+use Test::More;
+use Test::Deep;
+
+my $example_1 = [ ['O', 'O', 'X'],
+                  ['X', 'O', 'O'],
+                  ['X', 'O', 'O'],
+                ];
+
+my $example_2 = [ ['O', 'O', 'X', 'O'],
+                  ['X', 'O', 'O', 'O'],
+                  ['X', 'O', 'O', 'X'],
+                  ['O', 'X', 'O', 'O'],
+                ];
+
+is_deeply([find_lonely_x($example_1)], [[1, 3]],        "example 1");
+is_deeply([find_lonely_x($example_2)], [[1, 3], [3,4]], "example 2");
+
+done_testing;
+
+#
+#
+# METHODS
+
+sub find_lonely_x {
+    my ($matrix) = @_;
+
+    my $rows = $#$matrix;
+    my $cols = $#{$matrix->[0]};
+
+    my @lonely_x = ();
+    foreach my $row (0..$rows) {
+        foreach my $col (0..$cols) {
+            next unless $matrix->[$row][$col] eq 'X';
+
+            my @neighbours = ();
+            # top
+            push @neighbours, $matrix->[$row-1][$col] if $row > 0;
+
+            # bottom
+            push @neighbours, $matrix->[$row+1][$col] if $row < $rows;
+
+            # left
+            push @neighbours, $matrix->[$row][$col-1]   if $col > 0;
+            # diagonal top left
+            push @neighbours, $matrix->[$row-1][$col-1] if $row > 0     && $col > 0;
+            # diagonal bottom left
+            push @neighbours, $matrix->[$row+1][$col-1] if $row < $rows && $col > 0;
+
+            # right
+            push @neighbours, $matrix->[$row][$col+1]   if $col < $cols;
+            # diagonal top right
+            push @neighbours, $matrix->[$row-1][$col+1] if $row > 0     && $col < $cols;
+            # diagonal bottom right
+            push @neighbours, $matrix->[$row+1][$col+1] if $row < $rows && $col < $cols;
+
+            push @lonely_x, [$row+1, $col+1]
+                unless (grep /X/, @neighbours);
+        }
+    }
+
+    return 0 if @lonely_x == 0;
+    return @lonely_x;
+}
+
+sub p {
+    my (@data) = @_;
+
+    print "0\n" and return unless ref($data[0]);
+    foreach (@data) {
+        print sprintf("%s\n", join ", ", @$_);
+    }
+}
+
+sub get_matrix {
+    my ($rows, $cols) = @_;
+
+    my $min    = 0;
+    my $max    = 9;
+    my $array  = [ 'X', 'O', 'X', 'X', 'X', 'O', 'O', 'O', 'X', 'O' ];
+    my $matrix = [];
+
+    foreach my $r (0..$rows) {
+        foreach my $c (0..$cols) {
+            $matrix->[$r][$c] = $array->[int($min + rand($max - $min))];
+        }
+    }
+
+    display($matrix);
+    return $matrix;
+}
+
+sub display {
+    my ($matrix) = @_;
+
+    print "Matrix:\n";
+    foreach my $r (0..$#$matrix) {
+        print sprintf("[ %s ]\n", join ', ', @{$matrix->[$r]});
+    }
+    print "\n";
+}
diff --git a/challenge-077/mohammad-anwar/raku/ch-2.raku b/challenge-077/mohammad-anwar/raku/ch-2.raku
new file mode 100644
index 0000000000..8773c02fe8
--- /dev/null
+++ b/challenge-077/mohammad-anwar/raku/ch-2.raku
@@ -0,0 +1,89 @@
+#!/usr/bin/env raku
+
+#
+# Perl Weekly Challenge - 077
+#
+# Task #2: Lonely X
+#
+# https://perlweeklychallenge.org/blog/perl-weekly-challenge-077/
+#
+
+use v6.d;
+
+sub MAIN(Int :$R is copy where { $R >= 2 } = 3,
+         Int :$C is copy where { $C >= 2 } = 3) {
+
+    my $matrix = get-matrix(--$R, --$C);
+    find-lonely-x($matrix).say;
+}
+
+#
+#
+# METHODS
+
+sub find-lonely-x($matrix) {
+
+    my $rows = $matrix.elems - 1;
+    my $cols = $matrix.[0].elems - 1;
+
+    my @lonely_x = ();
+    for 0..$rows -> $row {
+        for 0..$cols -> $col {
+            next unless $matrix.[$row][$col] eq 'X';
+
+            my @neighbours = ();
+
+            # top
+            @neighbours.push: $matrix.[$row-1][$col] if $row > 0;
+            # bottom
+            @neighbours.push: $matrix.[$row+1][$col] if $row < $rows;
+
+            # left
+            @neighbours.push: $matrix.[$row][$col-1]   if $col > 0;
+            # diagonal top left
+            @neighbours.push: $matrix.[$row-1][$col-1] if $row > 0     && $col > 0;
+            # diagonal bottom left
+            @neighbours.push: $matrix.[$row+1][$col-1] if $row < $rows && $col > 0;
+
+            # right
+            @neighbours.push: $matrix.[$row][$col+1]   if $col < $cols;
+            # diagonal top right
+            @neighbours.push: $matrix.[$row-1][$col+1] if $row > 0     && $col < $cols;
+            # diagonal bottom right
+            @neighbours.push: $matrix.[$row+1][$col+1] if $row < $rows && $col < $cols;
+
+            unless @neighbours.grep({ /X/ }) {
+               @lonely_x.push: ($row+1, $col+1);
+            }
+        }
+    }
+
+    return 0 if @lonely_x.elems == 0;
+    return |@lonely_x;
+}
+
+sub get-matrix(Int $rows where { $rows >= 1 },
+               Int $cols where { $cols >= 1 }) {
+
+    my $min   = 0;
+    my $max   = 9;
+    my $array = [ 'X', 'O', 'X', 'X', 'X', 'O', 'O', 'O', 'X', 'O' ];
+
+    my $matrix  = [];
+    for 0..$rows -> $r {
+        for 0..$cols -> $c {
+            $matrix.[$r][$c] = $array.pick;
+        }
+    }
+
+    display-matrix('Matrix:', $matrix);
+    return $matrix;
+}
+
+sub display-matrix($label, $matrix) {
+
+    say $label;
+    for 0..$matrix.elems - 1 -> $r {
+        say sprintf("[ %s ]", $matrix.[$r].join(', '));
+    }
+}
diff --git a/challenge-077/mohammad-anwar/raku/ch-2.t b/challenge-077/mohammad-anwar/raku/ch-2.t
new file mode 100644
index 0000000000..68f6d094d0
--- /dev/null
+++ b/challenge-077/mohammad-anwar/raku/ch-2.t
@@ -0,0 +1,99 @@
+#!/usr/bin/env raku
+
+#
+# Perl Weekly Challenge - 077
+#
+# Task #2: Lonely X
+#
+# https://perlweeklychallenge.org/blog/perl-weekly-challenge-077/
+#
+
+use Test;
+
+my $example_1 = [ ('O', 'O', 'X'),
+                  ('X', 'O', 'O'),
+                  ('X', 'O', 'O'),
+                ];
+
+my $example_2 = [ ('O', 'O', 'X', 'O'),
+                  ('X', 'O', 'O', 'O'),
+                  ('X', 'O', 'O', 'X'),
+                  ('O', 'X', 'O', 'O'),
+                ];
+
+is-deeply find-lonely-x($example_1), ((1, 3)),         "example 1";
+is-deeply find-lonely-x($example_2), ((1, 3), (3, 4)), "example 2";
+
+done-testing;
+
+
+#
+#
+# METHODS
+
+sub find-lonely-x($matrix) {
+
+    my $rows = $matrix.elems - 1;
+    my $cols = $matrix.[0].elems - 1;
+
+    my @lonely_x = ();
+    for 0..$rows -> $row {
+        for 0..$cols -> $col {
+            next unless $matrix.[$row][$col] eq 'X';
+
+    		my @neighbours = ();
+
+    		# top
+    		@neighbours.push: $matrix.[$row-1][$col] if $row > 0;
+    		# bottom
+    		@neighbours.push: $matrix.[$row+1][$col] if $row < $rows;
+
+    		# left
+    		@neighbours.push: $matrix.[$row][$col-1]    if $col > 0;
+    		# diagonal top left
+    		@neighbours.push: $matrix.[$row-1][$col-1] if $row > 0     && $col > 0;
+    		# diagonal bottom left
+    		@neighbours.push: $matrix.[$row+1][$col-1] if $row < $rows && $col > 0;
+
+    		# right
+    		@neighbours.push: $matrix.[$row][$col+1]    if $col < $cols;
+    		# diagonal top right
+    		@neighbours.push: $matrix.[$row-1][$col+1] if $row > 0     && $col < $cols;
+    		# diagonal bottom right
+    		@neighbours.push: $matrix.[$row+1][$col+1] if $row < $rows && $col < $cols;
+
+    		unless @neighbours.grep({ /X/ }) {
+       			@lonely_x.push: ($row+1, $col+1);
+    		}
+        }
+    }
+
+    return 0 if @lonely_x.elems == 0;
+    return |@lonely_x;
+}
+
+sub get-matrix(Int $rows where { $rows >= 1 },
+               Int $cols where { $cols >= 1 }) {
+
+    my $min   = 0;
+    my $max   = 9;
+    my $array = [ 'X', 'O', 'X', 'X', 'X', 'O', 'O', 'O', 'X', 'O' ];
+
+    my $matrix  = [];
+    for 0..$rows -> $r {
+        for 0..$cols -> $c {
+            $matrix.[$r][$c] = $array.pick;
+        }
+    }
+
+    return $matrix;
+
+}
+
+sub display-matrix($label, $matrix) {
+
+    say $label;
+    for 0..$matrix.elems - 1 -> $r {
+        say sprintf("[ %s ]", $matrix.[$r].join(', '));
+    }
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index b23976c335..71c99e5a9e 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,9 +1,8 @@
 {
-   "chart" : {
-      "type" : "column"
-   },
-   "subtitle" : {
-      "text" : "[Champions: 8] Last updated at 2020-09-08 02:21:37 GMT"
+   "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/>"
    },
    "legend" : {
       "enabled" : 0
@@ -11,15 +10,71 @@
    "xAxis" : {
       "type" : "category"
    },
+   "yAxis" : {
+      "title" : {
+         "text" : "Total Solutions"
+      }
+   },
+   "series" : [
+      {
+         "data" : [
+            {
+               "drilldown" : "Andrew Shitov",
+               "y" : 2,
+               "name" : "Andrew Shitov"
+            },
+            {
+               "name" : "Dave Jacoby",
+               "y" : 2,
+               "drilldown" : "Dave Jacoby"
+            },
+            {
+               "name" : "Feng Chang",
+               "drilldown" : "Feng Chang",
+               "y" : 2
+            },
+            {
+               "name" : "Mark Anderson",
+               "drilldown" : "Mark Anderson",
+               "y" : 2
+            },
+            {
+               "y" : 4,
+               "drilldown" : "Mohammad S Anwar",
+               "name" : "Mohammad S Anwar"
+            },
+            {
+               "drilldown" : "Roger Bell_West",
+               "y" : 4,
+               "name" : "Roger Bell_West"
+            },
+            {
+               "name" : "Simon Proctor",
+               "drilldown" : "Simon Proctor",
+               "y" : 2
+            },
+            {
+               "y" : 3,
+               "drilldown" : "Walt Mankowski",
+               "name" : "Walt Mankowski"
+            }
+         ],
+         "name" : "Perl Weekly Challenge - 077",
+         "colorByPoint" : 1
+      }
+   ],
    "plotOptions" : {
       "series" : {
-         "borderWidth" : 0,
          "dataLabels" : {
             "format" : "{point.y}",
             "enabled" : 1
-         }
+         },
+         "borderWidth" : 0
       }
    },
+   "title" : {
+      "text" : "Perl Weekly Challenge - 077"
+   },
    "drilldown" : {
       "series" : [
          {
@@ -37,52 +92,50 @@
             ]
          },
          {
-            "name" : "Dave Jacoby",
-            "id" : "Dave Jacoby",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "name" : "Dave Jacoby",
+            "id" : "Dave Jacoby"
          },
          {
+            "id" : "Feng Chang",
+            "name" : "Feng Chang",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ],
-            "id" : "Feng Chang",
-            "name" : "Feng Chang"
+            ]
          },
          {
+            "id" : "Mark Anderson",
+            "name" : "Mark Anderson",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ],
-            "name" : "Mark Anderson",
-            "id" : "Mark Anderson"
+            ]
          },
          {
             "data" : [
                [
                   "Perl",
-                  1
+                  2
                ],
                [
                   "Raku",
-                  1
+                  2
                ]
             ],
-            "name" : "Mohammad S Anwar",
-            "id" : "Mohammad S Anwar"
+            "id" : "Mohammad S Anwar",
+            "name" : "Mohammad S Anwar"
          },
          {
-            "name" : "Roger Bell_West",
-            "id" : "Roger Bell_West",
             "data" : [
                [
                   "Perl",
@@ -92,19 +145,23 @@
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "id" : "Roger Bell_West",
+            "name" : "Roger Bell_West"
          },
          {
-            "id" : "Simon Proctor",
-            "name" : "Simon Proctor",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "id" : "Simon Proctor",
+            "name" : "Simon Proctor"
          },
          {
+            "name" : "Walt Mankowski",
+            "id" : "Walt Mankowski",
             "data" : [
                [
                   "Perl",
@@ -114,71 +171,14 @@
                   "Blog",
                   1
                ]
-            ],
-            "name" : "Walt Mankowski",
-            "id" : "Walt Mankowski"
+            ]
          }
       ]
    },
-   "title" : {
-      "text" : "Perl Weekly Challenge - 077"
-   },
-   "series" : [
-      {
-         "colorByPoint" : 1,
-         "data" : [
-            {
-               "y" : 2,
-               "drilldown" : "Andrew Shitov",
-               "name" : "Andrew Shitov"
-            },
-            {
-               "name" : "Dave Jacoby",
-               "drilldown" : "Dave Jacoby",
-               "y" : 2
-            },
-            {
-               "name" : "Feng Chang",
-               "drilldown" : "Feng Chang",
-               "y" : 2
-            },
-            {
-               "name" : "Mark Anderson",
-               "drilldown" : "Mark Anderson",
-               "y" : 2
-            },
-            {
-               "drilldown" : "Mohammad S Anwar",
-               "name" : "Mohammad S Anwar",
-               "y" : 2
-            },
-            {
-               "name" : "Roger Bell_West",
-               "drilldown" : "Roger Bell_West",
-               "y" : 4
-            },
-            {
-               "y" : 2,
-               "drilldown" : "Simon Proctor",
-               "name" : "Simon Proctor"
-            },
-            {
-               "drilldown" : "Walt Mankowski",
-               "name" : "Walt Mankowski",
-               "y" : 3
-            }
-         ],
-         "name" : "Perl Weekly Challenge - 077"
-      }
-   ],
-   "yAxis" : {
-      "title" : {
-         "text" : "Total Solutions"
-      }
+   "subtitle" : {
+      "text" : "[Champions: 8] Last updated at 2020-09-08 09:52:03 GMT"
    },
-   "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/>"
+   "chart" : {
+      "type" : "column"
    }
 }
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index 2388e1e6e0..890f146723 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,25 +1,13 @@
 {
+   "title" : {
+      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
+   },
    "subtitle" : {
-      "text" : "Last updated at 2020-09-08 02:21:37 GMT"
+      "text" : "Last updated at 2020-09-08 09:52:03 GMT"
    },
    "chart" : {
       "type" : "column"
    },
-   "xAxis" : {
-      "type" : "category",
-      "labels" : {
-         "style" : {
-            "fontSize" : "13px",
-            "fontFamily" : "Verdana, sans-serif"
-         }
-      }
-   },
-   "legend" : {
-      "enabled" : "false"
-   },
-   "tooltip" : {
-      "pointFormat" : "<b>{point.y:.0f}</b>"
-   },
    "series" : [
       {
          "data" : [
@@ -29,24 +17,24 @@
             ],
             [
                "Perl",
-               3208
+               3209
             ],
             [
                "Raku",
-               2098
+               2099
             ]
          ],
          "name" : "Contributions",
          "dataLabels" : {
-            "format" : "{point.y:.0f}",
-            "align" : "right",
+            "enabled" : "true",
             "color" : "#FFFFFF",
-            "rotation" : -90,
             "y" : 10,
-            "enabled" : "true",
+            "rotation" : -90,
+            "align" : "right",
+            "format" : "{point.y:.0f}",
             "style" : {
-               "fontSize" : "13px",
-               "fontFamily" : "Verdana, sans-serif"
+               "fontFamily" : "Verdana, sans-serif",
+               "fontSize" : "13px"
             }
          }
       }
@@ -57,7 +45,19 @@
       },
       "min" : 0
    },
-   "title" : {
-      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
+   "tooltip" : {
+      "pointFormat" : "<b>{point.y:.0f}</b>"
+   },
+   "xAxis" : {
+      "labels" : {
+         "style" : {
+            "fontSize" : "13px",
+            "fontFamily" : "Verdana, sans-serif"
+         }
+      },
+      "type" : "category"
+   },
+   "legend" : {
+      "enabled" : "false"
    }
 }
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index 386c3fa093..b88e70acf6 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,37 +1,18 @@
 {
-   "plotOptions" : {
-      "series" : {
-         "borderWidth" : 0,
-         "dataLabels" : {
-            "enabled" : 1,
-            "format" : "{point.y}"
-         }
+   "yAxis" : {
+      "title" : {
+         "text" : "Total Solutions"
       }
    },
-   "xAxis" : {
-      "type" : "category"
-   },
-   "legend" : {
-      "enabled" : "false"
-   },
-   "subtitle" : {
-      "text" : "Click the columns to drilldown the language breakdown. Last updated at 2020-09-08 02:21:37 GMT"
-   },
-   "chart" : {
-      "type" : "column"
-   },
-   "title" : {
-      "text" : "Perl Weekly Challenge Language"
-   },
    "series" : [
       {
          "colorByPoint" : "true",
          "name" : "Perl Weekly Challenge Languages",
          "data" : [
             {
-               "name" : "#001",
+               "y" : 142,
                "drilldown" : "001",
-               "y" : 142
+               "name" : "#001"
             },
             {
                "y" : 109,
@@ -39,13 +20,13 @@
                "name" : "#002"
             },
             {
-               "drilldown" : "003",
                "name" : "#003",
+               "drilldown" : "003",
                "y" : 71
             },
             {
-               "y" : 91,
                "name" : "#004",
+               "y" : 91,
                "drilldown" : "004"
             },
             {
@@ -55,38 +36,38 @@
             },
             {
                "name" : "#006",
-               "drilldown" : "006",
-               "y" : 52
+               "y" : 52,
+               "drilldown" : "006"
             },
             {
+               "y" : 59,
                "drilldown" : "007",
-               "name" : "#007",
-               "y" : 59
+               "name" : "#007"
             },
             {
+               "drilldown" : "008",
                "y" : 72,
-               "name" : "#008",
-               "drilldown" : "008"
+               "name" : "#008"
             },
             {
-               "drilldown" : "009",
                "name" : "#009",
+               "drilldown" : "009",
                "y" : 70
             },
             {
+               "name" : "#010",
                "y" : 60,
-               "drilldown" : "010",
-               "name" : "#010"
+               "drilldown" : "010"
             },
             {
                "drilldown" : "011",
-               "name" : "#011",
-               "y" : 79
+               "y" : 79,
+               "name" : "#011"
             },
             {
-               "drilldown" : "012",
                "name" : "#012",
-               "y" : 83
+               "y" : 83,
+               "drilldown" : "012"
             },
             {
                "name" : "#013",
@@ -94,29 +75,29 @@
                "y" : 78
             },
             {
+               "drilldown" : "014",
                "y" : 96,
-               "name" : "#014",
-               "drilldown" : "014"
+               "name" : "#014"
             },
             {
                "drilldown" : "015",
-               "name" : "#015",
-               "y" : 93
+               "y" : 93,
+               "name" : "#015"
             },
             {
+               "y" : 66,
                "drilldown" : "016",
-               "name" : "#016",
-               "y" : 66
+               "name" : "#016"
             },
             {
-               "y" : 79,
+               "name" : "#017",
                "drilldown" : "017",
-               "name" : "#017"
+               "y" : 79
             },
             {
                "y" : 76,
-               "name" : "#018",
-               "drilldown" : "018"
+               "drilldown" : "018",
+               "name" : "#018"
             },
             {
                "name" : "#019",
@@ -124,18 +105,18 @@
                "y" : 97
             },
             {
-               "y" : 95,
+               "name" : "#020",
                "drilldown" : "020",
-               "name" : "#020"
+               "y" : 95
             },
             {
+               "y" : 67,
                "drilldown" : "021",
-               "name" : "#021",
-               "y" : 67
+               "name" : "#021"
             },
             {
-               "drilldown" : "022",
                "name" : "#022",
+               "drilldown" : "022",
                "y" : 63
             },
             {
@@ -145,137 +126,137 @@
             },
             {
                "drilldown" : "024",
-               "name" : "#024",
-               "y" : 70
+               "y" : 70,
+               "name" : "#024"
             },
             {
-               "y" : 55,
+               "name" : "#025",
                "drilldown" : "025",
-               "name" : "#025"
+               "y" : 55
             },
             {
                "name" : "#026",
-               "drilldown" : "026",
-               "y" : 70
+               "y" : 70,
+               "drilldown" : "026"
             },
             {
-               "y" : 58,
                "drilldown" : "027",
+               "y" : 58,
                "name" : "#027"
             },
             {
+               "drilldown" : "028",
                "y" : 78,
-               "name" : "#028",
-               "drilldown" : "028"
+               "name" : "#028"
             },
             {
                "drilldown" : "029",
-               "name" : "#029",
-               "y" : 77
+               "y" : 77,
+               "name" : "#029"
             },
             {
-               "name" : "#030",
                "drilldown" : "030",
-               "y" : 115
+               "y" : 115,
+               "name" : "#030"
             },
             {
-               "drilldown" : "031",
                "name" : "#031",
-               "y" : 87
+               "y" : 87,
+               "drilldown" : "031"
             },
             {
+               "drilldown" : "032",
                "y" : 92,
-               "name" : "#032",
-               "drilldown" : "032"
+               "name" : "#032"
             },
             {
                "y" : 108,
-               "name" : "#033",
-               "drilldown" : "033"
+               "drilldown" : "033",
+               "name" : "#033"
             },
             {
-               "y" : 62,
+               "name" : "#034",
                "drilldown" : "034",
-               "name" : "#034"
+               "y" : 62
             },
             {
-               "drilldown" : "035",
                "name" : "#035",
+               "drilldown" : "035",
                "y" : 62
             },
             {
-               "name" : "#036",
                "drilldown" : "036",
-               "y" : 66
+               "y" : 66,
+               "name" : "#036"
             },
             {
                "y" : 65,
-               "name" : "#037",
-               "drilldown" : "037"