Merge remote-tracking branch 'upstream/master'

18 files changed, 1617 insertions, 1360 deletions

diff --git a/challenge-152/dave-jacoby/blog1.txt b/challenge-152/dave-jacoby/blog1.txt
new file mode 100644
index 0000000000..5be5dd4d14
--- /dev/null
+++ b/challenge-152/dave-jacoby/blog1.txt
@@ -0,0 +1 @@
+https://jacoby.github.io/2022/02/15/functional-paths-weekly-challenge-152.html
\ No newline at end of file
diff --git a/challenge-152/dave-jacoby/blog2.txt b/challenge-152/dave-jacoby/blog2.txt
new file mode 100644
index 0000000000..f8dd4f91e4
--- /dev/null
+++ b/challenge-152/dave-jacoby/blog2.txt
@@ -0,0 +1 @@
+https://jacoby.github.io/2022/02/16/think-inside-the-box-weekly-challenge-152-pt-2.html
\ No newline at end of file
diff --git a/challenge-152/dave-jacoby/perl/ch-1.pl b/challenge-152/dave-jacoby/perl/ch-1.pl
new file mode 100644
index 0000000000..9ae0796fe6
--- /dev/null
+++ b/challenge-152/dave-jacoby/perl/ch-1.pl
@@ -0,0 +1,69 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use feature qw{ say postderef signatures state };
+no warnings qw{ experimental };
+
+use List::Util qw{ min sum };
+
+# This is inspired by a reading of the problem
+# from Adam Russell, who notes that there's no
+# direct down-left or down-right between 3 on
+# the second level and 2 on the third in this
+# triangle:
+#
+#                1
+#               5 3
+#              2 3 4
+#             7 1 0 2
+#            6 4 5 2 8
+#
+# A similar problem occurs with the 0 on the
+# fourth row of the second example:
+#
+#                5
+#               2 3
+#              4 1 5
+#             0 1 2 3
+#            7 2 4 1 9
+#
+# If the problem requires a solution that's less
+# using List::Util and more actual tree structures,
+# that solution will be forthcoming.
+
+my @examples;
+push @examples, '$triangle=[ [1], [5,3], [2,3,4], [7,1,0,2], [6,4,5,2,8] ]';
+push @examples, '$triangle=[ [5], [2,3], [4,1,5], [0,1,2,3], [7,2,4,1,9] ]';
+
+for my $e (@examples) {
+    my $triangle;
+    eval($e); 
+
+    # let's do this the functional way?
+    my $path = join ' + ', map { min $_->@* } $triangle->@*;
+    my $sum  = sum map { min $_->@* } $triangle->@*;
+
+    my $tree = make_tree($triangle);
+    say <<"END";
+        Input:  $e
+        Output: $sum
+        Minimum Sum Path = $path => $sum
+$tree
+END
+}
+
+sub make_tree ( $src ) {
+    my $output = '';
+    my $n      = 10;
+    my $i      = 0;
+    while ( $src->[$i] ) {
+        my $line = join ' ', $src->[$i]->@*;
+        $output .= "\n";
+        $output .= ' ' x ( $n - $i );
+        $output .= $line;
+        $i++;
+    }
+
+    return $output;
+}
diff --git a/challenge-152/dave-jacoby/perl/ch-2.pl b/challenge-152/dave-jacoby/perl/ch-2.pl
new file mode 100644
index 0000000000..d980facf24
--- /dev/null
+++ b/challenge-152/dave-jacoby/perl/ch-2.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use feature qw{ say postderef signatures state };
+no warnings qw{ experimental };
+
+use List::Util qw{ min max sum };
+
+my @examples;
+push @examples, [ [ [ -1, 0 ],  [ 2, 2 ] ], [ [ 0,  -1 ], [ 4, 4 ] ] ];
+push @examples, [ [ [ -3, -1 ], [ 1, 3 ] ], [ [ -1, -3 ], [ 2, 2 ] ] ];
+push @examples, [ [ [ 0,  0 ],  [ 1, 1 ] ], [ [ 2,  2 ],  [ 3, 3 ] ] ];
+push @examples, [ [ [ 0,  0 ],  [ 1, 1 ] ], [ [ 1,  1 ],  [ 3, 3 ] ] ];
+push @examples, [ [ [ 0,  1 ],  [ 5, 2 ] ], [ [ 2,  0 ],  [ 4, 4 ] ] ];
+
+for my $e (@examples) {
+    my $area = find_area( $e->[0], $e->[1] );
+    say <<"END";
+        Input: Rectangle 1 => ($e->[0][0][0],$e->[0][0][1]), ($e->[0][1][0],$e->[0][1][1])
+               Rectangle 2 => ($e->[1][0][0],$e->[1][0][1]), ($e->[1][1][0],$e->[1][1][1])
+        Output: $area
+END
+}
+
+sub find_area ( @r ) {
+    my @ro      = map { make_rectangle($_) } @r;
+    my $overlap = has_overlap(@ro);
+    my $area    = 0;
+
+    if ($overlap) {
+        my $overlap = find_overlap(@r);
+        $area = sum map { area($_) } @ro;
+        $area -= area($overlap);
+    }
+    else {
+        $area = sum map { area($_) } @ro;
+    }
+    return $area;
+}
+
+sub area ( $r ) {
+    my $minx = min map { $_->[0] } $r->@*;
+    my $maxx = max map { $_->[0] } $r->@*;
+    my $miny = min map { $_->[1] } $r->@*;
+    my $maxy = max map { $_->[1] } $r->@*;
+    my $x    = $maxx - $minx;
+    my $y    = $maxy - $miny;
+    return $x * $y;
+}
+
+sub find_overlap ( $r1, $r2 ) {
+    my $maxx1 = max map { $_->[0] } $r1->@*;
+    my $maxx2 = max map { $_->[0] } $r2->@*;
+
+    my $maxy1 = max map { $_->[1] } $r1->@*;
+    my $maxy2 = max map { $_->[1] } $r2->@*;
+
+    my $minx1 = min map { $_->[0] } $r1->@*;
+    my $minx2 = min map { $_->[0] } $r2->@*;
+
+    my $miny1 = min map { $_->[1] } $r1->@*;
+    my $miny2 = min map { $_->[1] } $r2->@*;
+
+    my $minx = max( $minx1, $minx2 );
+    my $miny = max( $miny1, $miny2 );
+    my $maxx = min( $maxx1, $maxx2 );
+    my $maxy = min( $maxy1, $maxy2 );
+
+    return [ [ $minx, $miny ], [ $maxx, $maxy ] ];
+}
+
+sub has_overlap ( $r1, $r2 ) {
+    my $maxx1 = max map { $_->[0] } $r1->@*;
+    my $maxx2 = max map { $_->[0] } $r2->@*;
+
+    my $maxy1 = max map { $_->[1] } $r1->@*;
+    my $maxy2 = max map { $_->[1] } $r2->@*;
+
+    my $minx1 = min map { $_->[0] } $r1->@*;
+    my $minx2 = min map { $_->[0] } $r2->@*;
+
+    my $miny1 = min map { $_->[1] } $r1->@*;
+    my $miny2 = min map { $_->[1] } $r2->@*;
+
+    return max( $minx1, $minx2 ) < min( $maxx1, $maxx2 )
+        && max( $miny1, $miny2 ) < min( $maxy1, $maxy2 ) ? 1 : 0;
+}
+
+sub within ( $r1, $r2 ) {
+    my $within = 0;
+    my $minx   = min map { $_->[0] } $r1->@*;
+    my $maxx   = max map { $_->[0] } $r1->@*;
+    my $miny   = min map { $_->[1] } $r1->@*;
+    my $maxy   = max map { $_->[1] } $r1->@*;
+    for my $p ( $r2->@* ) {
+        my $x = $p->[0];
+        my $y = $p->[1];
+        if (   $x < $maxx
+            && $x > $minx
+            && $y < $maxy
+            && $y > $miny )
+        {
+            $within++;
+        }
+    }
+    return $within;
+}
+
+sub make_rectangle ( $r ) {
+    my @points;
+    my @x = map { $_->[0] } $r->@*;
+    my @y = map { $_->[1] } $r->@*;
+    for my $x (@x) {
+        for my $y (@y) {
+            push @points, [ $x, $y ];
+        }
+    }
+    return \@points;
+}
+
+sub draw_rectangles( @r ) {
+    my @x = map { $_->[0] } map { $_->@* } @r;
+    my @y = map { $_->[1] } map { $_->@* } @r;
+
+    my $minx = min(@x);
+    my $maxx = max(@x);
+    my $miny = min(@y);
+    my $maxy = max(@y);
+
+    my @xr = $minx - 1 .. $maxx + 1;
+    my @yr = reverse $miny - 1 .. $maxy + 1;
+
+    my @r2;
+    for my $r (@r) {
+        my $rec;
+        my @x = map { $_->[0] } $r->@*;
+        my @y = map { $_->[1] } $r->@*;
+        for my $x (@x) {
+            for my $y (@y) { push $rec->@*, [ $x, $y ]; }
+            push @r2, $rec;
+        }
+    }
+
+    my @graph;
+    for my $y (@yr) {
+        my $row = [];
+        for my $x (@xr) {
+            my $s = ' ';
+            $s = '.' if $x == 0;
+            $s = '.' if $y == 0;
+            $s = '+' if $x == 0 && $y == 0;
+            my $pp = 0;
+            for my $r (@r2) {
+                $pp++;
+                for my $p ( $r->@* ) {
+                    if ( $p->[0] == $x ) {
+                        if ( $p->[1] == $y ) { $s = $pp; }
+                    }
+                }
+            }
+            push $row->@*, $s;
+        }
+        push @graph, $row;
+    }
+    say join "\n", '', ( map { join '  ', $_->@* } @graph ), '';
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index eca7113f45..9020334e82 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,14 +1,9 @@
 {
-   "yAxis" : {
-      "title" : {
-         "text" : "Total Solutions"
-      }
-   },
    "drilldown" : {
       "series" : [
          {
-            "name" : "Abigail",
             "id" : "Abigail",
+            "name" : "Abigail",
             "data" : [
                [
                   "Perl",
@@ -17,6 +12,20 @@
             ]
          },
          {
+            "data" : [
+               [
+                  "Perl",
+                  2
+               ],
+               [
+                  "Blog",
+                  2
+               ]
+            ],
+            "id" : "Dave Jacoby",
+            "name" : "Dave Jacoby"
+         },
+         {
             "id" : "E. Choroba",
             "name" : "E. Choroba",
             "data" : [
@@ -27,8 +36,8 @@
             ]
          },
          {
-            "name" : "James Smith",
             "id" : "James Smith",
+            "name" : "James Smith",
             "data" : [
                [
                   "Perl",
@@ -41,6 +50,8 @@
             ]
          },
          {
+            "name" : "Luca Ferrari",
+            "id" : "Luca Ferrari",
             "data" : [
                [
                   "Raku",
@@ -50,23 +61,19 @@
                   "Blog",
                   2
                ]
-            ],
-            "id" : "Luca Ferrari",
-            "name" : "Luca Ferrari"
+            ]
          },
          {
+            "name" : "Mark Anderson",
+            "id" : "Mark Anderson",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ],
-            "name" : "Mark Anderson",
-            "id" : "Mark Anderson"
+            ]
          },
          {
-            "name" : "Roger Bell_West",
-            "id" : "Roger Bell_West",
             "data" : [
                [
                   "Perl",
@@ -76,9 +83,13 @@
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "name" : "Roger Bell_West",
+            "id" : "Roger Bell_West"
          },
          {
+            "id" : "W. Luis Mochan",
+            "name" : "W. Luis Mochan",
             "data" : [
                [
                   "Perl",
@@ -88,81 +99,89 @@
                   "Blog",
                   1
                ]
-            ],
-            "name" : "W. Luis Mochan",
-            "id" : "W. Luis Mochan"
+            ]
          }
       ]
    },
-   "xAxis" : {
-      "type" : "category"
+   "tooltip" : {
+      "followPointer" : 1,
+      "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>",
+      "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>"
+   },
+   "yAxis" : {
+      "title" : {
+         "text" : "Total Solutions"
+      }
+   },
+   "plotOptions" : {
+      "series" : {
+         "dataLabels" : {
+            "enabled" : 1,
+            "format" : "{point.y}"
+         },
+         "borderWidth" : 0
+      }
+   },
+   "legend" : {
+      "enabled" : 0
    },
    "series" : [
       {
-         "name" : "The Weekly Challenge - 152",
-         "colorByPoint" : 1,
          "data" : [
             {
                "drilldown" : "Abigail",
-               "name" : "Abigail",
-               "y" : 2
+               "y" : 2,
+               "name" : "Abigail"
+            },
+            {
+               "name" : "Dave Jacoby",
+               "y" : 4,
+               "drilldown" : "Dave Jacoby"
             },
             {
-               "name" : "E. Choroba",
                "y" : 2,
-               "drilldown" : "E. Choroba"
+               "drilldown" : "E. Choroba",
+               "name" : "E. Choroba"
             },
             {
-               "name" : "James Smith",
+               "drilldown" : "James Smith",
                "y" : 3,
-               "drilldown" : "James Smith"
+               "name" : "James Smith"
             },
             {
-               "drilldown" : "Luca Ferrari",
                "name" : "Luca Ferrari",
+               "drilldown" : "Luca Ferrari",
                "y" : 4
             },
             {
-               "drilldown" : "Mark Anderson",
                "name" : "Mark Anderson",
-               "y" : 2
+               "y" : 2,
+               "drilldown" : "Mark Anderson"
             },
             {
+               "name" : "Roger Bell_West",
                "drilldown" : "Roger Bell_West",
-               "y" : 4,
-               "name" : "Roger Bell_West"
+               "y" : 4
             },
             {
+               "y" : 3,
                "drilldown" : "W. Luis Mochan",
-               "name" : "W. Luis Mochan",
-               "y" : 3
+               "name" : "W. Luis Mochan"
             }
-         ]
+         ],
+         "name" : "The Weekly Challenge - 152",
+         "colorByPoint" : 1
       }
    ],
+   "xAxis" : {
+      "type" : "category"
+   },
    "subtitle" : {
-      "text" : "[Champions: 7] Last updated at 2022-02-16 10:39:34 GMT"
+      "text" : "[Champions: 8] Last updated at 2022-02-17 12:02:48 GMT"
    },
    "chart" : {
       "type" : "column"
    },
-   "legend" : {
-      "enabled" : 0
-   },
-   "plotOptions" : {
-      "series" : {
-         "dataLabels" : {
-            "format" : "{point.y}",
-            "enabled" : 1
-         },
-         "borderWidth" : 0
-      }
-   },
-   "tooltip" : {
-      "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>",
-      "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>",
-      "followPointer" : 1
-   },
    "title" : {
       "text" : "The Weekly Challenge - 152"
    }
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index 9020d1026b..96cfe1bbe9 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,63 +1,63 @@
 {
-   "yAxis" : {
-      "min" : 0,
-      "title" : {
-         "text" : null
-      }
+   "title" : {
+      "text" : "The Weekly Challenge Contributions [2019 - 2022]"
+   },
+   "chart" : {
+      "type" : "column"
+   },
+   "subtitle" : {
+      "text" : "Last updated at 2022-02-17 12:02:48 GMT"
    },
    "xAxis" : {
       "type" : "category",
       "labels" : {
          "style" : {
-            "fontFamily" : "Verdana, sans-serif",
-            "fontSize" : "13px"
+            "fontSize" : "13px",
+            "fontFamily" : "Verdana, sans-serif"
          }
       }
    },
-   "subtitle" : {
-      "text" : "Last updated at 2022-02-16 10:39:34 GMT"
-   },
    "series" : [
       {
-         "name" : "Contributions",
-         "dataLabels" : {
-            "enabled" : "true",
-            "style" : {
-               "fontSize" : "13px",
-               "fontFamily" : "Verdana, sans-serif"
-            },
-            "y" : 10,
-            "color" : "#FFFFFF",
-            "format" : "{point.y:.0f}",
-            "align" : "right",
-            "rotation" : -90
-         },
          "data" : [
             [
                "Blog",
-               2271
+               2273
             ],
             [
                "Perl",
-               7296
+               7298
             ],
             [
                "Raku",
                4387
             ]
-         ]
+         ],
+         "dataLabels" : {
+            "color" : "#FFFFFF",
+            "rotation" : -90,
+            "enabled" : "true",
+            "y" : 10,
+            "style" : {
+               "fontSize" : "13px",
+               "fontFamily" : "Verdana, sans-serif"
+            },
+            "format" : "{point.y:.0f}",
+            "align" : "right"
+         },
+         "name" : "Contributions"
       }
    ],
-   "chart" : {
-      "type" : "column"
-   },
    "legend" : {
       "enabled" : "false"
    },
    "tooltip" : {
       "pointFormat" : "<b>{point.y:.0f}</b>"
    },
-   "title" : {
-      "text" : "The Weekly Challenge Contributions [2019 - 2022]"
+   "yAxis" : {
+      "min" : 0,
+      "title" : {
+         "text" : null
+      }
    }
 }
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index 96ed8ab96b..1a1ad0fe4c 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,59 +1,67 @@
 {
+   "chart" : {
+      "type" : "column"
+   },
+   "title" : {
+      "text" : "The Weekly Challenge Language"
+   },
+   "xAxis" : {
+      "type" : "category"
+   },
    "subtitle" : {
-      "text" : "Click the columns to drilldown the language breakdown. Last updated at 2022-02-16 10:39:34 GMT"
+      "text" : "Click the columns to drilldown the language breakdown. Last updated at 2022-02-17 12:02:48 GMT"
    },
    "series" : [
       {
-         "name" : "The Weekly Challenge Languages",
          "data" : [
             {
+               "y" : 161,
                "drilldown" : "001",
-               "name" : "#001",
-               "y" : 161
+               "name" : "#001"
             },
             {
                "name" : "#002",
-               "y" : 125,
-               "drilldown" : "002"
+               "drilldown" : "002",
+               "y" : 125
             },
             {
-               "drilldown" : "003",
                "name" : "#003",
+               "drilldown" : "003",
                "y" : 83
             },
             {
-               "drilldown" : "004",
                "name" : "#004",
+               "drilldown" : "004",
                "y" : 99
             },
             {
-               "drilldown" : "005",
                "name" : "#005",
-               "y" : 78
+               "y" : 78,
+               "drilldown" : "005"
             },
             {
-               "drilldown" : "006",
                "name" : "#006",
+               "drilldown" : "006",
                "y" : 58
             },
             {
                "name" : "#007",
-               "y" : 64,
-               "drilldown" : "007"
+               "drilldown" : "007",
+               "y" : 64
             },
             {
-               "drilldown" : "008",
                "y" : 78,
+               "drilldown" : "008",
                "name" : "#008"
             },
             {
                "y" : 76,
-               "name" : "#009",
-               "drilldown" : "009"
+               "drilldown" : "009",
+               "name" : "#009"
             },
             {
-               "drilldown" : "010",
                "y" : 65,
+               "drilldown" : "010",
                "name" : "#010"
             },
             {
@@ -62,8 +70,8 @@
                "name" : "#011"
             },
             {
-               "drilldown" : "012",
                "y" : 89,
+               "drilldown" : "012",
                "name" : "#012"
             },
             {
@@ -72,29 +80,29 @@
                "name" : "#013"
             },
             {
+               "drilldown" : "014",
                "y" : 101,
-               "name" : "#014",
-               "drilldown" : "014"
+               "name" : "#014"
             },
             {
+               "name" : "#015",
                "drilldown" : "015",
-               "y" : 99,
-               "name" : "#015"
+               "y" : 99
             },
             {
-               "name" : "#016",
+               "drilldown" : "016",
                "y" : 71,
-               "drilldown" : "016"
+               "name" : "#016"
             },
             {
-               "drilldown" : "017",
+               "name" : "#017",
                "y" : 84,
-               "name" : "#017"
+               "drilldown" : "017"
             },
             {
-               "drilldown" : "018",
+               "name" : "#018",
                "y" : 81,
-               "name" : "#018"
+               "drilldown" : "018"
             },
             {
                "drilldown" : "019",
@@ -102,54 +110,54 @@
                "name" : "#019"
             },
             {
+               "name" : "#020",
                "drilldown" : "020",
-               "y" : 101,
-               "name" : "#020"
+               "y" : 101
             },
             {
+               "y" : 72,
                "drilldown" : "021",
-               "name" : "#021",
-               "y" : 72
+               "name" : "#021"
             },
             {
                "name" : "#022",
-               "y" : 68,
-               "drilldown" : "022"
+               "drilldown" : "022",
+               "y" : 68
             },
             {
                "y" : 97,
-               "name" : "#023",
-               "drilldown" : "023"
+               "drilldown" : "023",
+               "name" : "#023"
             },
             {
                "name" : "#024",
-               "y" : 75,
-               "drilldown" : "024"
+               "drilldown" : "024",
+               "y" : 75
             },
             {
-               "y" : 59,
                "name" : "#025",
-               "drilldown" : "025"
+               "drilldown" : "025",
+               "y" : 59
             },
             {
-               "name" : "#026",
+               "drilldown" : "026",
                "y" : 74,
-               "drilldown" : "026"
+               "name" : "#026"
             },
             {
-               "name" : "#027",
+               "drilldown" : "027",
                "y" : 62,
-               "drilldown" : "027"
+               "name" : "#027"
             },
             {
-               "drilldown" : "028",
                "name" : "#028",
-               "y" : 82
+               "y" : 82,
+               "drilldown" : "028"
             },
             {
-               "y" : 81,
                "name" : "#029",
-               "drilldown" : "029"
+               "drilldown" : "029",
+               "y" : 81
             },
             {
                "drilldown" : "030",
@@ -163,33 +171,33 @@
             },
             {
                "name" : "#032",
-               "y" : 96,
-               "drilldown" : "032"
+               "drilldown" : "032",
+               "y" : 96
             },
             {
-               "y" : 112,
                "name" : "#033",
+               "y" : 112,
                "drilldown" : "033"
             },
             {
-               "drilldown" : "034",
                "name" : "#034",
-               "y" : 66
+               "y" : 66,
+               "drilldown" : "034"
             },
             {
-               "drilldown" : "035",
                "name" : "#035",
-               "y" : 66
+               "y" : 66,
+               "drilldown" : "035"
             },
             {
                "name" : "#036",
-               "y" : 68,
-               "drilldown" : "036"
+               "drilldown" : "036",
+               "y" : 68
             },
             {
                "name" : "#037",
-               "y" : 67,
-               "drilldown" : "037"
+               "drilldown" : "037",
+               "y" : 67
             },
             {
                "name" : "#038",
@@ -197,49 +205,49 @@
                "drilldown" : "038"
             },
             {
+               "drilldown" : "039",
                "y" : 62,
-               "name" : "#039",
-               "drilldown" : "039"
+               "name" : "#039"
             },
             {
-               "name" : "#040",
+               "drilldown" : "040",
                "y" : 73,
-               "drilldown" : "040"
+               "name" : "#040"
             },
             {
+               "name" : "#041",
                "drilldown" : "041",
-               "y" : 76,
-               "name" : "#041"
+               "y" : 76
             },
             {
-               "drilldown" : "042",
                "name" : "#042",
+               "drilldown" : "042",
                "y" : 92
             },
             {
-               "y" : 68,
                "name" : "#043",
-               "drilldown" : "043"
+               "drilldown" : "043",
+               "y" : 68
             },
             {
-               "y" : 85,
                "name" : "#044",
-               "drilldown" : "044"
+               "drilldown" : "044",
+               "y" : 85
             },
             {
-               "name" : "#045",
                "y" : 96,
-               "drilldown" : "045"
+               "drilldown" : "045",
+               "name" : "#045"
             },
             {
                "y" : 87,
-               "name" : "#046",
-               "drilldown" : "046"
+               "drilldown" : "046",
+               "name" : "#046"
             },
             {
                "y" : 84,
-               "name" : "#047",
-               "drilldown" : "047"
+               "drilldown" : "047",
+               "name" : "#047"
             },
             {
                "drilldown" : "048",
@@ -248,58 +256,58 @@
             },
             {
                "y" : 89,
-               "name" : "#049",
-               "drilldown" : "049"
+               "drilldown" : "049",
+               "name" : "#049"
             },
             {
-               "name" : "#050",
+               "drilldown" : "050",
                "y" : 98,
-               "drilldown" : "050"
+               "name" : "#050"
             },
             {
-               "drilldown" : "051",
                "y" : 89,
+               "drilldown" : "051",
                "name" : "#051"
             },
             {
+               "name" : "#052",
                "drilldown" : "052",
-               "y" : 91,
-               "name" : "#052"
+               "y" : 91
             },
             {
+               "y" : 101,
                "drilldown" : "053",
-               "name" : "#053",
-               "y" : 101
+               "name" : "#053"
             },
             {
+               "name" : "#054",
                "drilldown" : "054",
-               "y" : 103,
-               "name" : "#054"
+               "y" : 103
             },
             {
-               "drilldown" : "055",
                "name" : "#055",
-               "y" : 88
+               "y" : 88,
+               "drilldown" : "055"
             },
             {
-               "drilldown" : "056",
+               "name" : "#056",
                "y" : 95,
-               "name" : "#056"
+               "drilldown" : "056"
             },
             {
-               "drilldown" : "057",
                "name" : "#057",
+               "drilldown" : "057",
                "y" : 80
             },
             {
                "y" : 69,
-               "name" : "#058",
-               "drilldown" : "058"
+               "drilldown" : "058",
+               "name" : "#058"
             },
             {
                "y" : 89,
-               "name" : "#059",
-               "drilldown" : "059"
+               "drilldown" : "059",
+               "name" : "#059"
             },
             {
                "name" : "#060",
@@ -312,34 +320,34 @@
                "drilldown" : "061"
             },
             {
+               "drilldown" : "062",
                "y" : 58,
-               "name" : "#062",
-               "drilldown" : "062"
+               "name" : "#062"
             },
             {
-               "drilldown" : "063",
+               "name" : "#063",