a/ziglings
1
0
Fork 0
mirror of https://codeberg.org/andyscott/ziglings.git synced 2024-12-22 06:03:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Change the task so that the exercise contains two errors again.' (#24) from i22 into main

Browse source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/24
This commit is contained in:
Chris Boesch 2023-11-06 18:55:54 +00:00
commit 5a259a943f
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.zig
View file

@ -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",

8
exercises/060_floats.zig
View file

@ -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

12
patches/patches/060_floats.patch
View file

@ -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