tristan/exercises
1
0
Fork 0
mirror of https://codeberg.org/ziglings/exercises.git synced 2025-04-05 16:05:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Shuttle weight fixed' () from e60 into main

Browse source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/208
This commit is contained in:
Chris Boesch 2025-02-14 08:29:31 +00:00
commit 2a9ef2d2c8
3 changed files with 7 additions and 8 deletions

5
build.zig
View file

@ -283,12 +283,11 @@ pub fn build(b: *Build) !void {
starting_exercise = try std.fmt.parseInt(u32, contents, 10);
} else |err| {
switch (err) {
std.fs.File.OpenError.FileNotFound => {
// This is fine, may be the first time tests are run or progress have been reset
},
else => {
print("Unable to open {s}: {}\n", .{progress_filename, err});
print("Unable to open {s}: {}\n", .{ progress_filename, err });
return err;
},
}
@ -964,7 +963,7 @@ const exercises = [_]Exercise{
},
.{
.main_file = "060_floats.zig",
.output = "Shuttle liftoff weight: 2032092kg",
.output = "Shuttle liftoff weight: 2032kg",
},
.{
.main_file = "061_coercions.zig",

2
exercises/060_floats.zig
View file

@ -43,7 +43,7 @@ pub fn main() void {
//
// 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: f16 = 0.453592 * 4480e3;
// By default, float values are formatted in scientific
// notation. Try experimenting with '{d}' and '{d:.3}' to see

8
patches/patches/060_floats.patch
View file

@ -1,11 +1,11 @@
--- exercises/060_floats.zig 2023-11-06 19:45:03.609687304 +0100
+++ answers/060_floats.zig 2023-11-06 19:44:49.249419994 +0100
--- exercises/060_floats.zig 2025-02-14 09:10:40.443151829 +0100
+++ answers/060_floats.zig 2025-02-14 09:10:47.576619873 +0100
@@ -43,7 +43,7 @@
//
// 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;
- const shuttle_weight: f16 = 0.453592 * 4480e3;
+ const shuttle_weight: f32 = 0.453592 * 4.480e3;
// By default, float values are formatted in scientific
// notation. Try experimenting with '{d}' and '{d:.3}' to see