tristan/exercises
1
0
Fork 0
mirror of https://codeberg.org/ziglings/exercises.git synced 2025-06-06 15:54:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'Shuttle weight fixed w.r.t. issue-211' (#212) from mz0/ziglings:shuttle-weight into main

Browse Source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/212
This commit is contained in:
Chris Boesch 2025-03-03 21:45:34 +00:00
commit ce64fe5a1a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.zig
View File

@ -963,7 +963,7 @@ const exercises = [_]Exercise{
}, },
.{ .{
.main_file = "060_floats.zig", .main_file = "060_floats.zig",
.output = "Shuttle liftoff weight: 2032kg", .output = "Shuttle liftoff weight: 2032 metric tons",
}, },
.{ .{
.main_file = "061_coercions.zig", .main_file = "061_coercions.zig",

6
exercises/060_floats.zig
View File

@ -41,14 +41,14 @@ pub fn main() void {
// The approximate weight of the Space Shuttle upon liftoff // The approximate weight of the Space Shuttle upon liftoff
// (including boosters and fuel tank) was 4,480,000 lb. // (including boosters and fuel tank) was 4,480,000 lb.
// //
// We'll convert this weight from pound to kilograms at a // We'll convert this weight from pounds to metric units at a
// conversion of 0.453592kg to the pound. // conversion of 0.453592 kg to the pound.
const shuttle_weight: f16 = 0.453592 * 4480e3; const shuttle_weight: f16 = 0.453592 * 4480e3;
// By default, float values are formatted in scientific // By default, float values are formatted in scientific
// notation. Try experimenting with '{d}' and '{d:.3}' to see // notation. Try experimenting with '{d}' and '{d:.3}' to see
// how decimal formatting works. // how decimal formatting works.
print("Shuttle liftoff weight: {d:.0}kg\n", .{shuttle_weight}); print("Shuttle liftoff weight: {d:.0} metric tons\n", .{shuttle_weight});
} }
// Floating further: // Floating further:

8
patches/patches/060_floats.patch
View File

@ -1,9 +1,9 @@
--- exercises/060_floats.zig 2025-02-14 09:10:40.443151829 +0100 --- exercises/060_floats.zig 2025-03-03 20:23:40.255443963 +0400
+++ answers/060_floats.zig 2025-02-14 09:10:47.576619873 +0100 +++ answers/060_floats.zig 2025-03-03 20:29:58.554854977 +0400
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
// //
// We'll convert this weight from pound to kilograms at a // We'll convert this weight from pounds to metric units at a
// conversion of 0.453592kg to the pound. // conversion of 0.453592 kg to the pound.
- const shuttle_weight: f16 = 0.453592 * 4480e3; - const shuttle_weight: f16 = 0.453592 * 4480e3;
+ const shuttle_weight: f32 = 0.453592 * 4.480e3; + const shuttle_weight: f32 = 0.453592 * 4.480e3;