From c866f862ca7c3ae7755497943e6f6a2a85c07cf0 Mon Sep 17 00:00:00 2001 From: Danillo Bion Date: Wed, 30 Nov 2022 19:57:35 -0300 Subject: [PATCH 1/8] add novo algoritmo de ordenacao - bubblesort --- src/algoritmos/Bubblesort.java | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/algoritmos/Bubblesort.java diff --git a/src/algoritmos/Bubblesort.java b/src/algoritmos/Bubblesort.java new file mode 100644 index 0000000..008bfa7 --- /dev/null +++ b/src/algoritmos/Bubblesort.java @@ -0,0 +1,41 @@ +package algoritmos; + +public class BubbleSortMelhorado { + public static void main(String args[]) { + int[] v = {0, 1, 2, 3}; + BubbleSortMelhorado bs = new BubbleSortMelhorado(); + bs.ordenar(v); + for(int num : v) { + System.out.print(num + " "); + } + } + + /** + * Método que ordena um vetor de inteiros utilizando o algoritmo + * de Bubble Sort. + * + * @param v - Vetor que será ordenado. + */ + public void ordenar(int[] v) { + /* for utilizado para controlar a quantidade de vezes que o vetor será + ordenado. */ + for(int i = 0; i < v.length - 1; i++) { + // Variavel utilizada para controlar se o vetor ja está ordenado. + boolean estaOrdenado = true; + // for utilizado para ordenar o vetor. + for(int j = 0; j < v.length - 1 - i; j++) { + /* Se o valor da posição atual do vetor for maior que o proximo valor, + então troca os valores de lugar no vetor. */ + if(v[j] > v[j + 1]) { + int aux = v[j]; + v[j] = v[j + 1]; + v[j + 1] = aux; + estaOrdenado = false; + } + } + // Se o vetor está ordenado então para as iterações sobre ele. + if(estaOrdenado) + break; + } + } +} \ No newline at end of file From 5d60a31d9f57491b25616495b8ad2e5ac69d8b8f Mon Sep 17 00:00:00 2001 From: Danillo Bion Date: Wed, 30 Nov 2022 20:07:11 -0300 Subject: [PATCH 2/8] modificacoes no arquivo ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37b4d29..69f6e6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,4 +13,5 @@ jobs: with: java-version: '17' distribution: 'adopt' - - run: java src/algoritmos/Quicksort.java \ No newline at end of file + - run: java src/algoritmos/Quicksort.java + - run: java src/algoritmos/Bubblesort.java \ No newline at end of file From 4a863306227e345b3857ab151b43d39b3be85202 Mon Sep 17 00:00:00 2001 From: Danillo Bion Date: Wed, 30 Nov 2022 20:52:53 -0300 Subject: [PATCH 3/8] add gatilho de pull request ao arquivo ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69f6e6c..5806dab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: Java CI -on: [push] +on: [push, pull_request] jobs: build: From 3ed335c8938b9e3c22f0d151aa66945473485f11 Mon Sep 17 00:00:00 2001 From: rcaa Date: Thu, 1 Dec 2022 12:53:41 -0300 Subject: [PATCH 4/8] adicionando computacao de fibonacci --- src/exemplos/Main.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/exemplos/Main.java diff --git a/src/exemplos/Main.java b/src/exemplos/Main.java new file mode 100644 index 0000000..f1e69d6 --- /dev/null +++ b/src/exemplos/Main.java @@ -0,0 +1,18 @@ +package exemplos; + +public class Main { + + public static void main(String[] args) { + // TODO Auto-generated method stub + f(10); + } + + public static long f(int n) { + int x; + if (n < 2) { + return n; + } else { + return f(n - 1) + f(n - 2); + } + } +} From 4ef17c549e64d1b8f026afd3b497f70e8566c26f Mon Sep 17 00:00:00 2001 From: rcaa Date: Thu, 1 Dec 2022 13:14:31 -0300 Subject: [PATCH 5/8] ajeitando o nome da classe do MergeSort --- src/algoritmos/MergeSort.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/algoritmos/MergeSort.java b/src/algoritmos/MergeSort.java index a1ad3c3..7e3ac86 100644 --- a/src/algoritmos/MergeSort.java +++ b/src/algoritmos/MergeSort.java @@ -2,7 +2,7 @@ import java.io.IOException; -public class Mergesort { +public class MergeSort { public static void main(String[] args) throws IOException { int quantidade = 10000; From 286305651f1364d2304016f486b7b5496a5e628e Mon Sep 17 00:00:00 2001 From: rcaa Date: Thu, 1 Dec 2022 13:14:57 -0300 Subject: [PATCH 6/8] adicionando metodo para leitura de arquivo --- src/exemplos/Main.java | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/exemplos/Main.java b/src/exemplos/Main.java index f1e69d6..1b8e78a 100644 --- a/src/exemplos/Main.java +++ b/src/exemplos/Main.java @@ -1,10 +1,15 @@ package exemplos; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; + public class Main { public static void main(String[] args) { // TODO Auto-generated method stub f(10); + readFile(""); } public static long f(int n) { @@ -15,4 +20,24 @@ public static long f(int n) { return f(n - 1) + f(n - 2); } } + + public static String readFile(String fileName){ + BufferedReader br; + try { + br = new BufferedReader(new FileReader(fileName)); + final StringBuilder sb = new StringBuilder(); + String line = br.readLine(); + + while (line != null) { + sb.append(line); + sb.append(System.lineSeparator()); + line = br.readLine(); + } + br.close(); + return sb.toString(); + } catch (IOException e) { + e.printStackTrace(); + } + return ""; + } } From 992d024d48fb2f858a4367edb3c137e298f1825f Mon Sep 17 00:00:00 2001 From: rcaa Date: Thu, 1 Dec 2022 13:27:41 -0300 Subject: [PATCH 7/8] adicionando metodo de validacao de string --- src/exemplos/Main.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/exemplos/Main.java b/src/exemplos/Main.java index 1b8e78a..cfe6dbc 100644 --- a/src/exemplos/Main.java +++ b/src/exemplos/Main.java @@ -10,6 +10,7 @@ public static void main(String[] args) { // TODO Auto-generated method stub f(10); readFile(""); + validarString("omnilink"); } public static long f(int n) { @@ -40,4 +41,12 @@ public static String readFile(String fileName){ } return ""; } + + public static boolean validarString(String entrada) { + if (entrada != null && !entrada.equals("") && entrada.length() > 3) { + return true; + } else { + return false; + } + } } From bb9a83deb13e07bf0259bbe5987283e256694221 Mon Sep 17 00:00:00 2001 From: Danillo Bion Date: Thu, 1 Dec 2022 21:00:30 -0300 Subject: [PATCH 8/8] correcoes solicitadas pelo codacy --- src/algoritmos/MergeSort.java | 4 +++- src/algoritmos/Quicksort.java | 3 ++- src/algoritmos/SelectionSort.java | 2 -- src/exemplos/Main.java | 7 +------ 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/algoritmos/MergeSort.java b/src/algoritmos/MergeSort.java index 7e3ac86..26bb694 100644 --- a/src/algoritmos/MergeSort.java +++ b/src/algoritmos/MergeSort.java @@ -45,7 +45,9 @@ private static void mergeSort(int[] a, int n) { private static void merge( int[] a, int[] l, int[] r, int left, int right) { - int i = 0, j = 0, k = 0; + int i = 0; + int j = 0; + int k = 0; while (i < left && j < right) { if (l[i] <= r[j]) { a[k++] = l[i++]; diff --git a/src/algoritmos/Quicksort.java b/src/algoritmos/Quicksort.java index 9f109aa..2699a48 100644 --- a/src/algoritmos/Quicksort.java +++ b/src/algoritmos/Quicksort.java @@ -30,7 +30,8 @@ private static void quickSort(int[] vetor, int inicio, int fim) { private static int posicaoPivor(int[] vetor, int inicio, int fim) { int pivo = vetor[inicio]; - int i = inicio + 1, f = fim; + int i = inicio + 1; + int f = fim; while (i <= f) { if (vetor[i] <= pivo) i++; diff --git a/src/algoritmos/SelectionSort.java b/src/algoritmos/SelectionSort.java index c7d5ef7..c4d1ba7 100644 --- a/src/algoritmos/SelectionSort.java +++ b/src/algoritmos/SelectionSort.java @@ -1,7 +1,5 @@ package algoritmos; -import java.io.IOException; - public class SelectionSort { public static void main(String args[]) { diff --git a/src/exemplos/Main.java b/src/exemplos/Main.java index cfe6dbc..c2d1de7 100644 --- a/src/exemplos/Main.java +++ b/src/exemplos/Main.java @@ -14,7 +14,6 @@ public static void main(String[] args) { } public static long f(int n) { - int x; if (n < 2) { return n; } else { @@ -43,10 +42,6 @@ public static String readFile(String fileName){ } public static boolean validarString(String entrada) { - if (entrada != null && !entrada.equals("") && entrada.length() > 3) { - return true; - } else { - return false; - } + return entrada != null && !entrada.equals("") && entrada.length() > 3; } }