duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change operation name to Calculate

master
Collin Richards 2015-01-30 11:04:47 -05:00
parent 5555eea183
commit bc75635e7e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DDG/Goodie/Combination.pm
View File

@ -62,7 +62,7 @@ handle query => sub {
return $formatted_result, return $formatted_result,
structured_answer => { structured_answer => {
input => [$style->for_display($n) . " $operation " . $style->for_display($k)], input => [$style->for_display($n) . " $operation " . $style->for_display($k)],
operation => $operation, operation => 'Calculate',
result => $formatted_result, result => $formatted_result,
}; };
}; };

12
t/Combination.t
View File

@ -13,42 +13,42 @@ ddg_goodie_test(
'10 choose 3' => test_zci('120', '10 choose 3' => test_zci('120',
structured_answer => { structured_answer => {
input => ['10 choose 3'], input => ['10 choose 3'],
operation => 'choose', operation => 'Calculate',
result => '120', result => '120',
} }
), ),
'10 nCr 3' => test_zci('120', '10 nCr 3' => test_zci('120',
structured_answer => { structured_answer => {
input => ['10 choose 3'], input => ['10 choose 3'],
operation => 'choose', operation => 'Calculate',
result => '120', result => '120',
} }
), ),
'25 permute 16' => test_zci('4.27447366714368 * 10^19', '25 permute 16' => test_zci('4.27447366714368 * 10^19',
structured_answer => { structured_answer => {
input => ["25 permute 16"], input => ["25 permute 16"],
operation => "permute", operation => 'Calculate',
result => "4.27447366714368 * 10^19" result => "4.27447366714368 * 10^19"
} }
), ),
'16 permutation 3' => test_zci('3,360', '16 permutation 3' => test_zci('3,360',
structured_answer => { structured_answer => {
input => ["16 permute 3"], input => ["16 permute 3"],
operation => "permute", operation => 'Calculate',
result => "3,360" result => "3,360"
} }
), ),
'15 permutation 0' => test_zci('1', '15 permutation 0' => test_zci('1',
structured_answer => { structured_answer => {
input => ["15 permute 0"], input => ["15 permute 0"],
operation => "permute", operation => 'Calculate',
result => "1" result => "1"
} }
), ),
'1,000 choose 2' => test_zci('499,500', '1,000 choose 2' => test_zci('499,500',
structured_answer => { structured_answer => {
input => ["1,000 choose 2"], input => ["1,000 choose 2"],
operation => "choose", operation => 'Calculate',
result => "499,500" result => "499,500"
} }
), ),