From 599d5fa27b41efe46fa64e63f2fcb75893e2cac8 Mon Sep 17 00:00:00 2001 From: Joao-Bosco-Jr Date: Wed, 30 Nov 2022 20:01:38 -0300 Subject: [PATCH 01/10] adicionando arquivo BubbleSort --- src/algoritmos/BubbleSort.java | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 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..79016c9 --- /dev/null +++ b/src/algoritmos/BubbleSort.java @@ -0,0 +1,38 @@ +package algoritmos; + +import java.io.IOException; + +p +public class BubbleSort { + public static void main(String args[]) { + int[] v = {5, 2, 4, 3, 0, 9, 7, 8, 1, 6}; + BubbleSort bs = new BubbleSort(); + 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++) { + // 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; + } + } + } + } +} +} From 07318dc1ccd702b389bdc51be15310403aefba2d Mon Sep 17 00:00:00 2001 From: Joao-Bosco-Jr Date: Wed, 30 Nov 2022 20:07:19 -0300 Subject: [PATCH 02/10] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20de=20arquivo=20ci?= =?UTF-8?q?.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37b4d29..5877970 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,4 +13,13 @@ 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 + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'adopt' + - run: java src/algoritmos/BubbleSort.java + From 8c0704e54e0d4ddeb60dce5ab7ff5a908e33793d Mon Sep 17 00:00:00 2001 From: Joao-Bosco-Jr Date: Wed, 30 Nov 2022 20:14:10 -0300 Subject: [PATCH 03/10] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20de=20arquivos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 7 ------- src/algoritmos/BubbleSort.java | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5877970..1f84d6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,12 +14,5 @@ jobs: java-version: '17' distribution: 'adopt' - run: java src/algoritmos/Quicksort.java - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'adopt' - run: java src/algoritmos/BubbleSort.java diff --git a/src/algoritmos/BubbleSort.java b/src/algoritmos/BubbleSort.java index 79016c9..ced0f68 100644 --- a/src/algoritmos/BubbleSort.java +++ b/src/algoritmos/BubbleSort.java @@ -2,7 +2,7 @@ import java.io.IOException; -p + public class BubbleSort { public static void main(String args[]) { int[] v = {5, 2, 4, 3, 0, 9, 7, 8, 1, 6}; @@ -35,4 +35,3 @@ public void ordenar(int[] v) { } } } -} From 53b50af2f431e24b28bd664767e48fdffa768cdb Mon Sep 17 00:00:00 2001 From: Joao-Bosco-Jr Date: Wed, 30 Nov 2022 20:51:21 -0300 Subject: [PATCH 04/10] adicionando gatilho pull request em 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 1f84d6e..a3e4622 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 5135bf1004d68ff952d2bc2fd96a31cf2f6d1106 Mon Sep 17 00:00:00 2001 From: Joao-Bosco-Jr Date: Wed, 30 Nov 2022 21:03:23 -0300 Subject: [PATCH 05/10] =?UTF-8?q?Resolu=C3=A7=C3=A3o=20de=20conflito?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 +-- src/algoritmos/Bubblesort.java | 34 +++++++++++++++++++++ src/algoritmos/SelectionSortExample.java | 38 ++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 src/algoritmos/Bubblesort.java create mode 100644 src/algoritmos/SelectionSortExample.java diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3e4622..a819e77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: Java CI -on: [push,pull_request]] +on: [push, pull_request] jobs: build: @@ -15,4 +15,4 @@ jobs: distribution: 'adopt' - run: java src/algoritmos/Quicksort.java - run: java src/algoritmos/BubbleSort.java - + - run: java src/algoritmos/SelectionSortExample.java diff --git a/src/algoritmos/Bubblesort.java b/src/algoritmos/Bubblesort.java new file mode 100644 index 0000000..378f93e --- /dev/null +++ b/src/algoritmos/Bubblesort.java @@ -0,0 +1,34 @@ +package algoritmos; + +import java.io.IOException; + +public class Quicksort { + + public static void main(String[] args) throws IOException { + int quantidade = 10000; + int[] vetor = new int[quantidade]; + + System.out.println("Vetor desordenado: "); + for (int i = 0; i < vetor.length; i++) { + vetor[i] = (int) (Math.random() * quantidade); + System.out.print(i + " "); + } + bubbleSort(vetor); + System.out.println("\nVetor ordenado: "); + for (int i : vetor) { + System.out.print(i + " "); + } + } + + private static void bubbleSort(int[] arr) { + for(int i = 0; i < arr.length - 1; i ++){ + for(int j = 0; j < arr.length - 1 ;j++){ + if(arr[j] > arr[j+1]){ + int swap = arr[j]; // place the bigger number to swap + arr[j] = arr[j+1]; // place the smaller number + arr[j+1] = swap; + } + } + } + } +} diff --git a/src/algoritmos/SelectionSortExample.java b/src/algoritmos/SelectionSortExample.java new file mode 100644 index 0000000..61248e7 --- /dev/null +++ b/src/algoritmos/SelectionSortExample.java @@ -0,0 +1,38 @@ +package algoritmos; + +public class SelectionSortExample { + + public static void main(String a[]){ + int quantidade = 10000; + int[] arr1 = new int[quantidade]; + + System.out.println("Before Selection Sort"); + for (int i = 0; i < arr1.length; i++) { + arr1[i] = (int) (Math.random() * quantidade); + System.out.print(arr1[i]+" "); + } + System.out.println(); + + selectionSort(arr1);//sorting array using selection sort + + System.out.println("After Selection Sort"); + for (int i = 0; i < arr1.length; i++) { + System.out.print(arr1[i]+" "); + } + } + + public static void selectionSort(int[] arr){ + for (int i = 0; i < arr.length - 1; i++) + { + int index = i; + for (int j = i + 1; j < arr.length; j++){ + if (arr[j] < arr[index]){ + index = j;//searching for lowest index + } + } + int smallerNumber = arr[index]; + arr[index] = arr[i]; + arr[i] = smallerNumber; + } + } +} From 3ed335c8938b9e3c22f0d151aa66945473485f11 Mon Sep 17 00:00:00 2001 From: rcaa Date: Thu, 1 Dec 2022 12:53:41 -0300 Subject: [PATCH 06/10] 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 07/10] 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 08/10] 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 09/10] 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 ccca5aae82950253994cee866c66b0583005b10b Mon Sep 17 00:00:00 2001 From: Joao-Bosco-Jr Date: Thu, 1 Dec 2022 21:00:26 -0300 Subject: [PATCH 10/10] =?UTF-8?q?Corre=C3=A7=C3=B5es=20solicitadas=20pelo?= =?UTF-8?q?=20codacy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/algoritmos/BubbleSort.java | 1 - src/algoritmos/Bubblesort.java | 1 - src/algoritmos/MergeSort.java | 4 +++- src/algoritmos/Quicksort.java | 3 ++- src/algoritmos/SelectionSort.java | 2 +- src/exemplos/Main.java | 7 +------ 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/algoritmos/BubbleSort.java b/src/algoritmos/BubbleSort.java index ced0f68..eefb44a 100644 --- a/src/algoritmos/BubbleSort.java +++ b/src/algoritmos/BubbleSort.java @@ -1,6 +1,5 @@ package algoritmos; -import java.io.IOException; public class BubbleSort { diff --git a/src/algoritmos/Bubblesort.java b/src/algoritmos/Bubblesort.java index 378f93e..0e18566 100644 --- a/src/algoritmos/Bubblesort.java +++ b/src/algoritmos/Bubblesort.java @@ -1,6 +1,5 @@ package algoritmos; -import java.io.IOException; public class Quicksort { diff --git a/src/algoritmos/MergeSort.java b/src/algoritmos/MergeSort.java index 7e3ac86..c25eead 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..ce777a1 100644 --- a/src/algoritmos/SelectionSort.java +++ b/src/algoritmos/SelectionSort.java @@ -1,6 +1,6 @@ package algoritmos; -import java.io.IOException; + public class SelectionSort { 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; } }