deadvey/mathgenerator
1
0
Fork 0
mirror of https://github.com/DeaDvey/mathgenerator.git synced 2025-11-28 06:25:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix (#443)

Browse Source
This commit is contained in:
shraf
2024-04-14 16:34:30 +02:00
committed by GitHub
parent 93f755c790
commit 2dbd0efac6
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mathgenerator/geometry.py
View File

@@ -474,23 +474,26 @@ def surface_area_pyramid(unit='m'):
(15, 20, 25), (5, 12, 13), (10, 24, 26), (7, 24, 25)] (15, 20, 25), (5, 12, 13), (10, 24, 26), (7, 24, 25)]
# Generate first triplet # Generate first triplet
height, half_width, triangle_height_1 = random.sample( height, half_width, _ = random.sample(
random.choice(_PYTHAGOREAN), 3) random.choice(_PYTHAGOREAN), 3)
# Calculate first triangle's area # Calculate the first triangle height
triangle_1 = half_width * triangle_height_1 triangle_height_1 = math.sqrt((half_width)**2 + height**2)
# Generate second triplet # Generate second triplet
second_triplet = random.choice([i for i in _PYTHAGOREAN if height in i]) second_triplet = random.choice([i for i in _PYTHAGOREAN if height in i])
half_length, triangle_height_2 = random.sample( half_length, _ = random.sample(
tuple(i for i in second_triplet if i != height), 2) tuple(i for i in second_triplet if i != height), 2)
# Calculate second triangle's area # Calculate the second triangle height
triangle_2 = half_length * triangle_height_2 triangle_height_2 = math.sqrt((half_length)**2 + height**2)
# Calculate triangles area
triangle_1 = half_length * triangle_height_1
triangle_2 = half_width * triangle_height_2
# Calculate base area # Calculate base area
base = 4 * half_width * half_length base = 4 * half_width * half_length
ans = base + 2 * triangle_1 + 2 * triangle_2 ans = base + 2 * triangle_1 + 2 * triangle_2
problem = f"Surface area of pyramid with base length $= {2*half_length}{unit}$, base width $= {2*half_width}{unit}$, and height $= {height}{unit}$ is" problem = f"Surface area of pyramid with base length $= {2*half_length}{unit}$, base width $= {2*half_width}{unit}$, and height $= {height}{unit}$ is"