From e57948787d55af5e152dd5b125e6e20469404fe2 Mon Sep 17 00:00:00 2001 From: Zhou-Yang-whatever <34389142+Zhou-Yang-whatever@users.noreply.github.com> Date: Thu, 4 Oct 2018 18:24:28 -0700 Subject: [PATCH 1/2] Update interleave.java This is the shortest answer I saw and I like it. I changed something to make it shorter. --- chapter-10/interleave.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/chapter-10/interleave.java b/chapter-10/interleave.java index ae4e2db..83fa516 100644 --- a/chapter-10/interleave.java +++ b/chapter-10/interleave.java @@ -10,13 +10,11 @@ public static void interleave(ArrayList a1, ArrayList a2) { int i; for (i = 0; i < times; i++) { - int num = a2.get(i); - a1.add(2 * i + 1, num); + a1.add(2 * i + 1, a2.get(i)); } - if (i < a2.size()) { - for (int j = i; j < a2.size(); j++) { - a1.add(a2.get(j)); - } + for (int j = i; j < a2.size(); j++) { + a1.add(a2.get(j)); } + } From 465134187106a795a0765672b8cf2d26d558376c Mon Sep 17 00:00:00 2001 From: Zhou-Yang-whatever <34389142+Zhou-Yang-whatever@users.noreply.github.com> Date: Fri, 5 Oct 2018 03:51:31 -0700 Subject: [PATCH 2/2] Update interleave.java --- chapter-10/interleave.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/chapter-10/interleave.java b/chapter-10/interleave.java index 83fa516..c611961 100644 --- a/chapter-10/interleave.java +++ b/chapter-10/interleave.java @@ -6,14 +6,13 @@ */ public static void interleave(ArrayList a1, ArrayList a2) { - int times = Math.min(a1.size(), a2.size()); - int i; + int comSize = Math.min(a1.size(), a2.size()); - for (i = 0; i < times; i++) { + for (i = 0; i < comSize; i++) { a1.add(2 * i + 1, a2.get(i)); } - for (int j = i; j < a2.size(); j++) { + for (int j = comSize; j < a2.size(); j++) { a1.add(a2.get(j)); }