aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbaggy <js5@sanger.ac.uk>2022-05-24 20:32:51 +0100
committerdrbaggy <js5@sanger.ac.uk>2022-05-24 20:32:51 +0100
commit0804fa5a38b12b3cdb3c95fac3411db24c2fff0f (patch)
treec3d5d0b462c227c8ce0932c4b1ae4016cd8bf79d
parent1a000c639c7c650a03df358bab15d7050d5cad27 (diff)
parent22b01996d44fc856db6b7594014056e744b964e7 (diff)
downloadperlweeklychallenge-club-0804fa5a38b12b3cdb3c95fac3411db24c2fff0f.tar.gz
perlweeklychallenge-club-0804fa5a38b12b3cdb3c95fac3411db24c2fff0f.tar.bz2
perlweeklychallenge-club-0804fa5a38b12b3cdb3c95fac3411db24c2fff0f.zip
vi ch-2.plMerge remote-tracking branch 'upstream/master'
-rw-r--r--challenge-166/robert-dicicco/julia/ch-1.jl59
-rw-r--r--challenge-166/robert-dicicco/perl/ch-1.pl60
-rw-r--r--challenge-166/robert-dicicco/raku/ch-1.raku34
-rw-r--r--challenge-166/robert-dicicco/ruby/ch-1.rb39
-rw-r--r--challenge-166/ulrich-rieke/perl/ch-1.pl24
-rw-r--r--challenge-166/ulrich-rieke/raku/ch-2.raku61
-rw-r--r--stats/pwc-current.json186
-rw-r--r--stats/pwc-language-breakdown-summary.json52
-rw-r--r--stats/pwc-language-breakdown.json1080
-rw-r--r--stats/pwc-leaders.json344
-rw-r--r--stats/pwc-summary-1-30.json34
-rw-r--r--stats/pwc-summary-121-150.json94
-rw-r--r--stats/pwc-summary-151-180.json56
-rw-r--r--stats/pwc-summary-181-210.json36
-rw-r--r--stats/pwc-summary-211-240.json52
-rw-r--r--stats/pwc-summary-241-270.json42
-rw-r--r--stats/pwc-summary-31-60.json114
-rw-r--r--stats/pwc-summary-61-90.json44
-rw-r--r--stats/pwc-summary-91-120.json108
-rw-r--r--stats/pwc-summary.json552
20 files changed, 1693 insertions, 1378 deletions
diff --git a/challenge-166/robert-dicicco/julia/ch-1.jl b/challenge-166/robert-dicicco/julia/ch-1.jl
new file mode 100644
index 0000000000..c40d4f0f4d
--- /dev/null
+++ b/challenge-166/robert-dicicco/julia/ch-1.jl
@@ -0,0 +1,59 @@
+#!julia.exe
+
+# AUTHOR: Robert DiCicco
+# DATE: 2022-05-24
+# Challeng 166 Hexadecimal Words ( Julia )
+
+letters = Dict( "a"=>"a","b"=>"b", "c"=>"c","d"=>"d","e"=>"e","f"=>"f","o"=>"0","l"=>"1", "i"=>"1", "s"=>"5","t"=>"7" )
+
+function checkArgs(args)
+ global num
+
+ try
+ num = parse(Int64, args[1])
+ catch
+ println("Error: Argument must be an integer")
+ exit(0)
+ finally
+ if num < 2 || num > 8
+ println("Error: Argument must be 2 <= n <= 8")
+ exit(0)
+ else
+ main(num)
+ end
+ end
+end
+
+function tr(str, reps...)
+ d = Dict(reps)
+ return(map(s -> get(d,s,s), str))
+end
+
+function main(selection)
+ open("Words.txt") do f
+ while ! eof(f)
+ s = readline(f)
+ found = 0
+ s = strip(s)
+ s = lowercase(s)
+
+ if length(s) == selection
+ arr = split(s,"")
+ for i in (arr)
+ if (haskey(letters, i))
+ found += 1
+ end
+ end
+
+ if found == selection
+ s = tr(s,'o'=>'0','l'=>'1','i'=>'1','s'=>'5','t'=>'7')
+ print("$s ")
+ end
+ end
+ end
+
+ close(f)
+ end
+end
+
+checkArgs(ARGS)
diff --git a/challenge-166/robert-dicicco/perl/ch-1.pl b/challenge-166/robert-dicicco/perl/ch-1.pl
new file mode 100644
index 0000000000..c9418a304a
--- /dev/null
+++ b/challenge-166/robert-dicicco/perl/ch-1.pl
@@ -0,0 +1,60 @@
+#!perl.exe
+
+use strict;
+use warnings;
+use feature qw/say/;
+
+# AUTHOR: Robert DiCicco
+# DATE: 2022-05-23
+# Challenge 166 Hexadecimal Words ( Perl )
+
+my %letters = ( 'a'=>'a','b'=>'b','c'=>'c','d'=>'d','e'=>'e','f'=>'f','o'=>0,'l'=>1,'i'=>1,'s'=>5,'t'=>7);
+my $found = 0;
+my $selection = $ARGV[0];
+
+die "Length Selection Error. Must be between 2 and 8 inclusive" if ($selection < 2 or $selection > 8);
+
+open(FH, '<', "./Words.txt") or die "Can't open Words.txt\n";
+
+while(my $word = <FH>) {
+
+ $word = lc($word);
+ $word =~ s/^\s+|\s+$//g; # remove both leading and trailing spaces
+ next if (length($word) != $selection); # only look at the slected length words
+ my @arr = split(//,$word); # create array of chars
+
+ foreach my $val (@arr){ # if we have a character not in out list, go to next
+ if(! defined($letters{$val})){
+ next;
+ }
+
+ if(exists($letters{$val})){ # if its in our list, bump the found flag
+ $found++;
+ }
+ }
+
+ $word =~ tr/olist/01157/; # convert certain chars to their number representations
+
+ if ($selection == 2) { # if our found char total = our selection number, print the word
+ print "0x000000$word " if ($found == $selection);
+ } elsif ( $selection == 3) {
+ print "0x00000$word " if ($found == $selection);
+ } elsif ( $selection == 4) {
+ print "0x0000$word " if ($found == $selection);
+ } elsif ( $selection == 5) {
+ print "0x000$word " if ($found == $selection);
+ } elsif ( $selection == 6) {
+ print "0x00$word " if ($found == $selection);
+ } elsif ($selection == 7) {
+ print "0x0$word " if ($found == $selection);
+ } elsif ($selection == 8) {
+ print "0x$word " if ($found == $selection);
+ } else {
+ # should not reach here
+ ;
+ }
+
+ $found = 0; # reset the found flag, go another round
+ }
+
+ print "\n";
diff --git a/challenge-166/robert-dicicco/raku/ch-1.raku b/challenge-166/robert-dicicco/raku/ch-1.raku
new file mode 100644
index 0000000000..898f7d45d7
--- /dev/null
+++ b/challenge-166/robert-dicicco/raku/ch-1.raku
@@ -0,0 +1,34 @@
+use v6;
+
+# AUTHOR: Robert DiCicco
+# DATE: 2022-05-23
+# Challenge 166 Hexadecimal Words ( Raku )
+
+my %letters = 'a'=>'a','b'=>'b','c'=>'c','d'=>'d','e'=>'e','f'=>'f','o'=>'0','l'=>'1','i'=>'1','s'=>'5','t'=>'7';
+my $found = 0;
+my $selection = 0;
+
+sub MAIN( UInt $selection ) {
+ die "Length Selection Error. Selection must be between 2 and 8 inclusive" if ($selection < 2 or $selection > 8);
+
+ MY_LOOP:
+ for 'Words.txt'.IO.lines {
+ my $line_lc = $_;
+ $line_lc = $line_lc.trim.lc;
+ next MY_LOOP if $line_lc.chars != $selection;
+
+ my @arr = $line_lc.comb;
+
+ for ( @arr ) -> $letter {
+ if %letters{$letter} { $found++; }
+ }
+
+ if $found == $selection {
+ $line_lc ~~ tr/olist/01157/;
+ print "$line_lc ";
+ }
+
+ $found = 0;
+ }
+
+}
diff --git a/challenge-166/robert-dicicco/ruby/ch-1.rb b/challenge-166/robert-dicicco/ruby/ch-1.rb
new file mode 100644
index 0000000000..ddc3abd805
--- /dev/null
+++ b/challenge-166/robert-dicicco/ruby/ch-1.rb
@@ -0,0 +1,39 @@
+#!ruby.exe
+
+# AUTHOR: Robert DiCicco
+# DATE: 2022-05-24
+# Challenge 166 Hexadecimal Words ( Ruby )
+
+letters = { 'a'=>"a",'b'=>"b",'c'=>"c",'d'=>"d",'e'=>"e",'f'=>"f",'o'=>"0",'l'=>"1",'i'=>"1",'s'=>"5",'t'=>"7" };
+selection = 0;
+
+for selection in ARGV
+ selection = selection.to_i
+
+ if (selection < 2 or selection > 8 )
+ puts "Selection must be >= 2 and <= 8"
+ exit
+ end
+end
+
+File.foreach("Words.txt") { |line|
+ line = line.lstrip.rstrip.downcase
+
+ if line.size != selection
+ next
+ end
+
+ @arr = line.split("")
+ found = 0
+
+ for letter in @arr
+ if letters[letter]
+ found = found + 1
+ if (found == selection)
+ line = line.tr('olist','01157')
+ print "#{line} "
+ STDOUT.flush
+ end
+ end
+ end
+}
diff --git a/challenge-166/ulrich-rieke/perl/ch-1.pl b/challenge-166/ulrich-rieke/perl/ch-1.pl
new file mode 100644
index 0000000000..a0ee82267d
--- /dev/null
+++ b/challenge-166/ulrich-rieke/perl/ch-1.pl
@@ -0,0 +1,24 @@
+#!/usr/bin/perl ;
+use strict ;
+use warnings ;
+use feature 'say' ;
+use List::Util qw ( any ) ;
+
+my $potentialHex = '^[0-9a-f]{2,8}$' ;
+my @hexwords ;
+my $line ;
+open ( my $fh , "< dictionary.txt" ) or die "Can't open file: $!" ;
+while ( $line = <$fh> ) {
+ chomp $line ;
+ if ( $line =~ /$potentialHex/ ) {
+ push @hexwords , "0x$line" ;
+ }
+ else {
+ $line =~ tr/olist/01157/ ;
+ if ( $line =~ /$potentialHex/ ) {
+ push @hexwords , "0x$line" ;
+ }
+ }
+}
+close( $fh ) ;
+say join( ',' , @hexwords ) ;
diff --git a/challenge-166/ulrich-rieke/raku/ch-2.raku b/challenge-166/ulrich-rieke/raku/ch-2.raku
new file mode 100644
index 0000000000..059ca9bae5
--- /dev/null
+++ b/challenge-166/ulrich-rieke/raku/ch-2.raku
@@ -0,0 +1,61 @@
+use v6 ;
+
+
+say "Which directories in the current directory do you want to diff ?" ;
+my $line = $*IN.get ;
+my %allFiles ;
+my %directoryContents ;
+my @directories = $line.split( /\s+/ ) ;
+my $dirNumber = @directories.elems ;
+for @directories -> $directory {
+ for dir( "$directory") -> $file {
+ my $fileName ;
+ if ( $file ~~ /^.+ '/' (.+) $/ ) {
+ $fileName = ~$0 ;
+ }
+ if ( "$file".IO.d ) {
+ push( %directoryContents{$directory} , "$fileName/" ) ;
+ %allFiles{ "$fileName/"}++ ;
+ }
+ else {
+ push( %directoryContents{$directory}, "$fileName" ) ;
+ %allFiles{ "$fileName" }++ ;
+ }
+ }
+}
+my @filesNotInAllDirs = %allFiles.keys.grep( { %allFiles{ $_ } < $dirNumber }) ;
+my $maxlen = @filesNotInAllDirs.sort( { $^b.chars <=> $^a.chars } )[0].chars ;
+my @sorted = @filesNotInAllDirs.sort ;
+my $width = $maxlen + 2 ;
+for @directories -> $directory {
+ print $directory ;
+ print " " x ( $width - $directory.chars ) ;
+ if ( $directory ne @directories[*-1] ) {
+ print '|' ;
+ }
+ else {
+ say " " ;
+ }
+}
+for ( 1 .. $dirNumber - 1 ) {
+ print '-' x $width ;
+ print '|' ;
+}
+say '-' x $width ;
+for @sorted -> $aFile {
+ for @directories -> $directory {
+ if ( $aFile (elem) %directoryContents{ $directory }) {
+ print $aFile ;
+ print " " x ( $width - $aFile.chars ) ;
+ }
+ else {
+ print " " x $width ;
+ }
+ if ( $directory ne @directories[*-1] ) {
+ print "|" ;
+ }
+ else {
+ say " " ;
+ }
+ }
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index 2c930e913b..576fc81982 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,73 +1,18 @@
{
- "legend" : {
- "enabled" : 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
- },
- "subtitle" : {
- "text" : "[Champions: 6] Last updated at 2022-05-23 20:20:56 GMT"
- },
- "plotOptions" : {
- "series" : {
- "dataLabels" : {
- "enabled" : 1,
- "format" : "{point.y}"
- },
- "borderWidth" : 0
- }
+ "chart" : {
+ "type" : "column"
},
- "series" : [
- {
- "data" : [
- {
- "name" : "Dave Jacoby",
- "drilldown" : "Dave Jacoby",
- "y" : 2
- },
- {
- "y" : 2,
- "name" : "E. Choroba",
- "drilldown" : "E. Choroba"
- },
- {
- "y" : 8,
- "drilldown" : "Luca Ferrari",
- "name" : "Luca Ferrari"
- },
- {
- "y" : 2,
- "name" : "Mark Anderson",
- "drilldown" : "Mark Anderson"
- },
- {
- "y" : 3,
- "drilldown" : "Peter Campbell Smith",
- "name" : "Peter Campbell Smith"
- },
- {
- "y" : 4,
- "drilldown" : "Roger Bell_West",
- "name" : "Roger Bell_West"
- }
- ],
- "name" : "The Weekly Challenge - 166",
- "colorByPoint" : 1
- }
- ],
"drilldown" : {
"series" : [
{
- "id" : "Dave Jacoby",
- "name" : "Dave Jacoby",
"data" : [
[
"Perl",
2
]
- ]
+ ],
+ "name" : "Dave Jacoby",
+ "id" : "Dave Jacoby"
},
{
"id" : "E. Choroba",
@@ -80,6 +25,8 @@
]
},
{
+ "name" : "Luca Ferrari",
+ "id" : "Luca Ferrari",
"data" : [
[
"Raku",
@@ -89,22 +36,19 @@
"Blog",
6
]
- ],
- "name" : "Luca Ferrari",
- "id" : "Luca Ferrari"
+ ]
},
{
"id" : "Mark Anderson",
+ "name" : "Mark Anderson",
"data" : [
[
"Raku",
2
]
- ],
- "name" : "Mark Anderson"
+ ]
},
{
- "name" : "Peter Campbell Smith",
"data" : [
[
"Perl",
@@ -115,9 +59,26 @@
1
]
],
- "id" : "Peter Campbell Smith"
+ "id" : "Peter Campbell Smith",
+ "name" : "Peter Campbell Smith"
},
{
+ "id" : "Robert DiCicco",
+ "name" : "Robert DiCicco",
+ "data" : [
+ [
+ "Perl",
+ 1
+ ],
+ [
+ "Raku",
+ 1
+ ]
+ ]
+ },
+ {
+ "name" : "Roger Bell_West",
+ "id" : "Roger Bell_West",
"data" : [
[
"Perl",
@@ -127,24 +88,101 @@
"Raku",
2
]
- ],
- "name" : "Roger Bell_West",
- "id" : "Roger Bell_West"
+ ]
+ },
+ {
+ "id" : "Ulrich Rieke",
+ "name" : "Ulrich Rieke",
+ "data" : [
+ [
+ "Perl",
+ 1
+ ],
+ [
+ "Raku",
+ 1
+ ]
+ ]
}
]
},
+ "plotOptions" : {
+ "series" : {
+ "dataLabels" : {
+ "format" : "{point.y}",
+ "enabled" : 1
+ },
+ "borderWidth" : 0
+ }
+ },
+ "legend" : {
+ "enabled" : 0
+ },
+ "title" : {
+ "text" : "The Weekly Challenge - 166"
+ },
"yAxis" : {
"title" : {
"text" : "Total Solutions"
}
},
- "chart" : {
- "type" : "column"
+ "subtitle" : {
+ "text" : "[Champions: 8] Last updated at 2022-05-24 19:02:24 GMT"
},
+ "series" : [
+ {
+ "name" : "The Weekly Challenge - 166",
+ "data" : [
+ {
+ "name" : "Dave Jacoby",
+ "drilldown" : "Dave Jacoby",
+ "y" : 2
+ },
+ {
+ "y" : 2,
+ "name" : "E. Choroba",
+ "drilldown" : "E. Choroba"
+ },
+ {
+ "y" : 8,
+ "name" : "Luca Ferrari",
+ "drilldown" : "Luca Ferrari"
+ },
+ {
+ "name" : "Mark Anderson",
+ "drilldown" : "Mark Anderson",
+ "y" : 2
+ },
+ {
+ "drilldown" : "Peter Campbell Smith",
+ "name" : "Peter Campbell Smith",
+ "y" : 3
+ },
+ {
+ "y" : 2,
+ "name" : "Robert DiCicco",
+ "drilldown" : "Robert DiCicco"
+ },
+ {
+ "drilldown" : "Roger Bell_West",
+ "name" : "Roger Bell_West",
+ "y" : 4
+ },
+ {
+ "y" : 2,
+ "name" : "Ulrich Rieke",
+ "drilldown" : "Ulrich Rieke"
+ }
+ ],
+ "colorByPoint" : 1
+ }
+ ],
"xAxis" : {
"type" : "category"
},
- "title" : {
- "text" : "The Weekly Challenge - 166"
+ "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/>"
}
}
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index 2810418e30..2fd7ac33fe 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,37 +1,27 @@
{
- "subtitle" : {
- "text" : "Last updated at 2022-05-23 20:20:56 GMT"
- },
- "legend" : {
- "enabled" : "false"
- },
- "tooltip" : {
- "pointFormat" : "<b>{point.y:.0f}</b>"
- },
"yAxis" : {
"title" : {
"text" : null
},
"min" : 0
},
- "chart" : {
- "type" : "column"
+ "subtitle" : {
+ "text" : "Last updated at 2022-05-24 19:02:24 GMT"
+ },
+ "tooltip" : {
+ "pointFormat" : "<b>{point.y:.0f}</b>"
},
"xAxis" : {
"type" : "category",
"labels" : {
"style" : {
- "fontFamily" : "Verdana, sans-serif",
- "fontSize" : "13px"
+ "fontSize" : "13px",
+ "fontFamily" : "Verdana, sans-serif"
}
}
},
- "title" : {
- "text" : "The Weekly Challenge Contributions [2019 - 2022]"
- },
"series" : [
{
- "name" : "Contributions",
"data" : [
[
"Blog",
@@ -39,25 +29,35 @@
],
[
"Perl",
- 8088
+ 8090
],
[
"Raku",
- 4791
+ 4793
]
],
"dataLabels" : {
- "enabled" : "true",
- "rotation" : -90,
- "y" : 10,
"color" : "#FFFFFF",
- "format" : "{point.y:.0f}",
+ "y" : 10,
+ "rotation" : -90,
"align" : "right",
+ "format" : "{point.y:.0f}",
"style" : {
"fontFamily" : "Verdana, sans-serif",
"fontSize" : "13px"
- }
- }
+ },
+ "enabled" : "true"
+ },
+ "name" : "Contributions"
}
- ]
+ ],
+ "chart" : {
+ "type" : "column"
+ },
+ "title" : {
+ "text" : "The Weekly Challenge Contributions [2019 - 2022]"
+ },
+ "legend" : {
+ "enabled" : "false"
+ }
}
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index dba3a194eb..3ceb921463 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,32 +1,21 @@
{
- "plotOptions" : {
- "series" : {
- "dataLabels" : {
- "enabled" : 1,
- "format" : "{point.y}"
- },
- "borderWidth" : 0
- }
- },
"series" : [
{
- "colorByPoint" : "true",
- "name" : "The Weekly Challenge Languages",
"data" : [
{
"y" : 161,
- "name" : "#001",
- "drilldown" : "001"
+ "drilldown" : "001",
+ "name" : "#001"
},
{
- "drilldown" : "002",
+ "y" : 125,
"name" : "#002",
- "y" : 125
+ "drilldown" : "002"
},
{
- "y" : 83,
"drilldown" : "003",
- "name" : "#003"
+ "name" : "#003",
+ "y" : 83
},
{
"y" : 99,
@@ -34,49 +23,49 @@
"name" : "#004"
},
{
+ "y" : 78,
"name" : "#005",
- "drilldown" : "005",
- "y" : 78
+ "drilldown" : "005"
},
{
- "y" : 58,
+ "name" : "#006",
"drilldown" : "006",
- "name" : "#006"
+ "y" : 58
},
{
+ "y" : 64,
"drilldown" : "007",
- "name" : "#007",
- "y" : 64
+ "name" : "#007"
},
{
- "drilldown" : "008",
"name" : "#008",
+ "drilldown" : "008",
"y" : 78
},
{
- "drilldown" : "009",
+ "y" : 76,
"name" : "#009",
- "y" : 76
+ "drilldown" : "009"
},
{
- "drilldown" : "010",
"name" : "#010",
+ "drilldown" : "010",
"y" : 65
},
{
- "name" : "#011",
+ "y" : 85,
"drilldown" : "011",
- "y" : 85
+ "name" : "#011"
},
{
- "name" : "#012",
+ "y" : 89,
"drilldown" : "012",
- "y" : 89
+ "name" : "#012"
},
{
+ "y" : 85,
"name" : "#013",
- "drilldown" : "013",
- "y" : 85
+ "drilldown" : "013"
},
{
"drilldown" : "014",
@@ -84,9 +73,9 @@
"y" : 101
},
{
- "drilldown" : "015",
+ "y" : 99,
"name" : "#015",
- "y" : 99
+ "drilldown" : "015"
},
{
"y" : 71,
@@ -94,9 +83,9 @@
"name" : "#016"
},
{
+ "y" : 84,
"drilldown" : "017",
- "name" : "#017",
- "y" : 84
+ "name" : "#017"
},
{
"y" : 81,
@@ -110,18 +99,18 @@
},
{
"y" : 101,
- "name" : "#020",
- "drilldown" : "020"
+ "drilldown" : "020",
+ "name" : "#020"
},
{
"y" : 72,
- "name" : "#021",
- "drilldown" : "021"
+ "drilldown" : "021",
+ "name" : "#021"
},
{
- "y" : 68,
+ "drilldown" : "022",
"name" : "#022",
- "drilldown" : "022"
+ "y" : 68
},
{
"y" : 97,
@@ -130,8 +119,8 @@
},
{
"y" : 75,
- "name" : "#024",
- "drilldown" : "024"
+ "drilldown" : "024",
+ "name" : "#024"
},
{
"y" : 59,
@@ -140,12 +129,12 @@
},
{
"y" : 74,
- "name" : "#026",
- "drilldown" : "026"
+ "drilldown" : "026",
+ "name" : "#026"
},
{
- "name" : "#027",
"drilldown" : "027",
+ "name" : "#027",
"y" : 62
},
{
@@ -160,13 +149,13 @@
},
{
"y" : 119,
- "name" : "#030",
- "drilldown" : "030"
+ "drilldown" : "030",
+ "name" : "#030"
},
{
- "y" : 91,
"drilldown" : "031",
- "name" : "#031"
+ "name" : "#031",
+ "y" : 91
},
{
"y" : 96,
@@ -174,54 +163,54 @@
"name" : "#032"
},
{
- "y" : 112,
+ "drilldown" : "033",
"name" : "#033",
- "drilldown" : "033"
+ "y" : 112
},
{
- "y" : 66,
"name" : "#034",
- "drilldown" : "034"
+ "drilldown" : "034",
+ "y" : 66
},
{
- "y" : 66,
+ "drilldown" : "035",
"name" : "#035",
- "drilldown" : "035"
+ "y" : 66
},
{
"y" : 70,
- "name" : "#036",
- "drilldown" : "036"
+ "drilldown" : "036",
+ "name" : "#036"
},
{
+ "y" : 69,
"name" : "#037",
- "drilldown" : "037",
- "y" : 69
+ "drilldown" : "037"
},
{
- "drilldown" : "038",
+ "y" : 70,
"name" : "#038",
- "y" : 70
+ "drilldown" : "038"
},
{
"y" : 64,
- "name" : "#039",
- "drilldown" : "039"
+ "drilldown" : "039",
+ "name" : "#039"
},
{
- "y" : 75,
"name" : "#040",
- "drilldown" : "040"
+ "drilldown" : "040",
+ "y" : 75
},
{
"y" : 78,
- "drilldown" : "041",
- "name" : "#041"
+ "name" : "#041",
+ "drilldown" : "041"
},
{
- "drilldown" : "042",
+ "y" : 94,
"name" : "#042",
- "y" : 94
+ "drilldown" : "042"
},
{
"y" : 70,
@@ -239,14 +228,14 @@
"y" : 98
},
{
- "y" : 89,
+ "drilldown" : "046",
"name" : "#046",
- "drilldown" : "046"
+ "y" : 89
},
{
- "y" : 86,
"name" : "#047",
- "drilldown" : "047"
+ "drilldown" : "047",
+ "y" : 86
},
{
"y" : 110,
@@ -254,29 +243,29 @@
"name" : "#048"
},
{
- "y" : 91,
+ "drilldown" : "049",
"name" : "#049",
- "drilldown" : "049"
+ "y" : 91
},
{
- "y" : 100,
"name" : "#050",
- "drilldown" : "050"
+ "drilldown" : "050",
+ "y" : 100
},
{
- "y" : 91,
"name" : "#051",
- "drilldown" : "051"
+ "drilldown" : "051",
+ "y" : 91
},
{
- "name" : "#052",
"drilldown" : "052",
+ "name" : "#052",
"y" : 93
},
{
- "y" : 103,
"drilldown" : "053",
- "name" : "#053"
+ "name" : "#053",
+ "y" : 103
},
{
"y" : 105,
@@ -285,18 +274,18 @@
},
{
"y" : 90,
- "drilldown" : "055",
- "name" : "#055"
+ "name" : "#055",
+ "drilldown" : "055"
},
{
- "name" : "#056",
+ "y" : 97,
"drilldown" : "056",
<