From a218425ee57d0800fa685d0eb4f5040329a28da2 Mon Sep 17 00:00:00 2001 From: Sean Aubin Date: Wed, 8 Mar 2023 13:21:48 -0500 Subject: add 095_memory_allocation.patch --- patches/patches/095_memory_allocation.patch | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 patches/patches/095_memory_allocation.patch (limited to 'patches') diff --git a/patches/patches/095_memory_allocation.patch b/patches/patches/095_memory_allocation.patch new file mode 100644 index 0000000..e13a27a --- /dev/null +++ b/patches/patches/095_memory_allocation.patch @@ -0,0 +1,4 @@ +65c65 +< var avg: []f64 = {}; +--- +> var avg: []f64 = try allocator.alloc(f64, arr.len); -- cgit v1.2.3-70-g09d2 From 484822a8da1361d5878c82b0f30eafec1e3bc43e Mon Sep 17 00:00:00 2001 From: Sean Aubin Date: Wed, 8 Mar 2023 13:42:21 -0500 Subject: rename memory allocation 095 -> 096 --- exercises/095_memory_allocation.zig | 75 ----------------------------- exercises/096_memory_allocation.zig | 75 +++++++++++++++++++++++++++++ patches/patches/095_memory_allocation.patch | 4 -- patches/patches/096_memory_allocation.patch | 4 ++ 4 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 exercises/095_memory_allocation.zig create mode 100644 exercises/096_memory_allocation.zig delete mode 100644 patches/patches/095_memory_allocation.patch create mode 100644 patches/patches/096_memory_allocation.patch (limited to 'patches') diff --git a/exercises/095_memory_allocation.zig b/exercises/095_memory_allocation.zig deleted file mode 100644 index 057b420..0000000 --- a/exercises/095_memory_allocation.zig +++ /dev/null @@ -1,75 +0,0 @@ -// In most of the examples so far, the inputs are known at compile -// time, thus the amount of memory used by the program is fixed. -// However, if responding to input whose size is not known at compile -// time, such as: -// - user input via command-line arguments -// - inputs from another program -// -// You'll need to request memory for your program to be allocated by -// your operating system at runtime. -// -// Zig provides several different allocators. In the Zig -// documentation, it recommends the Arena allocator for simple -// programs which allocate once and then exit: -// -// const std = @import("std"); -// -// // memory allocation can fail, so the return type is !void -// pub fn main() !void { -// -// var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); -// defer arena.deinit(); -// -// const allocator = arena.allocator(); -// -// const ptr = try allocator.create(i32); -// std.debug.print("ptr={*}\n", .{ptr}); -// -// const slice_ptr = try allocator.alloc(f64, 5); -// std.debug.print("ptr={*}\n", .{ptr}); -// } - -// Instead of an simple integer or a constant sized slice, this -// program requires a slice to be allocated that is the same size as -// an input array. - -// Given a series of numbers, take the running average. In other -// words, each item N should contain the average of the last N -// elements. - -const std = @import("std"); - -fn runningAverage(arr: []const f64, avg: []f64) void { - var sum: f64 = 0; - - for (0.., arr) |index, val| { - sum += val; - avg[index] = sum / @intToFloat(f64, index + 1); - } -} - -pub fn main() !void { - // pretend this was defined by reading in user input - var arr: []const f64 = &[_]f64{ 0.3, 0.2, 0.1, 0.1, 0.4 }; - - // initialize the allocator - var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); - - // free the memory on exit - defer arena.deinit(); - - // initialize the allocator - const allocator = arena.allocator(); - - // allocate memory for this array instead of empty initialization - var avg: []f64 = {}; - - runningAverage(arr, avg); - std.debug.print("Running Average: ", .{}); - for (avg) |val| { - std.debug.print("{d:.2} ", .{val}); - } -} - -// For more details on memory allocation and the different types of -// memory allocators, see https://www.youtube.com/watch?v=vHWiDx_l4V0 diff --git a/exercises/096_memory_allocation.zig b/exercises/096_memory_allocation.zig new file mode 100644 index 0000000..057b420 --- /dev/null +++ b/exercises/096_memory_allocation.zig @@ -0,0 +1,75 @@ +// In most of the examples so far, the inputs are known at compile +// time, thus the amount of memory used by the program is fixed. +// However, if responding to input whose size is not known at compile +// time, such as: +// - user input via command-line arguments +// - inputs from another program +// +// You'll need to request memory for your program to be allocated by +// your operating system at runtime. +// +// Zig provides several different allocators. In the Zig +// documentation, it recommends the Arena allocator for simple +// programs which allocate once and then exit: +// +// const std = @import("std"); +// +// // memory allocation can fail, so the return type is !void +// pub fn main() !void { +// +// var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); +// defer arena.deinit(); +// +// const allocator = arena.allocator(); +// +// const ptr = try allocator.create(i32); +// std.debug.print("ptr={*}\n", .{ptr}); +// +// const slice_ptr = try allocator.alloc(f64, 5); +// std.debug.print("ptr={*}\n", .{ptr}); +// } + +// Instead of an simple integer or a constant sized slice, this +// program requires a slice to be allocated that is the same size as +// an input array. + +// Given a series of numbers, take the running average. In other +// words, each item N should contain the average of the last N +// elements. + +const std = @import("std"); + +fn runningAverage(arr: []const f64, avg: []f64) void { + var sum: f64 = 0; + + for (0.., arr) |index, val| { + sum += val; + avg[index] = sum / @intToFloat(f64, index + 1); + } +} + +pub fn main() !void { + // pretend this was defined by reading in user input + var arr: []const f64 = &[_]f64{ 0.3, 0.2, 0.1, 0.1, 0.4 }; + + // initialize the allocator + var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); + + // free the memory on exit + defer arena.deinit(); + + // initialize the allocator + const allocator = arena.allocator(); + + // allocate memory for this array instead of empty initialization + var avg: []f64 = {}; + + runningAverage(arr, avg); + std.debug.print("Running Average: ", .{}); + for (avg) |val| { + std.debug.print("{d:.2} ", .{val}); + } +} + +// For more details on memory allocation and the different types of +// memory allocators, see https://www.youtube.com/watch?v=vHWiDx_l4V0 diff --git a/patches/patches/095_memory_allocation.patch b/patches/patches/095_memory_allocation.patch deleted file mode 100644 index e13a27a..0000000 --- a/patches/patches/095_memory_allocation.patch +++ /dev/null @@ -1,4 +0,0 @@ -65c65 -< var avg: []f64 = {}; ---- -> var avg: []f64 = try allocator.alloc(f64, arr.len); diff --git a/patches/patches/096_memory_allocation.patch b/patches/patches/096_memory_allocation.patch new file mode 100644 index 0000000..e13a27a --- /dev/null +++ b/patches/patches/096_memory_allocation.patch @@ -0,0 +1,4 @@ +65c65 +< var avg: []f64 = {}; +--- +> var avg: []f64 = try allocator.alloc(f64, arr.len); -- cgit v1.2.3-70-g09d2 From be87134397d1728b3d98d1229d241254130e0708 Mon Sep 17 00:00:00 2001 From: Sean Aubin Date: Wed, 8 Mar 2023 19:22:17 -0500 Subject: change empty init to '???' placeholder --- exercises/096_memory_allocation.zig | 4 ++-- patches/patches/096_memory_allocation.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'patches') diff --git a/exercises/096_memory_allocation.zig b/exercises/096_memory_allocation.zig index 057b420..7843b93 100644 --- a/exercises/096_memory_allocation.zig +++ b/exercises/096_memory_allocation.zig @@ -61,8 +61,8 @@ pub fn main() !void { // initialize the allocator const allocator = arena.allocator(); - // allocate memory for this array instead of empty initialization - var avg: []f64 = {}; + // allocate memory for this array + var avg: []f64 = ???; runningAverage(arr, avg); std.debug.print("Running Average: ", .{}); diff --git a/patches/patches/096_memory_allocation.patch b/patches/patches/096_memory_allocation.patch index e13a27a..5398ce5 100644 --- a/patches/patches/096_memory_allocation.patch +++ b/patches/patches/096_memory_allocation.patch @@ -1,4 +1,4 @@ 65c65 -< var avg: []f64 = {}; +< var avg: []f64 = ???; --- > var avg: []f64 = try allocator.alloc(f64, arr.len); -- cgit v1.2.3-70-g09d2