From 65f3c0e0225dfdbb19620c8433ee26e992e96634 Mon Sep 17 00:00:00 2001
From: jean <jean@jeanavril.com>
Date: Fri, 13 Nov 2020 19:30:04 +0100
Subject: [PATCH] Added bubble sort algorithm

---
 GDP_Gesamt/src/Uebungen/Uebung5/Aufgabe2.java | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/GDP_Gesamt/src/Uebungen/Uebung5/Aufgabe2.java b/GDP_Gesamt/src/Uebungen/Uebung5/Aufgabe2.java
index 9d739ca..2bc0b9f 100644
--- a/GDP_Gesamt/src/Uebungen/Uebung5/Aufgabe2.java
+++ b/GDP_Gesamt/src/Uebungen/Uebung5/Aufgabe2.java
@@ -12,7 +12,7 @@ public class Aufgabe2 {
         while(true){
             userInterface();
             System.out.print("\n\n Check anoter string? [y/N]: ");
-            if(scanner.nextLine().charAt(0)!='y') break;
+            if(scanner.nextLine()!="y") break;
             System.out.println();
         }
     }
@@ -23,6 +23,7 @@ public class Aufgabe2 {
         stringAsCharArr = normalize(stringAsCharArr);
         char[] usedCharArr = usedChars(stringAsCharArr);
         int[]  charAmountArr = countChars(usedCharArr ,stringAsCharArr);
+        sort(charAmountArr,usedCharArr);
         histogramm(20,usedCharArr, charAmountArr);
     }
 
@@ -36,7 +37,7 @@ public class Aufgabe2 {
         int max = maximum(charAmount);
         for(int i=0;i<availableChars.length;i++) {
             System.out.print("\""+availableChars[i]+"\": ");
-            if(max>width)
+            if(max>width) // scale if max width is exceeded
                 for(int j=0;j<scale(charAmount[i],max,width);j++) System.out.print("#");
             else
                 for(int j=0;j<charAmount[i];j++) System.out.print("#");
@@ -48,7 +49,21 @@ public class Aufgabe2 {
         double calc = (double) value/oldMax*newMax;
         return (int) calc;
     }
-
+    // Bubble Sort
+    public static void sort(int[] amounts, char[] chars){
+       for(int i=amounts.length-1;i>0; i--)
+           for(int j=0;j<i;j++)
+               if(amounts[j]<amounts[j+1])
+                   swapItems(amounts,chars,j,j+1);
+    }
+    public static void swapItems(int[] amounts, char[] chars, int index1, int index2){
+        char memC = chars[index1];
+        int memI = amounts[index1];
+        chars[index1] = chars[index2];
+        amounts[index1] = amounts[index2];
+        chars[index2] = memC;
+        amounts[index2] = memI;
+    }
     public static int maximum(int[] inputArray){
         int largestNumber = inputArray[0];
         for(int i=1;i<inputArray.length;i++)