From ecfd7d8e89d292add03c4b67efaa54ea5bc4bf78 Mon Sep 17 00:00:00 2001 From: AotoTakeyama <50577559+AotoTakeyama@users.noreply.github.com> Date: Tue, 14 May 2019 12:35:38 +0900 Subject: [PATCH 1/2] Update BubbleSort.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BubbleSortクラスのsort(int[] ary)メソッドを作成 --- src/jp/co/cis/sort/BubbleSort.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/jp/co/cis/sort/BubbleSort.java b/src/jp/co/cis/sort/BubbleSort.java index 619c4da..0c36102 100644 --- a/src/jp/co/cis/sort/BubbleSort.java +++ b/src/jp/co/cis/sort/BubbleSort.java @@ -12,8 +12,19 @@ public class BubbleSort { * @return */ public int[] sort(int[] ary) { - // TODO バブルソートで並び替える処理を実装してください。 - return ary; + + int aryLength = ary.length; + int changeNum = aryLength - 1; + for(int i=changeNum; i>0; i--){ + for(int j=0; jary[i+1]){ + int temNum = ary[i+1]; + ary[i+1] = ary[i]; + ary[i] = temNum; + } + } + } + return ary; } } From b09b2c7b71ad39b218a34bdd4b900b02ac6b3b6f Mon Sep 17 00:00:00 2001 From: AotoTakeyama <50577559+AotoTakeyama@users.noreply.github.com> Date: Tue, 14 May 2019 19:23:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20=E3=80=80BubbleSort.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit コードが間違っていたので修正しました。 --- src/jp/co/cis/sort/BubbleSort.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/jp/co/cis/sort/BubbleSort.java b/src/jp/co/cis/sort/BubbleSort.java index 0c36102..e57fd39 100644 --- a/src/jp/co/cis/sort/BubbleSort.java +++ b/src/jp/co/cis/sort/BubbleSort.java @@ -13,14 +13,18 @@ public class BubbleSort { */ public int[] sort(int[] ary) { + /** + * aryLengthで配列の長さを取得 + * changeNumは配列の入れ替えをする回数を表します + */ int aryLength = ary.length; int changeNum = aryLength - 1; for(int i=changeNum; i>0; i--){ for(int j=0; jary[i+1]){ - int temNum = ary[i+1]; - ary[i+1] = ary[i]; - ary[i] = temNum; + if(ary[j]>ary[j+1]){ + int temNum = ary[j+1]; + ary[j+1] = ary[j]; + ary[j] = temNum; } } }