diff options
| author | Chris Boesch <chrboesch@noreply.codeberg.org> | 2025-10-03 13:37:39 +0200 |
|---|---|---|
| committer | Chris Boesch <chrboesch@noreply.codeberg.org> | 2025-10-03 13:37:39 +0200 |
| commit | b25f9bb66e274a7c77190d941bc41414fea09038 (patch) | |
| tree | 59a7c2bab62f4fa31dc49f8cd45b58616ab5854f | |
| parent | c9218fbb22e38f4b6d387ba45b25c921ce9473ef (diff) | |
| parent | c7e59864cad7f8bfa6ec484002bd78b4e463d1f8 (diff) | |
Merge pull request 'Fixed conversion from kg to tons' (#310) from i309 into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/310
| -rw-r--r-- | exercises/060_floats.zig | 2 | ||||
| -rw-r--r-- | patches/patches/060_floats.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/exercises/060_floats.zig b/exercises/060_floats.zig index b570518..ed63bb1 100644 --- a/exercises/060_floats.zig +++ b/exercises/060_floats.zig @@ -48,7 +48,7 @@ pub fn main() void { // By default, float values are formatted in scientific // notation. Try experimenting with '{d}' and '{d:.3}' to see // how decimal formatting works. - print("Shuttle liftoff weight: {d:.0} metric tons\n", .{shuttle_weight}); + print("Shuttle liftoff weight: {d:.0} metric tons\n", .{shuttle_weight / 1e3}); } // Floating further: diff --git a/patches/patches/060_floats.patch b/patches/patches/060_floats.patch index 9e64c6f..327d814 100644 --- a/patches/patches/060_floats.patch +++ b/patches/patches/060_floats.patch @@ -1,11 +1,11 @@ ---- exercises/060_floats.zig 2025-03-03 20:23:40.255443963 +0400 -+++ answers/060_floats.zig 2025-03-03 20:29:58.554854977 +0400 +--- exercises/060_floats.zig 2025-10-03 13:28:03.092371247 +0200 ++++ answers/060_floats.zig 2025-10-03 13:27:40.842926774 +0200 @@ -43,7 +43,7 @@ // // We'll convert this weight from pounds to metric units at a // conversion of 0.453592 kg to the pound. - const shuttle_weight: f16 = 0.453592 * 4480e3; -+ const shuttle_weight: f32 = 0.453592 * 4.480e3; ++ const shuttle_weight: f32 = 0.453592 * 4.480e6; // By default, float values are formatted in scientific // notation. Try experimenting with '{d}' and '{d:.3}' to see |