aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad S Anwar <mohammad.anwar@yahoo.com>2021-12-21 17:39:30 +0000
committerMohammad S Anwar <mohammad.anwar@yahoo.com>2021-12-21 17:39:30 +0000
commit52b76b289e7244237cd28bb3e271cb783a3c6dad (patch)
tree3af814747d587116c0d99dca352a06d62d03b01d
parent35d8e65a554ae986f5fc2167970309c635d9e050 (diff)
downloadperlweeklychallenge-club-52b76b289e7244237cd28bb3e271cb783a3c6dad.tar.gz
perlweeklychallenge-club-52b76b289e7244237cd28bb3e271cb783a3c6dad.tar.bz2
perlweeklychallenge-club-52b76b289e7244237cd28bb3e271cb783a3c6dad.zip
- Added solutions by Ulrich Rieke.
-rw-r--r--challenge-144/ulrich-rieke/haskell/ch-1.hs18
-rw-r--r--challenge-144/ulrich-rieke/haskell/ch-2.hs19
-rw-r--r--challenge-144/ulrich-rieke/perl/ch-1.pl37
-rw-r--r--challenge-144/ulrich-rieke/perl/ch-2.pl58
-rw-r--r--challenge-144/ulrich-rieke/raku/ch-1.raku11
-rw-r--r--challenge-144/ulrich-rieke/raku/ch-2.raku37
-rw-r--r--stats/pwc-current.json111
-rw-r--r--stats/pwc-language-breakdown-summary.json64
-rw-r--r--stats/pwc-language-breakdown.json840
-rw-r--r--stats/pwc-leaders.json370
-rw-r--r--stats/pwc-summary-1-30.json102
-rw-r--r--stats/pwc-summary-121-150.json108
-rw-r--r--stats/pwc-summary-151-180.json34
-rw-r--r--stats/pwc-summary-181-210.json118
-rw-r--r--stats/pwc-summary-211-240.json46
-rw-r--r--stats/pwc-summary-241-270.json48
-rw-r--r--stats/pwc-summary-31-60.json38
-rw-r--r--stats/pwc-summary-61-90.json40
-rw-r--r--stats/pwc-summary-91-120.json42
-rw-r--r--stats/pwc-summary.json46
20 files changed, 1193 insertions, 994 deletions
diff --git a/challenge-144/ulrich-rieke/haskell/ch-1.hs b/challenge-144/ulrich-rieke/haskell/ch-1.hs
new file mode 100644
index 0000000000..cf9264c44a
--- /dev/null
+++ b/challenge-144/ulrich-rieke/haskell/ch-1.hs
@@ -0,0 +1,18 @@
+module Challenge144
+ where
+import Data.List ( subsequences , sort )
+
+solution :: [Int]
+solution = sort $ filter ( <= 100 ) ((map ( ^ 2 ) primes) ++ theList)
+ where
+ theList :: [Int]
+ theList = map product $ filter( (== 2) . length )
+ $ subsequences primes
+ primes :: [Int]
+ primes = filter isPrime [2 .. 100]
+
+divisors :: Int -> [Int]
+divisors n = filter (\i -> mod n i == 0 ) [1 .. n]
+
+isPrime :: Int -> Bool
+isPrime n = divisors n == [1 , n]
diff --git a/challenge-144/ulrich-rieke/haskell/ch-2.hs b/challenge-144/ulrich-rieke/haskell/ch-2.hs
new file mode 100644
index 0000000000..92ee606c2f
--- /dev/null
+++ b/challenge-144/ulrich-rieke/haskell/ch-2.hs
@@ -0,0 +1,19 @@
+module Challenge144_2
+ where
+import Data.List ( sort , subsequences )
+
+count :: Eq a => [a] -> a -> Int
+count list num = length $ filter ( (== num) ) list
+
+addUlam :: [Int] -> [Int]
+addUlam list
+ |length list == 2 = list ++ [sum list]
+ |otherwise = list ++ [head $ filter (\s -> (count sums s == 1) &&
+ s > last list) sums]
+ where
+ sums :: [Int]
+ sums = sort $ map sum $ filter ( (== 2 ) . length ) $ subsequences list
+
+solution :: Int -> Int -> [Int]
+solution u v = head $ dropWhile( (< 10 ) . length ) $ iterate
+addUlam [u , v]
diff --git a/challenge-144/ulrich-rieke/perl/ch-1.pl b/challenge-144/ulrich-rieke/perl/ch-1.pl
new file mode 100644
index 0000000000..7784e9cd2b
--- /dev/null
+++ b/challenge-144/ulrich-rieke/perl/ch-1.pl
@@ -0,0 +1,37 @@
+#!/usr/bin/perl ;
+use strict ;
+use warnings ;
+use Algorithm::Combinatorics qw ( combinations ) ;
+use POSIX ;
+use feature 'say' ;
+
+sub isPrime {
+ my $number = shift ;
+ if ( $number == 2 ) {
+ return 1 ;
+ }
+ else {
+ my $limit = floor(sqrt( $number )) + 1 ;
+ my $current = 2 ;
+ while ( $current < $limit ) {
+ if ( $number % $current == 0 ) {
+ return 0 ;
+ }
+ $current++ ;
+ }
+ }
+ return 1 ;
+}
+
+my @primes = grep { isPrime( $_ )} (2 .. 100 ) ;
+my @products ;
+my $iter = combinations( \@primes , 2 ) ;
+while ( my $c = $iter->next ) {
+ push @products , $c->[0] * $c->[1] ;
+}
+my @smallPrimes = grep { $_ < 12 } @primes ;
+for my $num ( @smallPrimes ) {
+ push @products , $num * $num ;
+}
+my @sorted = sort { $a <=> $b } @products ;
+say join( ',' , grep { $_ <= 100 } @sorted ) ;
diff --git a/challenge-144/ulrich-rieke/perl/ch-2.pl b/challenge-144/ulrich-rieke/perl/ch-2.pl
new file mode 100644
index 0000000000..6d1e8377fe
--- /dev/null
+++ b/challenge-144/ulrich-rieke/perl/ch-2.pl
@@ -0,0 +1,58 @@
+#!/usr/bin/perl ;
+use strict ;
+use warnings ;
+use feature 'say' ;
+use Algorithm::Combinatorics qw ( combinations ) ;
+use List::Util qw ( sum ) ;
+
+sub count {
+ my $array = shift ;
+ my $number = shift ;
+ my $counted = 0 ;
+ my @lookIn = @$array ;
+ for my $elem( @lookIn ) {
+ if ( $elem == $number ) {
+ $counted++ ;
+ }
+ }
+ return $counted ;
+}
+
+my $u = $ARGV[ 0 ] ;
+my $v = $ARGV[ 1 ] ;
+while ( $u !~ /\A\d+\z/ || $v !~ /\A\d+\z/ ) {
+ say "Please enter 2 integers!" ;
+ $u = <STDIN> ;
+ chomp $u ;
+ $v = <STDIN> ;
+ chomp $v ;
+}
+my @ulams ;
+push @ulams , $u , $v ;
+@ulams = sort { $a <=> $b } @ulams ;
+while ( scalar( @ulams ) < 10 ) {
+ if ( scalar( @ulams ) == 2 ) {
+ push @ulams, $ulams[0] + $ulams[ 1 ] ;
+ }
+ else {
+ my @sums ;
+ my $iter = combinations( \@ulams, 2 ) ;
+ while ( my $c = $iter->next ) {
+ push @sums , sum( @$c ) ;
+ }
+ my @sorted = sort { $a <=> $b } @sums ;
+ my $elements = scalar( @sorted ) ;
+ my $i = 0 ;
+ while ( $i < $elements ) {
+ if ( $sorted[ $i ] > $ulams[ -1 ] && count( \@sorted ,
+ $sorted[ $i ] ) == 1 ) {
+ push @ulams, $sorted[ $i ] ;
+ last ;
+ }
+ else {
+ $i++ ;
+ }
+ }
+ }
+}
+say join( ',' , @ulams ) ;
diff --git a/challenge-144/ulrich-rieke/raku/ch-1.raku b/challenge-144/ulrich-rieke/raku/ch-1.raku
new file mode 100644
index 0000000000..50a1ae82a8
--- /dev/null
+++ b/challenge-144/ulrich-rieke/raku/ch-1.raku
@@ -0,0 +1,11 @@
+use v6 ;
+
+my @semiprimes ;
+my @primes = (2 .. 100).grep( { .is-prime} ) ;
+my @combis = @primes.combinations( 2 ).map( { $_[0] * $_[1] } ) ;
+for @primes -> $prime {
+ @combis.push( $prime * $prime ) ;
+}
+@combis .= sort ;
+my @solution = @combis.grep( { $_ <= 100 } ) ;
+say @solution ;
diff --git a/challenge-144/ulrich-rieke/raku/ch-2.raku b/challenge-144/ulrich-rieke/raku/ch-2.raku
new file mode 100644
index 0000000000..2bf1be0a2a
--- /dev/null
+++ b/challenge-144/ulrich-rieke/raku/ch-2.raku
@@ -0,0 +1,37 @@
+use v6 ;
+
+sub count( @array , Int $needle ) {
+ my $counted = 0 ;
+ for @array -> $number {
+ if ( $number == $needle ) {
+ $counted++ ;
+ }
+ }
+ return $counted ;
+}
+
+sub MAIN( Int $u , Int $v ) {
+ my @ulams = ( $u , $v ).sort( { $^a <=> $^b } ) ;
+ while ( @ulams.elems < 10 ) {
+ if ( @ulams.elems == 2 ) {
+ @ulams.push( [+] @ulams ) ;
+ }
+ else {
+ my @combis = @ulams.combinations( 2 ) ;
+ my @sums = @combis.map( {$_[0] + $_[1] } ).sort ;
+ my $elements = @sums.elems ;
+ my $i = 0 ;
+ while ( $i < $elements ) {
+ if ( @sums[ $i ] > @ulams[ *-1 ] && count( @sums , @sums[ $i ] )
+ == 1 ) {
+ @ulams.push( @sums[ $i ] ) ;
+ last ;
+ }
+ else {
+ $i++ ;
+ }
+ }
+ }
+ }
+ say @ulams ;
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index d0b5eb6953..deb49aaf37 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,7 +1,11 @@
{
+ "xAxis" : {
+ "type" : "category"
+ },
"drilldown" : {
"series" : [
{
+ "name" : "Dave Jacoby",
"id" : "Dave Jacoby",
"data" : [
[
@@ -12,20 +16,20 @@
"Blog",
1
]
- ],
- "name" : "Dave Jacoby"
+ ]
},
{
+ "name" : "E. Choroba",
"id" : "E. Choroba",
"data" : [
[
"Perl",
2
]
- ],
- "name" : "E. Choroba"
+ ]
},
{
+ "id" : "Luca Ferrari",
"data" : [
[
"Raku",
@@ -36,31 +40,30 @@
4
]
],
- "id" : "Luca Ferrari",
"name" : "Luca Ferrari"
},
{
"name" : "Mark Anderson",
+ "id" : "Mark Anderson",
"data" : [
[
"Raku",
1
]
- ],
- "id" : "Mark Anderson"
+ ]
},
{
+ "name" : "Paulo Custodio",
+ "id" : "Paulo Custodio",
"data" : [
[
"Perl",
2
]
- ],
- "id" : "Paulo Custodio",
- "name" : "Paulo Custodio"
+ ]
},
{
- "name" : "Peter Campbell Smith",
+ "id" : "Peter Campbell Smith",
"data" : [
[
"Perl",
@@ -71,11 +74,10 @@
1
]
],
- "id" : "Peter Campbell Smith"
+ "name" : "Peter Campbell Smith"
},
{
"name" : "Roger Bell_West",
- "id" : "Roger Bell_West",
"data" : [
[
"Perl",
@@ -89,33 +91,42 @@
"Blog",
1
]
- ]
+ ],
+ "id" : "Roger Bell_West"
+ },
+ {
+ "data" : [
+ [
+ "Perl",
+ 2
+ ],
+ [
+ "Raku",
+ 2
+ ]
+ ],
+ "id" : "Ulrich Rieke",
+ "name" : "Ulrich Rieke"
}
]
},
- "title" : {
- "text" : "The Weekly Challenge - 144"
- },
- "subtitle" : {
- "text" : "[Champions: 7] Last updated at 2021-12-21 16:42:45 GMT"
- },
"series" : [
{
"data" : [
{
"drilldown" : "Dave Jacoby",
- "y" : 3,
- "name" : "Dave Jacoby"
+ "name" : "Dave Jacoby",
+ "y" : 3
},
{
- "y" : 2,
+ "drilldown" : "E. Choroba",
"name" : "E. Choroba",
- "drilldown" : "E. Choroba"
+ "y" : 2
},
{
- "drilldown" : "Luca Ferrari",
"name" : "Luca Ferrari",
- "y" : 6
+ "y" : 6,
+ "drilldown" : "Luca Ferrari"
},
{
"drilldown" : "Mark Anderson",
@@ -128,25 +139,39 @@
"drilldown" : "Paulo Custodio"
},
{
- "drilldown" : "Peter Campbell Smith",
"name" : "Peter Campbell Smith",
- "y" : 3
+ "y" : 3,
+ "drilldown" : "Peter Campbell Smith"
},
{
- "y" : 5,
+ "drilldown" : "Roger Bell_West",
"name" : "Roger Bell_West",
- "drilldown" : "Roger Bell_West"
+ "y" : 5
+ },
+ {
+ "drilldown" : "Ulrich Rieke",
+ "y" : 4,
+ "name" : "Ulrich Rieke"
}
],
- "colorByPoint" : 1,
- "name" : "The Weekly Challenge - 144"
+ "name" : "The Weekly Challenge - 144",
+ "colorByPoint" : 1
}
],
- "chart" : {
- "type" : "column"
+ "subtitle" : {
+ "text" : "[Champions: 8] Last updated at 2021-12-21 17:05:32 GMT"
},
- "xAxis" : {
- "type" : "category"
+ "plotOptions" : {
+ "series" : {
+ "dataLabels" : {
+ "format" : "{point.y}",
+ "enabled" : 1
+ },
+ "borderWidth" : 0
+ }
+ },
+ "title" : {
+ "text" : "The Weekly Challenge - 144"
},
"legend" : {
"enabled" : 0
@@ -156,18 +181,12 @@
"text" : "Total Solutions"
}
},
- "plotOptions" : {
- "series" : {
- "dataLabels" : {
- "format" : "{point.y}",
- "enabled" : 1
- },
- "borderWidth" : 0
- }
+ "chart" : {
+ "type" : "column"
},
"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,
- "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>"
+ "followPointer" : 1
}
}
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index c884369ce1..b2d9930113 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,18 +1,21 @@
{
- "subtitle" : {
- "text" : "Last updated at 2021-12-21 16:42:45 GMT"
- },
"title" : {
"text" : "The Weekly Challenge Contributions [2019 - 2021]"
},
- "xAxis" : {
- "labels" : {
- "style" : {
- "fontSize" : "13px",
- "fontFamily" : "Verdana, sans-serif"
- }
- },
- "type" : "category"
+ "legend" : {
+ "enabled" : "false"
+ },
+ "yAxis" : {
+ "min" : 0,
+ "title" : {
+ "text" : null
+ }
+ },
+ "tooltip" : {
+ "pointFormat" : "<b>{point.y:.0f}</b>"
+ },
+ "chart" : {
+ "type" : "column"
},
"series" : [
{
@@ -23,41 +26,38 @@
],
[
"Perl",
- 6909
+ 6911
],
[
"Raku",
- 4170
+ 4172
]
],
"dataLabels" : {
- "align" : "right",
- "rotation" : -90,
- "color" : "#FFFFFF",
- "enabled" : "true",
- "format" : "{point.y:.0f}",
"style" : {
"fontFamily" : "Verdana, sans-serif",
"fontSize" : "13px"
},
- "y" : 10
+ "color" : "#FFFFFF",
+ "format" : "{point.y:.0f}",
+ "rotation" : -90,
+ "y" : 10,
+ "enabled" : "true",
+ "align" : "right"
},
"name" : "Contributions"
}
],
- "chart" : {
- "type" : "column"
- },
- "tooltip" : {
- "pointFormat" : "<b>{point.y:.0f}</b>"
- },
- "legend" : {
- "enabled" : "false"
+ "subtitle" : {
+ "text" : "Last updated at 2021-12-21 17:05:32 GMT"
},
- "yAxis" : {
- "title" : {
- "text" : null
- },
- "min" : 0
+ "xAxis" : {
+ "type" : "category",
+ "labels" : {
+ "style" : {
+ "fontFamily" : "Verdana, sans-serif",
+ "fontSize" : "13px"
+ }
+ }
}
}
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index b357eb145a..091aec9f6b 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,78 +1,70 @@
{
+ "title" : {
+ "text" : "The Weekly Challenge Language"
+ },
"legend" : {
"enabled" : "false"
},
- "yAxis" : {
- "title" : {
- "text" : "Total Solutions"
- }
- },
- "plotOptions" : {
- "series" : {
- "dataLabels" : {
- "format" : "{point.y}",
- "enabled" : 1
- },
- "borderWidth" : 0
- }
+ "chart" : {
+ "type" : "column"
},
"tooltip" : {
- "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>",
+ "followPointer" : "true",
"headerFormat" : "<span style=\"font-size:11px\"></span>",
- "followPointer" : "true"
+ "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>"
},
- "chart" : {
- "type" : "column"
+ "yAxis" : {
+ "title" : {
+ "text" : "Total Solutions"
+ }
},
"series" : [
{
- "name" : "The Weekly Challenge Languages",
- "colorByPoint" : "true",
"data" : [
{
- "drilldown" : "001",
"y" : 161,
- "name" : "#001"
+ "name" : "#001",
+ "drilldown" : "001"
},
{
"drilldown" : "002",
- "y" : 125,
- "name" : "#002"
+ "name" : "#002",
+ "y" : 125
},
{
- "y" : 83,
"name" : "#003",
+ "y" : 83,
"drilldown" : "003"
},
{
"drilldown" : "004",
- "name" : "#004",
- "y" : 99
+ "y" : 99,
+ "name" : "#004"
},
{
+ "drilldown" : "005",
"y" : 78,
- "name" : "#005",
- "drilldown" : "005"
+ "name" : "#005"
},
{
- "drilldown" : "006",
+ "name" : "#006",
"y" : 58,
- "name" : "#006"
+ "drilldown" : "006"
},
{
- "drilldown" : "007",
"name" : "#007",
- "y" : 64
+ "y" : 64,
+ "drilldown" : "007"
},
{
"drilldown" : "008",
- "name" : "#008",
- "y" : 78
+ "y" : 78,
+ "name" : "#008"
},
{
- "drilldown" : "009",
"name" : "#009",
- "y" : 76
+ "y" : 76,
+ "drilldown" : "009"
},
{
"name" : "#010",
@@ -80,14 +72,14 @@
"drilldown" : "010"
},
{
- "y" : 85,
+ "drilldown" : "011",
"name" : "#011",
- "drilldown" : "011"
+ "y" : 85
},
{
"drilldown" : "012",
- "name" : "#012",
- "y" : 89
+ "y" : 89,
+ "name" : "#012"
},
{
"drilldown" : "013",
@@ -95,8 +87,8 @@
"name" : "#013"
},
{
- "name" : "#014",
"y" : 101,
+ "name" : "#014",
"drilldown" : "014"
},
{
@@ -110,9 +102,9 @@
"drilldown" : "016"
},
{
+ "drilldown" : "017",
"name" : "#017",
- "y" : 84,
- "drilldown" : "017"
+ "y" : 84
},
{
"y" : 81,
@@ -120,19 +112,19 @@
"drilldown" : "018"
},
{
- "drilldown" : "019",
+ "y" : 103,
"name" : "#019",
- "y" : 103
+ "drilldown" : "019"
},
{
+ "drilldown" : "020",
"name" : "#020",
- "y" : 101,
- "drilldown" : "020"
+ "y" : 101
},
{
- "y" : 72,
+ "drilldown" : "021",
"name" : "#021",
- "drilldown" : "021"
+ "y" : 72
},
{
"name" : "#022",
@@ -145,8 +137,8 @@
"drilldown" : "023"
},
{
- "name" : "#024",
"y" : 75,
+ "name" : "#024",
"drilldown" : "024"
},
{
@@ -155,19 +147,19 @@
"drilldown" : "025"
},
{
- "drilldown" : "026",
"y" : 74,
- "name" : "#026"
+ "name" : "#026",
+ "drilldown" : "026"
},
{
- "drilldown" : "027",
+ "y" : 62,
"name" : "#027",
- "y" : 62
+ "drilldown" : "027"
},
{
- "y" : 82,
+ "drilldown" : "028",
"name" : "#028",
- "drilldown" : "028"
+ "y" : 82
},
{
"drilldown" : "029",
@@ -180,9 +172,9 @@
"name" : "#030"
},
{
- "name" : "#031",
+ "drilldown" : "031",
"y" : 89,
- "drilldown" : "031"
+ "name" : "#031"
},
{
"drilldown" : "032",
@@ -191,58 +183,58 @@
},
{
"drilldown" : "033",
- "name" : "#033",
- "y" : 110
+ "y" : 110,
+ "name" : "#033"
},
{
- "drilldown" : "034",
+ "y" : 64,
"name" : "#034",
- "y" : 64
+ "drilldown" : "034"
},
{
"drilldown" : "035",
- "y" : 64,
- "name" : "#035"
+ "name" : "#035",
+ "y" : 64
},
{
- "drilldown" : "036",
+ "name" : "#036",
"y" : 68,
- "name" : "#036"
+ "drilldown" : "036"
},
{
- "drilldown" : "037",
+ "y" : 67,
"name" : "#037",
- "y" : 67
+ "drilldown" : "037"
},
{
- "drilldown" : "038",
"name" : "#038",
- "y" : 68
+ "y" : 68,
+ "drilldown" : "038"
},
{
- "name" : "#039",
+ "drilldown" : "039",
"y" : 62,
- "drilldown" : "039"
+ "name" : "#039"
},
{
- "y" : 73,
"name" : "#040",
+ "y" : 73,
"drilldown" : "040"
},
{
- "drilldown" : "041",
"y" : 76,
- "name" : "#041"
+ "name" : "#041",
+ "drilldown" : "041"
},
{
"drilldown" : "042",
- "y" : 92,
- "name" : "#042"
+ "name" : "#042",
+ "y" : 92
},
{
"drilldown" : "043",
- "name" : "#043",
- "y" : 68
+ "y" : 68,
+ "name" : "#043"
},
{
"drilldown" : "044",
@@ -250,39 +242,39 @@
"name" : "#044"
},
{
- "name" : "#045",
+ "drilldown" : "045",
"y" : 96,
- "drilldown" : "045"
+ "name" : "#045"
},
{
- "drilldown" : "046",
"name" : "#046",
- "y" : 87
+ "y" : 87,
+ "drilldown" : "046"
},
{
- "y" : 84,
"name" : "#047",
+ "y" : 84,
"drilldown" : "047"
},
{
- "y" : 108,
+ "drilldown" : "048",
"name" : "#048",
- "drilldown" : "048"
+ "y" : 108
},
{
- "drilldown" : "049",
"name" : "#049",
- "y" : 89
+ "y" : 89,
+ "drilldown" : "049"
},
{
- "drilldown" : "050",
+ "name" : "#050",
"y" : 98,
- "name" : "#050"
+ "drilldown" : "050"
},
{
- "y" : 89,
+ "drilldown" : "051",
"name" : "#051",
- "drilldown" : "051"
+ "y" : 89
},
{
"y" : 91,
@@ -295,8 +287,8 @@
"name" : "#053"
},
{
- "name" : "#054",
"y" : 103,
+ "name" : "#054",
"drilldown" : "054"
},
{
@@ -305,14 +297,14 @@
"name" : "#055"
},
{
- "drilldown" : "056",
+ "y" : 95,
"name" : "#056",
- "y" : 95
+ "drilldown" : "056"
},
{
- "drilldown" : "057",
"y" : 80,
- "name" : "#057"
+ "name" : "#057",
+ "drilldown" : "057"
},
{
"name" : "#058",
@@ -325,24 +317,24 @@
"y" : 89
},
{
- "name" : "#060",
"y" : 85,
+ "name" : "#060",
"drilldown" : "060"
},
{
"drilldown" : "061",
- "y" : 81,
- "name" : "#061"
+ "name" : "#061",
+ "y" : 81
},
{
- "drilldown" : "062",
+ "y" : 58,
"name" : "#062",
- "y" : 58
+ "drilldown" : "062"
},
{
"drilldown" : "063",
- "name" : "#063",
- "y" : 89
+ "y" : 89,
+ "name" : "#063"
},
{
"name" : "#064",
@@ -350,9 +342,9 @@
"drilldown" : "064"
},
{
- "name" : "#065",
+ "drilldown" : "065",
"y" : 73,
- "drilldown" : "065"
+ "name" : "#065"
},
{
"drilldown" : "066",
@@ -365,18 +357,18 @@
"y" : 90
},
{
- "y" : 75,
"name" : "#068",
+ "y" : 75,
"drilldown" : "068"
},
{
- "name" : "#069",
+ "drilldown" : "069",
"y" : 83,
- "drilldown" : "069"
+ "name" : "#069"
},
{
- "name" : "#070",
"y" : 93,
+ "name" : "#070",
"drilldown" : "070"
},
{
@@ -386,23 +378,23 @@
},
{
"drilldown" : "072",
- "name" : "#072",
- "y" : 112
+ "y" : 112,
+ "name" : "#072"
},
{
"drilldown" : "073",
- "name" : "#073",
- "y" : 110
+ "y" : 110,
+ "name" : "#073"
},
{
"drilldown" : "074",
- "y" : 115,
- "name" : "#074"
+ "name" : "#074",
+ "y" : 115
},
{
- "drilldown" : "075",
"y" : 115,
- "name" : "#075"
+