diff options
| author | Chris Boesch <chrboesch@noreply.codeberg.org> | 2023-11-06 18:55:54 +0000 |
|---|---|---|
| committer | Chris Boesch <chrboesch@noreply.codeberg.org> | 2023-11-06 18:55:54 +0000 |
| commit | 5a259a943fc95121b836f464b4eb8c9c371c4b3f (patch) | |
| tree | e35c9c884cfe2a4f7ff6e8d5baccf70fc451d842 | |
| parent | 08d294f2b8b13e33f116590f067c0ccaf079bfc1 (diff) | |
| parent | 55b58fea56b1ae9b85d5fafe99a4194112da7da3 (diff) | |
Merge pull request 'Change the task so that the exercise contains two errors again.' (#24) from i22 into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/24
| -rw-r--r-- | build.zig | 2 | ||||
| -rw-r--r-- | exercises/060_floats.zig | 8 | ||||
| -rw-r--r-- | patches/patches/060_floats.patch | 12 |
3 files changed, 11 insertions, 11 deletions
@@ -839,7 +839,7 @@ const exercises = [_]Exercise{ }, .{ .main_file = "060_floats.zig", - .output = "Shuttle liftoff weight: 1995796kg", + .output = "Shuttle liftoff weight: 2032092kg", }, .{ .main_file = "061_coercions.zig", diff --git a/exercises/060_floats.zig b/exercises/060_floats.zig index 69b3946..6f341ad 100644 --- a/exercises/060_floats.zig +++ b/exercises/060_floats.zig @@ -39,11 +39,11 @@ const print = @import("std").debug.print; pub fn main() void { // The approximate weight of the Space Shuttle upon liftoff - // (including boosters and fuel tank) was 2,200 tons. + // (including boosters and fuel tank) was 4,480,000 lb. // - // We'll convert this weight from tons to kilograms at a - // conversion of 907.18kg to the ton. - const shuttle_weight: f16 = 907.18 * 2200; + // We'll convert this weight from pound to kilograms at a + // conversion of 0.453592kg to the pound. + const shuttle_weight: f16 = 0.453592 * 4480e6; // By default, float values are formatted in scientific // notation. Try experimenting with '{d}' and '{d:.3}' to see diff --git a/patches/patches/060_floats.patch b/patches/patches/060_floats.patch index 3a130dd..404654a 100644 --- a/patches/patches/060_floats.patch +++ b/patches/patches/060_floats.patch @@ -1,11 +1,11 @@ ---- exercises/060_floats.zig 2023-10-03 22:15:22.125574535 +0200 -+++ answers/060_floats.zig 2023-10-05 20:04:07.112767942 +0200 +--- exercises/060_floats.zig 2023-11-06 19:45:03.609687304 +0100 ++++ answers/060_floats.zig 2023-11-06 19:44:49.249419994 +0100 @@ -43,7 +43,7 @@ // - // We'll convert this weight from tons to kilograms at a - // conversion of 907.18kg to the ton. -- const shuttle_weight: f16 = 907.18 * 2200; -+ const shuttle_weight: f32 = 907.18 * 2200.0; + // We'll convert this weight from pound to kilograms at a + // conversion of 0.453592kg to the pound. +- const shuttle_weight: f16 = 0.453592 * 4480e6; ++ 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 |