Merge branch 'master' into contrib

18 files changed, 1107 insertions, 1045 deletions

diff --git a/challenge-060/e-choroba/blog.txt b/challenge-060/e-choroba/blog.txt
new file mode 100644
index 0000000000..8f5cf5af70
--- /dev/null
+++ b/challenge-060/e-choroba/blog.txt
@@ -0,0 +1 @@
+http://blogs.perl.org/users/e_choroba/2020/05/perl-weekly-challenge-060-excel-column-and-find-numbers.html
diff --git a/challenge-060/e-choroba/perl/ch-2.pl b/challenge-060/e-choroba/perl/ch-2.pl
index d469490fd9..0894531600 100755
--- a/challenge-060/e-choroba/perl/ch-2.pl
+++ b/challenge-060/e-choroba/perl/ch-2.pl
@@ -24,7 +24,10 @@ sub extend {
 
 sub find {
     my ($length, $greater, @list) = @_;
-    return grep $greater > $_, extend($length, \@list, {});
+    my @long = grep $length == length $_, @list;
+    my %long; undef @long{@long} if @long;
+    return grep $greater > $_,
+           extend($length, \@list, \%long);
 }
 
 use Test::More;
@@ -49,4 +52,7 @@ cmp_deeply [ find(5, 30000, 1, 20, 300) ],
            bag(11111, 11120, 11201, 11300, 12011, 12020,
                13001, 20111, 20120, 20201, 20300);
 
+cmp_deeply [ find(3, 789, 123, 456, 1000) ],
+           bag(123, 456);
+
 done_testing();
diff --git a/challenge-060/mark-anderson/raku/ch-1.raku b/challenge-060/mark-anderson/raku/ch-1.raku
new file mode 100644
index 0000000000..5ad393a053
--- /dev/null
+++ b/challenge-060/mark-anderson/raku/ch-1.raku
@@ -0,0 +1,25 @@
+#!/usr/bin/env raku
+
+my %letter;
+my %number;
+
+my $number = 1;
+my $letter = "A";
+
+loop {
+    last if $number > 16384;
+
+    %letter{$number} = $letter;
+    %number{$letter} = $number;
+
+    $number++;
+    $letter++;
+}
+
+multi sub MAIN (Str $str where $str.all ~~ /<[A..Z]>/) {
+    say %number{$str};
+}
+
+multi sub MAIN (UInt $num where $num <= 16384) {
+    say %letter{$num};
+}
diff --git a/challenge-060/mark-anderson/raku/ch-2.raku b/challenge-060/mark-anderson/raku/ch-2.raku
index eb3da74c55..d3e4b676fe 100644
--- a/challenge-060/mark-anderson/raku/ch-2.raku
+++ b/challenge-060/mark-anderson/raku/ch-2.raku
@@ -9,9 +9,7 @@ sub MAIN (*@L where @L.all ~~ UInt) {
 
     my @ans = gather {
         for (10**($x-1)..^$y) -> $num {
-            my $digits = $num.comb;
-
-            if $digits (<=) $list {
+            if $num.comb (<=) $list {
                 take $num;
             }
         }
diff --git a/challenge-060/markus-holzer/raku/ch-1.raku b/challenge-060/markus-holzer/raku/ch-1.raku
index 9211ab9b99..8019730554 100644
--- a/challenge-060/markus-holzer/raku/ch-1.raku
+++ b/challenge-060/markus-holzer/raku/ch-1.raku
@@ -1,21 +1,39 @@
 use Test;
 
-sub excel-column( Int $n )
-{
-    state @digits = |('A'..'Z');
+subset ExcelColumn of Str where * ~~ / ^ <[ A .. Z ]>+ $ /;
+subset PositiveInt of Int where * > 0;
+
+multi sub MAIN( ExcelColumn $c ) { say from-excel( $c ) }
+multi sub MAIN( PositiveInt $n ) { say to-excel( $n ) }
+multi sub MAIN( Bool:D :$t  )    { run-tests; }
 
-    multi ec( Int $i where * < 26 ) { 
-	@digits[ $i ] }
+sub to-excel( PositiveInt $n )
+{
+    multi ec( Int $i where * < 26 ) {
+        ( $i + 65 ).chr }
 
     multi ec( Int $i ) {
         ec( $i div 26 - 1 ) ~ ec( $i % 26 ) }
 
-    ec( $n - 1 );
+    ec $n - 1;
 }
 
-ok excel-column( 1 ) eq 'A', 'A';
-ok excel-column( 26 ) eq 'Z', 'Z';
-ok excel-column( 27 ) eq 'AA', 'AA';
-ok excel-column( 28 ) eq 'AB', 'AB';
-ok excel-column( 26**3 + 26**2 + 26) eq 'ZZZ', 'ZZZ';
-ok excel-column( 26**3 + 26**2 + 1) eq 'ZZA', 'ZZA';
\ No newline at end of file
+sub from-excel( ExcelColumn $column )
+{
+    [+] $column.comb.map( *.ord - 64 ).reverse.kv.map: -> $i, $v {
+        26 ** $i * $v
+    }
+}
+
+sub run-tests( $n = 26**3 + 26**2 + 26 )
+{
+    for ( 'A', 'B' ... * ).kv -> $i, $v
+    {
+        last if $i == $n;
+        ok to-excel( $i + 1 ) eq $v, "to-excel({ $i + 1 })";
+        ok from-excel( $v ) eq $i + 1, "from-excel({ $v })";
+    }
+
+    dies-ok { from-excel( "AÜA" ) }, "bad input: Ü";
+    dies-ok { to-excel( 0 ) }, "bad input: 0";
+}
diff --git a/challenge-060/markus-holzer/raku/ch-2.raku b/challenge-060/markus-holzer/raku/ch-2.raku
index b5a5ece78f..d71a554a95 100644
--- a/challenge-060/markus-holzer/raku/ch-2.raku
+++ b/challenge-060/markus-holzer/raku/ch-2.raku
@@ -2,11 +2,11 @@ my @L = (0, 1, 2, 5);
 my $X = 2;
 my $Y = 21;
 
-.say for ( |@L xx 2 )
+.say for ( |@L xx $X )
     .combinations( $X )
     .map( *.join.Int )
-    .unique
     .grep( * < $Y )
     .grep( *.chars == $X )
+    .unique
     .sort
 ;
\ No newline at end of file
diff --git a/challenge-060/shawak/ruby/ch-1.rb b/challenge-060/shawak/ruby/ch-1.rb
new file mode 100644
index 0000000000..c325f4e24a
--- /dev/null
+++ b/challenge-060/shawak/ruby/ch-1.rb
@@ -0,0 +1,10 @@
+s=gets.chomp
+r=?@
+if s=~/\d+/ then
+s.to_i.times{r=r.succ}
+puts r
+else
+i=1
+(i+=1)while((r=r.succ)!=s)
+p i
+end
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index 7c28594eb3..85af07bf0f 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,35 +1,94 @@
 {
-   "xAxis" : {
-      "type" : "category"
-   },
+   "series" : [
+      {
+         "colorByPoint" : 1,
+         "name" : "Perl Weekly Challenge - 060",
+         "data" : [
+            {
+               "y" : 2,
+               "drilldown" : "Dave Jacoby",
+               "name" : "Dave Jacoby"
+            },
+            {
+               "drilldown" : "E. Choroba",
+               "name" : "E. Choroba",
+               "y" : 3
+            },
+            {
+               "y" : 5,
+               "name" : "Javier Luque",
+               "drilldown" : "Javier Luque"
+            },
+            {
+               "drilldown" : "Luca Ferrari",
+               "name" : "Luca Ferrari",
+               "y" : 4
+            },
+            {
+               "name" : "Mark Anderson",
+               "drilldown" : "Mark Anderson",
+               "y" : 2
+            },
+            {
+               "y" : 2,
+               "name" : "Markus Holzer",
+               "drilldown" : "Markus Holzer"
+            },
+            {
+               "y" : 2,
+               "drilldown" : "Mohammad S Anwar",
+               "name" : "Mohammad S Anwar"
+            },
+            {
+               "drilldown" : "Roger Bell_West",
+               "name" : "Roger Bell_West",
+               "y" : 4
+            },
+            {
+               "y" : 2,
+               "drilldown" : "Saif Ahmed",
+               "name" : "Saif Ahmed"
+            },
+            {
+               "drilldown" : "Sangeet Kar",
+               "name" : "Sangeet Kar",
+               "y" : 2
+            },
+            {
+               "drilldown" : "Ulrich Rieke",
+               "name" : "Ulrich Rieke",
+               "y" : 2
+            },
+            {
+               "name" : "Wanderdoc",
+               "drilldown" : "Wanderdoc",
+               "y" : 2
+            },
+            {
+               "y" : 2,
+               "drilldown" : "Yet Ebreo",
+               "name" : "Yet Ebreo"
+            }
+         ]
+      }
+   ],
    "subtitle" : {
-      "text" : "[Champions: 13] Last updated at 2020-05-12 08:31:04 GMT"
-   },
-   "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/>"
+      "text" : "[Champions: 13] Last updated at 2020-05-13 07:25:00 GMT"
    },
-   "plotOptions" : {
-      "series" : {
-         "borderWidth" : 0,
-         "dataLabels" : {
-            "enabled" : 1,
-            "format" : "{point.y}"
-         }
-      }
+   "legend" : {
+      "enabled" : 0
    },
    "drilldown" : {
       "series" : [
          {
+            "id" : "Dave Jacoby",
+            "name" : "Dave Jacoby",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ],
-            "id" : "Dave Jacoby",
-            "name" : "Dave Jacoby"
+            ]
          },
          {
             "name" : "E. Choroba",
@@ -38,6 +97,10 @@
                [
                   "Perl",
                   2
+               ],
+               [
+                  "Blog",
+                  1
                ]
             ]
          },
@@ -60,8 +123,6 @@
             ]
          },
          {
-            "id" : "Luca Ferrari",
-            "name" : "Luca Ferrari",
             "data" : [
                [
                   "Raku",
@@ -71,27 +132,29 @@
                   "Blog",
                   2
                ]
-            ]
+            ],
+            "name" : "Luca Ferrari",
+            "id" : "Luca Ferrari"
          },
          {
-            "name" : "Mark Anderson",
             "id" : "Mark Anderson",
+            "name" : "Mark Anderson",
             "data" : [
                [
                   "Raku",
-                  1
+                  2
                ]
             ]
          },
          {
+            "name" : "Markus Holzer",
+            "id" : "Markus Holzer",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ],
-            "name" : "Markus Holzer",
-            "id" : "Markus Holzer"
+            ]
          },
          {
             "data" : [
@@ -104,8 +167,6 @@
             "id" : "Mohammad S Anwar"
          },
          {
-            "id" : "Roger Bell_West",
-            "name" : "Roger Bell_West",
             "data" : [
                [
                   "Perl",
@@ -115,51 +176,53 @@
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "id" : "Roger Bell_West",
+            "name" : "Roger Bell_West"
          },
          {
-            "id" : "Saif Ahmed",
-            "name" : "Saif Ahmed",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "id" : "Saif Ahmed",
+            "name" : "Saif Ahmed"
          },
          {
-            "id" : "Sangeet Kar",
-            "name" : "Sangeet Kar",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "name" : "Sangeet Kar",
+            "id" : "Sangeet Kar"
          },
          {
-            "id" : "Ulrich Rieke",
-            "name" : "Ulrich Rieke",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ]
+            ],
+            "name" : "Ulrich Rieke",
+            "id" : "Ulrich Rieke"
          },
          {
+            "name" : "Wanderdoc",
+            "id" : "Wanderdoc",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ],
-            "id" : "Wanderdoc",
-            "name" : "Wanderdoc"
+            ]
          },
          {
-            "id" : "Yet Ebreo",
             "name" : "Yet Ebreo",
+            "id" : "Yet Ebreo",
             "data" : [
                [
                   "Perl",
@@ -169,84 +232,25 @@
          }
       ]
    },
-   "series" : [
-      {
-         "data" : [
-            {
-               "drilldown" : "Dave Jacoby",
-               "y" : 2,
-               "name" : "Dave Jacoby"
-            },
-            {
-               "drilldown" : "E. Choroba",
-               "y" : 2,
-               "name" : "E. Choroba"
-            },
-            {
-               "name" : "Javier Luque",
-               "y" : 5,
-               "drilldown" : "Javier Luque"
-            },
-            {
-               "drilldown" : "Luca Ferrari",
-               "y" : 4,
-               "name" : "Luca Ferrari"
-            },
-            {
-               "name" : "Mark Anderson",
-               "y" : 1,
-               "drilldown" : "Mark Anderson"
-            },
-            {
-               "y" : 2,
-               "name" : "Markus Holzer",
-               "drilldown" : "Markus Holzer"
-            },
-            {
-               "drilldown" : "Mohammad S Anwar",
-               "y" : 2,
-               "name" : "Mohammad S Anwar"
-            },
-            {
-               "drilldown" : "Roger Bell_West",
-               "y" : 4,
-               "name" : "Roger Bell_West"
-            },
-            {
-               "name" : "Saif Ahmed",
-               "y" : 2,
-               "drilldown" : "Saif Ahmed"
-            },
-            {
-               "drilldown" : "Sangeet Kar",
-               "y" : 2,
-               "name" : "Sangeet Kar"
-            },
-            {
-               "drilldown" : "Ulrich Rieke",
-               "name" : "Ulrich Rieke",
-               "y" : 2
-            },
-            {
-               "drilldown" : "Wanderdoc",
-               "y" : 2,
-               "name" : "Wanderdoc"
-            },
-            {
-               "y" : 2,
-               "name" : "Yet Ebreo",
-               "drilldown" : "Yet Ebreo"
-            }
-         ],
-         "name" : "Perl Weekly Challenge - 060",
-         "colorByPoint" : 1
-      }
-   ],
+   "xAxis" : {
+      "type" : "category"
+   },
    "chart" : {
       "type" : "column"
    },
-   "legend" : {
-      "enabled" : 0
+   "plotOptions" : {
+      "series" : {
+         "dataLabels" : {
+            "enabled" : 1,
+            "format" : "{point.y}"
+         },
+         "borderWidth" : 0
+      }
+   },
+   "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/>"
    },
    "yAxis" : {
       "title" : {
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index 0f9a7f5506..c4430541d5 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,26 +1,34 @@
 {
-   "subtitle" : {
-      "text" : "Last updated at 2020-05-12 08:31:04 GMT"
+   "yAxis" : {
+      "min" : 0,
+      "title" : {
+         "text" : null
+      }
    },
    "tooltip" : {
       "pointFormat" : "<b>{point.y:.0f}</b>"
    },
+   "title" : {
+      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
+   },
+   "chart" : {
+      "type" : "column"
+   },
    "xAxis" : {
       "labels" : {
          "style" : {
-            "fontFamily" : "Verdana, sans-serif",
-            "fontSize" : "13px"
+            "fontSize" : "13px",
+            "fontFamily" : "Verdana, sans-serif"
          }
       },
       "type" : "category"
    },
    "series" : [
       {
-         "name" : "Contributions",
          "data" : [
             [
                "Blog",
-               680
+               681
             ],
             [
                "Perl",
@@ -28,36 +36,28 @@
             ],
             [
                "Raku",
-               1581
+               1582
             ]
          ],
+         "name" : "Contributions",
          "dataLabels" : {
-            "align" : "right",
+            "format" : "{point.y:.0f}",
             "enabled" : "true",
-            "y" : 10,
-            "color" : "#FFFFFF",
+            "align" : "right",
             "rotation" : -90,
-            "format" : "{point.y:.0f}",
+            "color" : "#FFFFFF",
+            "y" : 10,
             "style" : {
-               "fontFamily" : "Verdana, sans-serif",
-               "fontSize" : "13px"
+               "fontSize" : "13px",
+               "fontFamily" : "Verdana, sans-serif"
             }
          }
       }
    ],
-   "chart" : {
-      "type" : "column"
+   "subtitle" : {
+      "text" : "Last updated at 2020-05-13 07:25:00 GMT"
    },
    "legend" : {
       "enabled" : "false"
-   },
-   "title" : {
-      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
-   },
-   "yAxis" : {
-      "title" : {
-         "text" : null
-      },
-      "min" : 0
    }
 }
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index a8dedb2791..df65568cad 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -2,336 +2,9 @@
    "xAxis" : {
       "type" : "category"
    },
-   "subtitle" : {
-      "text" : "Click the columns to drilldown the language breakdown. Last updated at 2020-05-12 08:31:04 GMT"
-   },
-   "tooltip" : {
-      "followPointer" : "true",
-      "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>",
-      "headerFormat" : "<span style=\"font-size:11px\"></span>"
-   },
-   "plotOptions" : {
-      "series" : {
-         "dataLabels" : {
-            "enabled" : 1,
-            "format" : "{point.y}"
-         },
-         "borderWidth" : 0
-      }
-   },
-   "series" : [
-      {
-         "data" : [
-            {
-               "name" : "#001",
-               "y" : 142,
-               "drilldown" : "001"
-            },
-            {
-               "name" : "#002",
-               "y" : 109,
-               "drilldown" : "002"
-            },
-            {
-               "drilldown" : "003",
-               "name" : "#003",
-               "y" : 71
-            },
-            {
-               "drilldown" : "004",
-               "name" : "#004",
-               "y" : 91
-            },
-            {
-               "drilldown" : "005",
-               "name" : "#005",
-               "y" : 72
-            },
-            {
-               "drilldown" : "006",
-               "name" : "#006",
-               "y" : 52
-            },
-            {
-               "y" : 59,
-               "name" : "#007",
-               "drilldown" : "007"
-            },
-            {
-               "drilldown" : "008",
-               "name" : "#008",
-               "y" : 72
-            },
-            {
-               "drilldown" : "009",
-               "name" : "#009",
-               "y" : 68
-            },
-            {
-               "drilldown" : "010",
-               "y" : 60,
-               "name" : "#010"
-            },
-            {
-               "drilldown" : "011",
-               "name" : "#011",
-               "y" : 79
-            },
-            {
-               "y" : 83,
-               "name" : "#012",
-               "drilldown" : "012"
-            },
-            {
-               "drilldown" : "013",
-               "name" : "#013",
-               "y" : 76
-            },
-            {
-               "y" : 96,
-               "name" : "#014",
-               "drilldown" : "014"
-            },
-            {
-               "y" : 93,
-               "name" : "#015",
-               "drilldown" : "015"
-            },
-            {
-               "y" : 66,
-               "name" : "#016",
-               "drilldown" : "016"
-            },
-            {
-               "y" : 79,
-               "name" : "#017",
-               "drilldown" : "017"
-            },
-            {
-               "name" : "#018",
-               "y" : 76,
-               "drilldown" : "018"
-            },
-            {
-               "drilldown" : "019",
-               "name" : "#019",
-               "y" : 97
-            },
-            {
-               "drilldown" : "020",
-               "y" : 95,
-               "name" : "#020"
-            },
-            {
-               "y" : 67,
-               "name" : "#021",
-               "drilldown" : "021"
-            },
-            {
-               "drilldown" : "022",
-               "y" : 63,
-               "name" : "#022"
-            },
-            {
-               "drilldown" : "023",
-               "y" : 91,
-               "name" : "#023"
-            },
-            {
-               "y" : 70,
-               "name" : "#024",
-               "drilldown" : "024"
-            },
-            {
-               "drilldown" : "025",
-               "name" : "#025",
-               "y" : 55
-            },
-            {
-               "drilldown" : "026",
-               "name" : "#026",
-               "y" : 70
-            },
-            {
-               "drilldown" : "027",
-               "name" : "#027",
-               "y" : 58
-            },
-            {
-               "drilldown" : "028",
-               "y" : 78,
-               "name" : "#028"
-            },
-            {
-               "drilldown" : "029",
-               "name" : "#029",
-               "y" : 77
-            },
-            {
-               "drilldown" : "030",
-               "y" : 115,
-               "name" : "#030"
-            },
-            {
-               "drilldown" : "031",
-               "name" : "#031",
-               "y" : 87
-            },
-            {
-               "drilldown" : "032",
-               "y" : 92,
-               "name" : "#032"
-            },
-            {
-               "drilldown" : "033",
-               "name" : "#033",
-               "y" : 108
-            },
-            {
-               "y" : 62,
-               "name" : "#034",
-               "drilldown" : "034"
-            },
-            {
-               "drilldown" : "035",
-               "name" : "#035",
-               "y" : 62
-            },
-            {
-               "name" : "#036",
-               "y" : 66,
-               "drilldown" : "036"
-            },
-            {
-               "name" : "#037",
-               "y" : 65,
-               "drilldown" : "037"
-            },
-            {
-               "drilldown" : "038",
-               "y" : 65,
-               "name" : "#038"
-            },
-            {
-               "drilldown" : "039",
-               "name" : "#039",
-               "y" : 60
-            },
-            {
-               "y" : 71,
-               "name" : "#040",
-               "drilldown" : "040"
-            },
-            {
-               "drilldown" : "041",
-               "name" : "#041",
-               "y" : 74
-            },
-            {
-               "y" : 88,
-               "name" : "#042",
-               "drilldown" : "042"
-            },
-            {
-               "y" : 66,
-               "name" : "#043",
-               "drilldown" : "043"
-            },
-            {
-               "drilldown" : "044",
-               "y" : 82,
-               "name" : "#044"
-            },
-            {
-               "drilldown" : "045",
-               "name" : "#045",
-               "y" : 94
-            },
-            {
-               "drilldown" : "046",
-               "name" : "#046",
-               "y" : 85
-            },
-            {
-               "y" : 82,
-               "name" : "#047",
-               "drilldown" : "047"
-            },
-            {
-               "drilldown" : "048",
-               "name" : "#048",
-               "y" : 106
-            },
-            {
-               "drilldown" : "049",
-               "name" : "#049",
-               "y" : 85
-            },
-            {
-               "name" : "#050",
-               "y" : 96,
-               "drilldown" : "050"
-            },
-            {
-               "name" : "#051",
-               "y" : 87,
-               "drilldown" : "051"
-            },
-            {
-               "y" : 89,
-               "name" : "#052",
-               "drilldown" : "052"
-            },
-            {
-               "name" : "#053",
-               "y" : 99,
-               "drilldown" : "053"
-            },
-            {
-               "drilldown" : "054",
-               "y" : 99,
-               "name" : "#054"
-            },
-            {
-               "drilldown" : "055",
-               "name" : "#055",
-               "y" : 86
-            },
-            {
-               "drilldown" : "056",
-               "y" : 93,
-               "name" : "#056"
-            },
-            {
-               "name" : "#057",
-               "y" : 78,
-               "drilldown" : "057"
-            },
-            {
-               "drilldown" : "058",
-               "name" : "#058",
-               "y" : 61
-            },
-            {
-               "drilldown" : "059",
-               "name" : "#059",
-               "y" : 82
-            },
-            {
-               "drilldown" : "060",
-               "name" : "#060",
-               "y" : 32
-            }
-         ],
-         "name" : "Perl Weekly Challenge Languages",
-         "colorByPoint" : "true"
-      }
-   ],
    "drilldown" : {
       "series" : [
          {
-            "name" : "001",
-            "id" : "001",
             "data" : [
                [
                   "Perl",
@@ -345,11 +18,11 @@
                   "Blog",
                   11
                ]
-            ]
+            ],
+            "name" : "001",
+            "id" : "001"
          },
          {
-            "name" : "002",
-            "id" : "002",
             "data" : [
                [
                   "Perl",
@@ -363,7 +36,9 @@
                   "Blog",
                   10
                ]
-            ]
+            ],
+            "id" : "002",
+            "name" : "002"
          },
          {
             "data" : [
@@ -380,10 +55,12 @@
                   9
                ]
             ],
-            "name" : "003",
-            "id" : "003"
+            "id" : "003",
+            "name" : "003"
          },
          {
+            "name" : "004",
+            "id" : "004",
             "data" : [
                [
                   "Perl",
@@ -397,13 +74,9 @@
                   "Blog",
                   10
                ]
-            ],
-            "name" : "004",
-            "id" : "004"
+            ]
          },
          {
-            "name" : "005",
-            "id" : "005",
             "data" : [
                [
                   "Perl",
@@ -417,11 +90,13 @@
                   "Blog",
                   12
                ]
-            ]
+            ],
+            "id" : "005",
+            "name" : "005"
          },
          {
-            "id" : "006",