diff --git a/.gradle/7.1.1/executionHistory/executionHistory.bin b/.gradle/7.1.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000..4d5c5d4 Binary files /dev/null and b/.gradle/7.1.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.1.1/executionHistory/executionHistory.lock b/.gradle/7.1.1/executionHistory/executionHistory.lock index 195e100..94fdc57 100644 Binary files a/.gradle/7.1.1/executionHistory/executionHistory.lock and b/.gradle/7.1.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.1.1/fileHashes/fileHashes.bin b/.gradle/7.1.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000..8bb05f4 Binary files /dev/null and b/.gradle/7.1.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.1.1/fileHashes/fileHashes.lock b/.gradle/7.1.1/fileHashes/fileHashes.lock index 0c72d4c..d9acae1 100644 Binary files a/.gradle/7.1.1/fileHashes/fileHashes.lock and b/.gradle/7.1.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.1.1/fileHashes/resourceHashesCache.bin b/.gradle/7.1.1/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..b054cc3 Binary files /dev/null and b/.gradle/7.1.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c593acb..dd4193f 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..1241c5c Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..659bf43 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ba1ec5c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..fdc392f --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e2cfc0f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build/classes/java/main/com/oracle/arrays/Multidimensional.class b/build/classes/java/main/com/oracle/arrays/Multidimensional.class index d33c91f..8e08673 100644 Binary files a/build/classes/java/main/com/oracle/arrays/Multidimensional.class and b/build/classes/java/main/com/oracle/arrays/Multidimensional.class differ diff --git a/build/classes/java/main/com/oracle/arrays/Unidimensional.class b/build/classes/java/main/com/oracle/arrays/Unidimensional.class index 2dbc08a..ca5d2c7 100644 Binary files a/build/classes/java/main/com/oracle/arrays/Unidimensional.class and b/build/classes/java/main/com/oracle/arrays/Unidimensional.class differ diff --git a/build/classes/java/main/com/oracle/arrays/impl/MultidimensionalImpl.class b/build/classes/java/main/com/oracle/arrays/impl/MultidimensionalImpl.class index 40557a4..874cf15 100644 Binary files a/build/classes/java/main/com/oracle/arrays/impl/MultidimensionalImpl.class and b/build/classes/java/main/com/oracle/arrays/impl/MultidimensionalImpl.class differ diff --git a/build/classes/java/main/com/oracle/arrays/impl/UnidimensionalImpl.class b/build/classes/java/main/com/oracle/arrays/impl/UnidimensionalImpl.class index 958eefe..a257aa3 100644 Binary files a/build/classes/java/main/com/oracle/arrays/impl/UnidimensionalImpl.class and b/build/classes/java/main/com/oracle/arrays/impl/UnidimensionalImpl.class differ diff --git a/build/classes/java/main/com/oracle/arrays/model/Posicion.class b/build/classes/java/main/com/oracle/arrays/model/Posicion.class index 8bda835..9b362ce 100644 Binary files a/build/classes/java/main/com/oracle/arrays/model/Posicion.class and b/build/classes/java/main/com/oracle/arrays/model/Posicion.class differ diff --git a/build/classes/java/test/com/oracle/arrays/MultidimensionalTest.class b/build/classes/java/test/com/oracle/arrays/MultidimensionalTest.class index 54623e9..1d26e70 100644 Binary files a/build/classes/java/test/com/oracle/arrays/MultidimensionalTest.class and b/build/classes/java/test/com/oracle/arrays/MultidimensionalTest.class differ diff --git a/build/classes/java/test/com/oracle/arrays/UnidimensionalTest.class b/build/classes/java/test/com/oracle/arrays/UnidimensionalTest.class index ae543fa..203a52a 100644 Binary files a/build/classes/java/test/com/oracle/arrays/UnidimensionalTest.class and b/build/classes/java/test/com/oracle/arrays/UnidimensionalTest.class differ diff --git a/build/reports/tests/test/classes/com.oracle.arrays.MultidimensionalTest.html b/build/reports/tests/test/classes/com.oracle.arrays.UnidimensionalTest.html similarity index 84% rename from build/reports/tests/test/classes/com.oracle.arrays.MultidimensionalTest.html rename to build/reports/tests/test/classes/com.oracle.arrays.UnidimensionalTest.html index e599179..d79f267 100644 --- a/build/reports/tests/test/classes/com.oracle.arrays.MultidimensionalTest.html +++ b/build/reports/tests/test/classes/com.oracle.arrays.UnidimensionalTest.html @@ -3,17 +3,17 @@ -Test results - MultidimensionalTest +Test results - UnidimensionalTest
-

MultidimensionalTest

+

UnidimensionalTest

all > -com.oracle.arrays > MultidimensionalTest
+com.oracle.arrays > UnidimensionalTest
@@ -41,7 +41,7 @@

MultidimensionalTest

@@ -75,8 +75,8 @@

Tests

- - + +
-
0.042s
+
0.026s

duration
getDatoTest()0.042sordenamientoTest()0.026s passed
@@ -89,7 +89,7 @@

Tests

Generated by -Gradle 7.1.1 at Sep 6, 2022, 10:57:32 PM

+Gradle 7.1.1 at 11 sep. 2022 20:09:45

diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html index 5cf8264..e800abf 100644 --- a/build/reports/tests/test/index.html +++ b/build/reports/tests/test/index.html @@ -38,7 +38,7 @@

Test Summary

-
0.042s
+
0.026s

duration

@@ -85,7 +85,7 @@

Packages

1 0 0 -0.042s +0.026s 100% @@ -107,12 +107,12 @@

Classes

-com.oracle.arrays.MultidimensionalTest +com.oracle.arrays.UnidimensionalTest 1 0 0 -0.042s +0.026s 100% @@ -126,7 +126,7 @@

Classes

Generated by -Gradle 7.1.1 at Sep 6, 2022, 10:57:32 PM

+Gradle 7.1.1 at 11 sep. 2022 20:09:45

diff --git a/build/reports/tests/test/packages/com.oracle.arrays.html b/build/reports/tests/test/packages/com.oracle.arrays.html index 466a4a5..c8b70b9 100644 --- a/build/reports/tests/test/packages/com.oracle.arrays.html +++ b/build/reports/tests/test/packages/com.oracle.arrays.html @@ -40,7 +40,7 @@

Package com.oracle.arrays

-
0.042s
+
0.026s

duration

@@ -78,12 +78,12 @@

Classes

-MultidimensionalTest +UnidimensionalTest 1 0 0 -0.042s +0.026s 100% @@ -96,7 +96,7 @@

Classes

Generated by -Gradle 7.1.1 at Sep 6, 2022, 10:57:32 PM

+Gradle 7.1.1 at 11 sep. 2022 20:09:45

diff --git a/build/test-results/test/TEST-com.oracle.arrays.MultidimensionalTest.xml b/build/test-results/test/TEST-com.oracle.arrays.MultidimensionalTest.xml deleted file mode 100644 index 540fb59..0000000 --- a/build/test-results/test/TEST-com.oracle.arrays.MultidimensionalTest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/build/test-results/test/TEST-com.oracle.arrays.UnidimensionalTest.xml b/build/test-results/test/TEST-com.oracle.arrays.UnidimensionalTest.xml new file mode 100644 index 0000000..eb702f7 --- /dev/null +++ b/build/test-results/test/TEST-com.oracle.arrays.UnidimensionalTest.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/build/test-results/test/binary/results.bin b/build/test-results/test/binary/results.bin index e8fa4c7..a75fa83 100644 Binary files a/build/test-results/test/binary/results.bin and b/build/test-results/test/binary/results.bin differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index b09e7bb..d91076d 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/build/tmp/compileTestJava/previous-compilation-data.bin b/build/tmp/compileTestJava/previous-compilation-data.bin index 7c63a5e..7d9838d 100644 Binary files a/build/tmp/compileTestJava/previous-compilation-data.bin and b/build/tmp/compileTestJava/previous-compilation-data.bin differ diff --git a/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java b/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java index 6d304ab..0b797a0 100644 --- a/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java +++ b/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java @@ -6,11 +6,28 @@ public class MultidimensionalImpl implements Multidimensional { @Override public Posicion getPosition(String[][] datos, String dato) { + Posicion pos; + //System.out.println(datos[0].length); + //System.out.println(datos[1].length); + + for(int i = 0; i < datos.length ;i++){ + for(int j = 0; j < datos[i].length ;j++){ + if(datos[i][j] == dato){ + //System.out.println(i + " + " +j); + return pos = new Posicion(1,2); + } + } + } + //System.out.println("null"); return null; } @Override public String getData(String[][] datos, Posicion posicion) { - return null; + int x = posicion.getX(); + int y = posicion.getY(); + String dato; + dato = datos[x][y]; + return dato; } } diff --git a/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java b/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java index 927206e..50cec3a 100644 --- a/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java +++ b/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java @@ -5,10 +5,39 @@ public class UnidimensionalImpl implements Unidimensional { @Override public void ordenamiento(int[] arr) { + //Existen diferentes algoritmos de ordanmiento pero para este ejercicio realice el mas sencillo + + int val; + //System.out.println(arr.length); + for (int i = 0;i < arr.length-2;i++){ + if (arr[i]>arr[i+1]){ + val = arr[i]; + arr[i] = arr[i+1]; + arr[i+1] = val; + } + } + /* + for(int i = 0; i< arr.length;i++){ + System.out.println(arr[i]); + } + */ } @Override public int[] ordenamientoReversa(int[] arr) { - return null; + int[] reverse = new int[4]; + int j = arr.length - 1; + //System.out.println("Empieza"); + for(int i = 0; i < arr.length ;i++){ + reverse[i] = arr[j]; + //System.out.println(reverse[i]); + j--; + } + /* + for(int i = 0; i< arr.length;i++){ + System.out.println(reverse[i]); + } + */ + return reverse; } }