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

Geometry: Add Triangle Area (#4287) 

* add triangle objectInfo and svg

* add tests for triangles & fix formula variable name

* add perimeter to triangle

* add height to triangle svg
master
Lev Kravinsky 2017-08-22 15:08:35 -04:00 committed by Rob Emery
parent ad955d8469
commit 4bf20c33b2
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/DDG/Goodie/Geometry.pm
View File

@ -18,6 +18,7 @@ foreach my $word (@keyWords) {
push(@finalWords, $word);
push(@finalWords, $word.' of');
push(@finalWords, $word.' of a');
push(@finalWords, $word.' of an');
}
triggers any => @finalWords;

5
share/goodie/geometry/objectInfo.yml
View File

@ -7,6 +7,9 @@ rectangle:
area: ab
perimeter: 2(a+b)
diagonal: √(a<sup>2</sup>+b<sup>2</sup>)
triangle:
area: bh/2
perimeter: a+b+c
equilateral triangle:
area: (a<sup>2</sup>√3)/4
perimeter: 3a
@ -42,4 +45,4 @@ circumference:
color: "#5B9E4D"
diagonal:
symbol: "e"
color: "#4495D4"
color: "#4495D4"

3
share/goodie/geometry/svg/triangle.svg Normal file
View File

@ -0,0 +1,3 @@
<path d="M 70,0 l 70,120 h -140 z" class="fill area" data-type="area"></path>
<path d="M 70,0 l 0,120" class="stroke special height" data-type="height"></path>
<path d="M 70,0 l 70,120 m -140,0 l 70,-120 m 70,120 h -140" class="stroke perimeter" data-type="perimeter"></path>

16
t/Geometry.t
View File

@ -67,6 +67,22 @@ ddg_goodie_test(
},
'<path d="M 0,60 a 25 25 0 0 0 120,0 a 25 25 0 0 0 -120,0" class="fill surface" data-type="surface"></path> <path d="M 0,60 a 30 10 0 0 1 120,0" class="stroke backface"></path> <path d="M 0,60 a 30 10 0 0 1 120,0" class="stroke backface" data-type="volume"></path> <path d="M 0,60 a 30 10 0 1 0 120,0 a 25 25 0 0 0 -120,0 a 25 25 0 0 0 120,0" class="stroke volume" data-type="volume"></path>',
),
'area of an equilateral triangle' => build_test(
'equilateral triangle',
{
area => { color => "#F1A031", html => "(a<sup>2</sup>√3)/4", nameCaps => "Area", symbol => "A" },
perimeter => { color => "#5B9E4D", html => "3a", nameCaps => "Perimeter", symbol => "u" }
},
'<path d="M 70,0 l 70,120 h -140 z" class="fill area" data-type="area"></path> <path d="M 70,0 l 70,120 m -140,0 l 70,-120 m 70,120 h -140" class="stroke perimeter" data-type="perimeter"></path>',
),
'area of a triangle' => build_test(
'triangle',
{
area => { color => "#F1A031", html => "bh/2", nameCaps => "Area", symbol => "A" },
perimeter => { color => "#5B9E4D", html => "a+b+c", nameCaps => "Perimeter", symbol => "u" }
},
'<path d="M 70,0 l 70,120 h -140 z" class="fill area" data-type="area"></path> <path d="M 70,0 l 0,120" class="stroke special height" data-type="height"></path> <path d="M 70,0 l 70,120 m -140,0 l 70,-120 m 70,120 h -140" class="stroke perimeter" data-type="perimeter"></path>',
),
# Does Not match to
'calc banana' => undef,
'formula of shirt' => undef,