diff options
24 files changed, 1810 insertions, 1477 deletions
diff --git a/challenge-184/ulrich-rieke/cpp/ch-1.cpp b/challenge-184/ulrich-rieke/cpp/ch-1.cpp new file mode 100644 index 0000000000..92fe5d702c --- /dev/null +++ b/challenge-184/ulrich-rieke/cpp/ch-1.cpp @@ -0,0 +1,36 @@ +#include <vector> +#include <iostream> +#include <string> + +int main( ) { + std::vector<std::string> input ; + std::cout << "Please enter a string, starting with 2 digits and then 4 letters!\n" ; + std::cout << "enter <return> to end!\n" ; + std::string line ; + std::getline( std::cin , line ) ; + while ( !line.empty( ) ) { + input.push_back( line ) ; + std::getline( std::cin , line ) ; + } + int count = 0 ; + std::vector<std::string> output ; + for ( auto it = input.begin( ) ; it != input.end( ) ; ++it ) { + std::string newWord ; + if ( count < 10 ) { + newWord = "0" + std::to_string( count ) + it->substr( 2 ) ; + } + if ( count > 9 ) { + newWord = std::to_string( count ) + it->substr( 2 ) ; + } + output.push_back( newWord ) ; + count++ ; + } + std::cout << '(' ; + for ( const auto & w : output ) { + std::cout << w ; + if ( w != output.back( ) ) + std::cout << ", " ; + } + std::cout << ')' << std::endl ; + return 0 ; +} diff --git a/challenge-184/ulrich-rieke/cpp/ch-2.cpp b/challenge-184/ulrich-rieke/cpp/ch-2.cpp new file mode 100644 index 0000000000..4f05b42cf2 --- /dev/null +++ b/challenge-184/ulrich-rieke/cpp/ch-2.cpp @@ -0,0 +1,54 @@ +#include <iostream> +#include <string> +#include <vector> +#include <cctype> +#include <iterator> +#include <algorithm> + +int main( ) { + std::cout << "Please enter lines of letters and digits only, separated by blanks!\n" ; + std::cout << "enter <return> to end!\n" ; + std::string line ; + std::getline( std::cin , line ) ; + std::vector<std::string> allInput ; + while ( !line.empty( ) ) { + allInput.push_back( line ) ; + std::getline( std::cin , line ) ; + } + std::vector<std::vector<int>> allDigits ; + std::vector<std::vector<char>> allLetters ; + for ( const auto & s : allInput ) { + std::vector<int> currentDigits ; + std::vector<char> currentLetters ; + for ( char c : s ) { + if ( std::islower( c ) ) { + currentLetters.push_back( c ) ; + } + if ( std::isdigit( c ) ) { + currentDigits.push_back( c ) ; + } + } + if ( currentDigits.size( ) > 0 ) { + allDigits.push_back( currentDigits ) ; + } + if ( currentLetters.size( ) > 0 ) { + allLetters.push_back( currentLetters ) ; + } + } + std::cout << '[' ; + for ( const auto & sequence : allDigits ) { + std::cout << "[ " ; + std::copy( sequence.begin( ) , sequence.end( ) , std::ostream_iterator<char>( + std::cout , " " )) ; + std::cout << "]," ; + } + std::cout << "] and [" ; + for ( const auto & sequence : allLetters ) { + std::cout << "[ " ; + std::copy( sequence.begin( ) , sequence.end( ) , std::ostream_iterator<char>( + std::cout , " " )) ; + std::cout << "]," ; + } + std::cout << ']' << std::endl ; + return 0 ; +} diff --git a/challenge-184/ulrich-rieke/haskell/ch-1.hs b/challenge-184/ulrich-rieke/haskell/ch-1.hs new file mode 100644 index 0000000000..f773db06f4 --- /dev/null +++ b/challenge-184/ulrich-rieke/haskell/ch-1.hs @@ -0,0 +1,10 @@ +module Challenge184 + where + +convert :: String -> Int -> String +convert st n + |n < 10 = "0" ++ show n ++ ( drop 2 st ) + |otherwise = show n ++ ( drop 2 st ) + +solution :: [String] -> [String] +solution strings = map (\st -> convert ( fst st ) ( snd st )) $ zip strings [0 ..] diff --git a/challenge-184/ulrich-rieke/haskell/ch-2.hs b/challenge-184/ulrich-rieke/haskell/ch-2.hs new file mode 100644 index 0000000000..f75cca1536 --- /dev/null +++ b/challenge-184/ulrich-rieke/haskell/ch-2.hs @@ -0,0 +1,13 @@ +module Challenge184_2 + where +import Data.Char ( digitToInt , isDigit , isLower ) +import Data.List( intersperse ) + +takeApart :: String -> ( [Int] , [Char] ) +takeApart st = (map digitToInt $ filter isDigit st , filter isLower st) + +solution :: [String] -> ([[Int]] , [[Char]] ) +solution input = ( filter ( not .null ) $ map fst pairs , + filter ( not . null ) $ map ( intersperse ',' ) $ map snd pairs ) +where + pairs = map takeApart input diff --git a/challenge-184/ulrich-rieke/perl/ch-1.pl b/challenge-184/ulrich-rieke/perl/ch-1.pl new file mode 100644 index 0000000000..6ee50b2e6a --- /dev/null +++ b/challenge-184/ulrich-rieke/perl/ch-1.pl @@ -0,0 +1,29 @@ +#!/usr/bin/perl ; +use strict ; +use warnings ; +use feature 'say' ; + +say "Enter a string , starting with 2 letters and then 4 digits, <return> to end!" ; +my @list ; +my $line = <STDIN> ; +chomp $line ; +while ( $line ) { + while ( $line !~ /^[[:lower:]]{2}[[:digit:]]{4}$/ ) { + say "String should start with two lower-case letters and the 4 digits!" ; + $line = <STDIN> ; + chomp $line ; + } + push @list , $line ; + $line = <STDIN> ; + chomp $line ; +} +my @output ; +for my $i ( 0 .. $#list ) { + if ( $i < 10 ) { + push @output , "0$i" . substr( $list[ $i ] , 2 ) ; + } + else { + push @output , "$i" . substr( $list[ $i ] , 2 ) ; + } +} +say '(' . join( ',' , @output ) . ')' ; diff --git a/challenge-184/ulrich-rieke/perl/ch-2.pl b/challenge-184/ulrich-rieke/perl/ch-2.pl new file mode 100644 index 0000000000..e61f0662d4 --- /dev/null +++ b/challenge-184/ulrich-rieke/perl/ch-2.pl @@ -0,0 +1,36 @@ +#!/usr/bin/perl ; +use strict ; +use warnings ; +use feature 'say' ; + +say "Enter single letters and digits, separated by a blank, <return> to end!" ; +my @list ; +my $line = <STDIN> ; +chomp $line ; +while ( $line ) { + push @list , $line ; + $line = <STDIN> ; + chomp $line ; +} ; +my @numberlist ; +my @letterlist ; +for my $str ( @list ) { + my @currentNumbers ; + my @currentLetters ; + for my $l ( split( /\s/ , $str ) ) { + if ( $l =~ /^[[:digit:]]$/ ) { + push @currentNumbers , $l ; + } + if ( $l =~ /^[[:lower:]]$/ ) { + push @currentLetters , $l ; + } + } + if ( @currentNumbers ) { + push @numberlist , '[' . join( ',' , @currentNumbers ) . ']' ; + } + if ( @currentLetters ) { + push @letterlist , '[' . join( ',' , @currentLetters ) . ']' ; + } +} +print ('[' . join( ',' , @numberlist ) . ']' . " and " ) ; +say ( '[' . join( ',' , @letterlist ) . ']' ) ; diff --git a/challenge-184/ulrich-rieke/raku/ch-1.raku b/challenge-184/ulrich-rieke/raku/ch-1.raku new file mode 100644 index 0000000000..56ce6f4a5e --- /dev/null +++ b/challenge-184/ulrich-rieke/raku/ch-1.raku @@ -0,0 +1,25 @@ +use v6 ; + +say "Enter strings in the form of aa9999, that is 2 letters and 4 digits!" ; +say "Enter <return> to end!" ; +my @strings ; +my $line = $*IN.get ; +while ( $line ) { + while ( $line !~~ /<[a..z]>**2<[0..9]>**4/ ) { + say "string should start with 2 letters and then 4 digits! Re-enter!" ; + $line = $*IN.get ; + } + @strings.push( $line ) ; + $line = $*IN.get ; +} +my @output ; +for (0..@strings.elems - 1 ) -> $i { + say $i ; + if ( $i < 10 ) { + @output.push( "0$i" ~ @strings[ $i ].substr( 2 ) ) ; + } + else { + @output.push( ~$i ~ @strings[ $i ].substr( 2 ) ) ; + } +} +say @output.join( ',' ) ; diff --git a/challenge-184/ulrich-rieke/raku/ch-2.raku b/challenge-184/ulrich-rieke/raku/ch-2.raku new file mode 100644 index 0000000000..7b290eadaa --- /dev/null +++ b/challenge-184/ulrich-rieke/raku/ch-2.raku @@ -0,0 +1,33 @@ +use v6 ; + +say "Enter a list of strings containing only digits and letters!" ; +say "They should be separated by blanks! Enter string by string, <return> to end!" ; +my @strings ; +my $line = $*IN.get ; +while ( $line ) { + @strings.push( $line ) ; + $line = $*IN.get ; +} +my @numberlist ; +my @letterlist ; +for @strings -> $word { + my @currentNumbers ; + my @currentLetters ; + for $word.split( /\s/ ) -> $l { + if ( $l ~~ /<[0..9]>/ ) { + @currentNumbers.push( $l ) ; + } + if ( $l ~~ /<[a..z]>/ ) { + @currentLetters.push( $l ) ; + } + } + if ( @currentNumbers ) { + @numberlist.push( '[' ~ @currentNumbers.join( ',' ) ~ ']' ) ; + } + if ( @currentLetters ) { + @letterlist.push( '[' ~ @currentLetters.join( ',' ) ~ ']' ) ; + } +} +print ('[' ~ @numberlist.join( ',' ) ~ ']' ) ; +print " and " ; +say ('[' ~ @letterlist.join( ',' ) ~ ']' ) ; diff --git a/challenge-184/ulrich-rieke/rust/ch-1.rs b/challenge-184/ulrich-rieke/rust/ch-1.rs new file mode 100644 index 0000000000..851065e5e6 --- /dev/null +++ b/challenge-184/ulrich-rieke/rust/ch-1.rs @@ -0,0 +1,35 @@ +use std::io ; +use std::io::BufRead ; + +fn main() -> io::Result<( )> { + println!("Please enter strings with 2 starting letters, followed by 4 digits!") ; + println!("Enter <return> to end!" ) ; + let mut input : Vec<String> = Vec::new( ) ; + let mut lines = io::stdin( ).lock( ).lines( ) ; + while let Some( line ) = lines.next( ) { + let last_input = line.unwrap( ) ; + if last_input.len( ) == 0 { + break ; + } + else { + input.push( last_input.to_string( )) ; + } + } + let mut count : i32 = 0 ; + let mut output : Vec<String> = Vec::new( ) ; + for a_word in input { + let word_ref : &str = &a_word.as_str( ) ; + let letterpart : &str = &word_ref[2..=5] ; + let mut combined = String::new( ) ; + if count < 10 { + combined = "0".to_owned( ) + &count.to_string( ) + &letterpart.to_owned( ); + } + else { + combined = count.to_string( ) + &letterpart.to_owned( ) ; + } + output.push( combined.clone( ) ) ; + count += 1 ; + } + println!("{:?}" , output ) ; + Ok(()) +} diff --git a/challenge-184/ulrich-rieke/rust/ch-2.rs b/challenge-184/ulrich-rieke/rust/ch-2.rs new file mode 100644 index 0000000000..892409b11c --- /dev/null +++ b/challenge-184/ulrich-rieke/rust/ch-2.rs @@ -0,0 +1,43 @@ +use std::io ; +use std::io::BufRead ; + +fn main() -> io::Result<( )> { + println!("Please enter strings of single letters and digits, separated by blanks!") ; + println!("Enter <return> to end!" ) ; + let mut lines = io::stdin( ).lock( ).lines( ) ; + let mut user_input = String::new( ) ; + while let Some( line ) = lines.next( ) { + let last_input = line.unwrap( ) ; + if last_input.len( ) == 0 { + break ; + } + else { + user_input.push_str("\n" ) ; + } + user_input.push_str( &last_input ) ; + } + let all_lines : Vec<&str> = user_input.split("\n").collect( ) ; + let mut all_letters : Vec<Vec<char>> = Vec::new( ) ; + let mut all_digits : Vec<Vec<char>> = Vec::new( ) ; + for a_line in all_lines { + let mut current_letters : Vec<char> = Vec::new( ) ; + let mut current_digits : Vec<char> = Vec::new( ) ; + let string = a_line.to_string( ) ; + for c in string.chars( ) { + if c.is_numeric( ) { + current_digits.push( c ) ; + } + if c.is_lowercase( ) { + current_letters.push( c ) ; + } + } + if current_digits.len( ) > 0 { + all_digits.push( current_digits.clone( ) ) ; + } + if current_letters.len( ) > 0 { + all_letters.push( current_letters.clone( ) ) ; + } + } + println!("{:?} and {:?}" , all_digits , all_letters) ; + Ok(()) +} diff --git a/stats/pwc-current.json b/stats/pwc-current.json index 9d9d023ec5..9f5702d19e 100644 --- a/stats/pwc-current.json +++ b/stats/pwc-current.json @@ -1,33 +1,43 @@ { + "title" : { + "text" : "The Weekly Challenge - 184" + }, + "legend" : { + "enabled" : 0 + }, + "yAxis" : { + "title" : { + "text" : "Total Solutions" + } + }, "chart" : { "type" : "column" }, - "subtitle" : { - "text" : "[Champions: 13] Last updated at 2022-09-27 07:48:22 GMT" - }, - "xAxis" : { - "type" : "category" + "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 }, "plotOptions" : { "series" : { "borderWidth" : 0, "dataLabels" : { - "enabled" : 1, - "format" : "{point.y}" + "format" : "{point.y}", + "enabled" : 1 } } }, "drilldown" : { "series" : [ { + "id" : "Dave Cross", "data" : [ [ "Perl", 2 ] ], - "name" : "Dave Cross", - "id" : "Dave Cross" + "name" : "Dave Cross" }, { "data" : [ @@ -36,21 +46,20 @@ 2 ] ], - "name" : "E. Choroba", - "id" : "E. Choroba" + "id" : "E. Choroba", + "name" : "E. Choroba" }, { "id" : "Humberto Massa", - "name" : "Humberto Massa", "data" : [ [ "Raku", 2 ] - ] + ], + "name" : "Humberto Massa" }, { - "id" : "James Smith", "data" : [ [ "Perl", @@ -61,20 +70,21 @@ 1 ] ], + "id" : "James Smith", "name" : "James Smith" }, { - "name" : "Kjetil Skotheim", + "id" : "Kjetil Skotheim", "data" : [ [ "Perl", 2 ] ], - "id" : "Kjetil Skotheim" + "name" : "Kjetil Skotheim" }, { - "name" : "Luca Ferrari", + "id" : "Luca Ferrari", "data" : [ [ "Raku", @@ -85,27 +95,27 @@ 6 ] ], - "id" : "Luca Ferrari" + "name" : "Luca Ferrari" }, { - "name" : "Mark Anderson", "data" : [ [ "Raku", 2 ] ], - "id" : "Mark Anderson" + "id" : "Mark Anderson", + "name" : "Mark Anderson" }, { - "id" : "Matthew Neleigh", - "name" : "Matthew Neleigh", "data" : [ [ "Perl", 2 ] - ] + ], + "id" : "Matthew Neleigh", + "name" : "Matthew Neleigh" }, { "name" : "Mohammad S Anwar", @@ -118,8 +128,8 @@ "id" : "Mohammad S Anwar" }, { - "id" : "Niels van Dijke", "name" : "Niels van Dijke", + "id" : "Niels van Dijke", "data" : [ [ "Perl", @@ -128,6 +138,7 @@ ] }, { + "name" : "Robert DiCicco", "id" : "Robert DiCicco", "data" : [ [ @@ -138,11 +149,24 @@ "Raku", 1 ] + ] + }, + { + "data" : [ + [ + "Perl", + 2 + ], + [ + "Raku", + 2 + ] ], - "name" : "Robert DiCicco" + "id" : "Roger Bell_West", + "name" : "Roger Bell_West" }, { - "name" : "Roger Bell_West", + "name" : "Ulrich Rieke", "data" : [ [ "Perl", @@ -153,9 +177,10 @@ 2 ] ], - "id" : "Roger Bell_West" + "id" : "Ulrich Rieke" }, { + "name" : "W. Luis Mochan", "id" : "W. Luis Mochan", "data" : [ [ @@ -166,75 +191,62 @@ "Blog", 1 ] - ], - "name" : "W. Luis Mochan" + ] } ] }, - "legend" : { - "enabled" : 0 - }, - "title" : { - "text" : "The Weekly Challenge - 184" - }, - "yAxis" : { - "title" : { - "text" : "Total Solutions" - } - }, - "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 + "xAxis" : { + "type" : "category" }, "series" : [ { "colorByPoint" : 1, + "name" : "The Weekly Challenge - 184", "data" : [ { - "drilldown" : "Dave Cross", + "name" : "Dave Cross", "y" : 2, - "name" : "Dave Cross" + "drilldown" : "Dave Cross" }, { - "drilldown" : "E. Choroba", "y" : 2, + "drilldown" : "E. Choroba", "name" : "E. Choroba" }, { - "name" : "Humberto Massa", "y" : 2, - "drilldown" : "Humberto Massa" + "drilldown" : "Humberto Massa", + "name" : "Humberto Massa" }, { + "y" : 3, "drilldown" : "James Smith", - "name" : "James Smith", - "y" : 3 + "name" : "James Smith" }, { "drilldown" : "Kjetil Skotheim", - "name" : "Kjetil Skotheim", - "y" : 2 + "y" : 2, + "name" : "Kjetil Skotheim" }, { - "drilldown" : "Luca Ferrari", + "name" : "Luca Ferrari", "y" : 8, - "name" : "Luca Ferrari" + "drilldown" : "Luca Ferrari" }, { - "y" : 2, "name" : "Mark Anderson", - "drilldown" : "Mark Anderson" + "drilldown" : "Mark Anderson", + "y" : 2 }, { - "y" : 2, "name" : "Matthew Neleigh", + "y" : 2, "drilldown" : "Matthew Neleigh" }, { + "name" : "Mohammad S Anwar", "drilldown" : "Mohammad S Anwar", - "y" : 2, - "name" : "Mohammad S Anwar" + "y" : 2 }, { "drilldown" : "Niels van Dijke", @@ -243,21 +255,28 @@ }, { "y" : 2, - "name" : "Robert DiCicco", - "drilldown" : "Robert DiCicco" + "drilldown" : "Robert DiCicco", + "name" : "Robert DiCicco" }, { - "y" : 4, "name" : "Roger Bell_West", - "drilldown" : "Roger Bell_West" + "drilldown" : "Roger Bell_West", + "y" : 4 + }, + { + "drilldown" : "Ulrich Rieke", + "y" : 4, + "name" : "Ulrich Rieke" }, { "y" : 3, - "name" : "W. Luis Mochan", - "drilldown" : "W. Luis Mochan" + "drilldown" : "W. Luis Mochan", + "name" : "W. Luis Mochan" } - ], - "name" : "The Weekly Challenge - 184" + ] } - ] + ], + "subtitle" : { + "text" : "[Champions: 14] Last updated at 2022-09-27 08:46:27 GMT" + } } diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json index 13dfae47e7..dd6e6d3479 100644 --- a/stats/pwc-language-breakdown-summary.json +++ b/stats/pwc-language-breakdown-summary.json @@ -1,15 +1,45 @@ { - "subtitle" : { - "text" : "Last updated at 2022-09-27 07:48:22 GMT" + "yAxis" : { + "title" : { + "text" : null + }, + "min" : 0 + }, + "legend" : { + "enabled" : "false" }, "chart" : { "type" : "column" }, - "tooltip" : { - "pointFormat" : "<b>{point.y:.0f}</b>" + "title" : { + "text" : "The Weekly Challenge Contributions [2019 - 2022]" + }, + "xAxis" : { + "type" : "category", + "labels" : { + "style" : { + "fontSize" : "13px", + "fontFamily" : "Verdana, sans-serif" + } + } + }, + "subtitle" : { + "text" : "Last updated at 2022-09-27 08:46:27 GMT" }, "series" : [ { + "dataLabels" : { + "rotation" : -90, + "color" : "#FFFFFF", + "style" : { + "fontFamily" : "Verdana, sans-serif", + "fontSize" : "13px" + }, + "y" : 10, + "format" : "{point.y:.0f}", + "align" : "right", + "enabled" : "true" + }, "name" : "Contributions", "data" : [ [ @@ -18,46 +48,16 @@ ], [ "Perl", - 8933 + 8935 ], [ "Raku", - 5340 + 5342 ] - ], - "dataLabels" : { - "style" : { - "fontFamily" : "Verdana, sans-serif", - "fontSize" : "13px" - }, - "enabled" : "true", - "rotation" : -90, - "align" : "right", - "color" : "#FFFFFF", - "format" : "{point.y:.0f}", - "y" : 10 - } + ] } ], - "legend" : { - "enabled" : "false" - }, - "xAxis" : { - "labels" : { - "style" : { - "fontSize" : "13px", - "fontFamily" : "Verdana, sans-serif" - } - }, - "type" : "category" - }, - "yAxis" : { - "min" : 0, - "title" : { - "text" : null - } - }, - "title" : { - "text" : "The Weekly Challenge Contributions [2019 - 2022]" + "tooltip" : { + "pointFormat" : "<b>{point.y:.0f}</b>" } } diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json index 027411dedb..bed87c9d2a 100644 --- a/stats/pwc-language-breakdown.json +++ b/stats/pwc-language-breakdown.json @@ -1,10 +1,4 @@ { - "subtitle" : { - "text" : "Click the columns to drilldown the language breakdown. Last updated at 2022-09-27 07:48:22 GMT" - }, - "chart" : { - "type" : "column" - }, "series" : [ { "colorByPoint" : "true", @@ -12,88 +6,88 @@ "data" : [ { "y" : 161, - "name" : "#001", - "drilldown" : "001" + "drilldown" : "001", + "name" : "#001" }, { + "y" : 125, "drilldown" : "002", - "name" : "#002", - "y" : 125 + "name" : "#002" }, { - "name" : "#003", "y" : 83, - "drilldown" : "003" + "drilldown" : "003", + "name" : "#003" }, { - "drilldown" : "004", "name" : "#004", + "drilldown" : "004", "y" : 99 }, { + "drilldown" : "005", "y" : 78, - "name" : "#005", - "drilldown" : "005" + "name" : "#005" }, { - "drilldown" : "006", "name" : "#006", - "y" : 58 + "y" : 58, + "drilldown" : "006" }, { - "drilldown" : "007", "y" : 65, + "drilldown" : "007", "name" : "#007" }, { - "drilldown" : "008", "y" : 78, + "drilldown" : "008", "name" : "#008" }, { - "drilldown" : "009", "name" : "#009", - "y" : 76 + "y" : 76, + "drilldown" : "009" }, { - "name" : "#010", + "drilldown" : "010", "y" : 65, - "drilldown" : "010" + "name" : "#010" }, { - "drilldown" : "011", "name" : "#011", + "drilldown" : "011", "y" : 85 }, { + "drilldown" : "012", "y" : 89, - "name" : "#012", - "drilldown" : "012" + "name" : "#012" }, { - "y" : 85, "name" : "#013", - "drilldown" : "013" + "drilldown" : "013", + "y" : 85 }, { - "name" : "#014", "y" : 101, - "drilldown" : "014" + "drilldown" : "014", + "name" : "#014" }, { "y" : 99, - "name" : "#015", - "drilldown" : "015" + "drilldown" : "015", + "name" : "#015" }, { - "name" : "#016", + "drilldown" : "016", "y" : 71, - "drilldown" : "016" + "name" : "#016" }, { - "drilldown" : "017", + "name" : "#017", "y" : 84, - "name" : "#017" + "drilldown" : "017" }, { "name" : "#018", @@ -101,48 +95,48 @@ "drilldown" : "018" }, { - "drilldown" : "019", "name" : "#019", - "y" : 103 + "y" : 103, + "drilldown" : "019" }, { - "y" : 101, "name" : "#020", + "y" : 101, "drilldown" : "020" }, { - "drilldown" : "021", "name" : "#021", - "y" : 72 + "y" : 72, + "drilldown" : "021" }, { - "y" : 68, |