pull request 01-12-2022 parte 2 da atividade cefanys #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

cefanys wants to merge 20 commits into rcaa:master from cefanys:master

.github/workflows/ci.yml

-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     name: Java CI
     on: [push, pull_request]
     jobs:
@@ Expand Down @@

src/algoritmos/Bubblesort.java

-Original file line number
+Diff line change
@@ -0,0 +1,45 @@
+    package algoritmos;
+    import java.io.IOException;
+    public class Bubblesort {
+    	public static void main(String[] args) throws IOException {
+                 int quantidade = 10000;
+                 int[] vetor = new int[quantidade];
+                System.out.println("\nVetor: ");
+                 for (int i = 0; i < vetor.length; i++) {
+                         vetor[i] = (int) (Math.random()*quantidade);
+                         System.out.print(vetor[i] + " ");
+                 }
+                 long tempoInicial = System.currentTimeMillis();
+                 bubbleSort(vetor);
+                 long tempoFinal = System.currentTimeMillis();
+                 System.out.println("\nExecutado em = " + (tempoFinal - tempoInicial) + " ms");
+           }
+           private static void bubbleSort(int vetor[]){
+                   boolean troca = true;
+                   int aux;
+                   while (troca) {
+                       troca = false;
+                       for (int i = 0; i < vetor.length - 1; i++) {
+                           if (vetor[i] > vetor[i + 1]) {
+                               aux = vetor[i];
+                               vetor[i] = vetor[i + 1];
+                               vetor[i + 1] = aux;
+                               troca = true;
+                           }
+                       }
+                   }
+           }
+    }

src/algoritmos/MergeSort.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down Expand Up / @@ -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++];
@@ Expand Down @@

src/algoritmos/Quicksort.java

-Original file line number
+Diff line change
@@ Expand Up @@
     	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++;
@@ Expand Down @@

src/algoritmos/SelectionSort.java

-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     package algoritmos;
-    import java.io.IOException;
     public class SelectionSort {
@@ Expand Down @@

src/algoritmos/SelectionSortExample.java

-Original file line number
+Diff line change
@@ -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;
+            }
+        }
+    }

src/exemplos/Main.java

-Original file line number
+Diff line change
@@ -0,0 +1,47 @@
+    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("");
+    		validarString("omnilink");
+    	}
+    	public static long f(int n) {
+    		if (n < 2) {
+                return n;
+            } else {
+                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 "";
+    	}
+    	public static boolean validarString(String entrada) {
+    		return (entrada != null && !entrada.equals("") && entrada.length() > 3)
+    	}
+    }

Provide feedback