Browse Source

Shuttle weight fixed w.r.t. issue-211

mz0 5 months ago
parent
commit
a22f1df0a1
3 changed files with 8 additions and 8 deletions
  1. 1 1
      build.zig
  2. 3 3
      exercises/060_floats.zig
  3. 4 4
      patches/patches/060_floats.patch

+ 1 - 1
build.zig

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

+ 3 - 3
exercises/060_floats.zig

@@ -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
-    // conversion of 0.453592kg to the pound.
+    // 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: 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:

+ 4 - 4
patches/patches/060_floats.patch

@@ -1,9 +1,9 @@
---- exercises/060_floats.zig	2025-02-14 09:10:40.443151829 +0100
-+++ answers/060_floats.zig	2025-02-14 09:10:47.576619873 +0100
+--- exercises/060_floats.zig	2025-03-03 20:23:40.255443963 +0400
++++ 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
-     // conversion of 0.453592kg to the pound.
+     // 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: f16 = 0.453592 * 4480e3;
 +    const shuttle_weight: f32 = 0.453592 * 4.480e3;
 +    const shuttle_weight: f32 = 0.453592 * 4.480e3;