diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57e15f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,113 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser diff --git a/.gradle/7.1.1/executionHistory/executionHistory.bin b/.gradle/7.1.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000..d00a74b 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..3ab4f2c 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..8ab7c24 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..15e1e11 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..b6be8ab 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..ac50d02 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..99ef1b6 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index f3b5463..8353a68 100644 Binary files a/.gradle/checksums/checksums.lock and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin new file mode 100644 index 0000000..62a27d8 Binary files /dev/null and b/.gradle/checksums/md5-checksums.bin differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin new file mode 100644 index 0000000..5699b00 Binary files /dev/null and b/.gradle/checksums/sha1-checksums.bin differ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /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..32703c5 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ 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..7edc3a5 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + + \ 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..abca364 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/impl/MultidimensionalImpl.class b/build/classes/java/main/com/oracle/arrays/impl/MultidimensionalImpl.class index 40557a4..f871ba9 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..f1dde9e 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/test/com/oracle/arrays/MultidimensionalTest.class b/build/classes/java/test/com/oracle/arrays/MultidimensionalTest.class index 54623e9..a2af531 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/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..606c744 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.536s

duration
getDatoTest()0.042sordenamientoTest()0.536s 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 26 sep. 2022 16:13:13

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

Test Summary

-
0.042s
+
0.536s

duration

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

Packages

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

Classes

-com.oracle.arrays.MultidimensionalTest +com.oracle.arrays.UnidimensionalTest 1 0 0 -0.042s +0.536s 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 26 sep. 2022 16:13:13

diff --git a/build/reports/tests/test/packages/com.oracle.arrays.html b/build/reports/tests/test/packages/com.oracle.arrays.html index 466a4a5..8984def 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.536s

duration

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

Classes

-MultidimensionalTest +UnidimensionalTest 1 0 0 -0.042s +0.536s 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 26 sep. 2022 16:13:13

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..c2c4245 --- /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..cde9ee9 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..2ec37f7 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..5ed5603 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/DynamicArrayListImpl.java b/src/main/java/com/oracle/arrays/impl/DynamicArrayListImpl.java index 2b33fd3..15f0135 100644 --- a/src/main/java/com/oracle/arrays/impl/DynamicArrayListImpl.java +++ b/src/main/java/com/oracle/arrays/impl/DynamicArrayListImpl.java @@ -2,6 +2,8 @@ import com.oracle.arrays.DynamicArrayList; +import java.util.Arrays; + public class DynamicArrayListImpl implements DynamicArrayList { private int size = 10; private int[] arr = new int[size]; @@ -22,30 +24,42 @@ public void insert(int element) { } arr[idx] = element; + idx++; } @Override public void remove(int index) { + int[] newArr = new int[size]; + int j = 0; + + for (int i = 0; i < size; i++) { + if(i != index) { + newArr[j] = arr[i]; + j++; + } + } + arr = newArr; + idx--; } @Override public int get(int index) { - return 0; + return arr[index]; } @Override public void resize() { - + arr = Arrays.copyOf(arr, size*2); } @Override public void resize(int newSize) { - + arr = Arrays.copyOf(arr, newSize); } @Override public int length() { - return 0; + return idx; } } diff --git a/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java b/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java index 6d304ab..895a857 100644 --- a/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java +++ b/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java @@ -6,11 +6,20 @@ public class MultidimensionalImpl implements Multidimensional { @Override public Posicion getPosition(String[][] datos, String dato) { - return null; + Posicion pos = null; + + for (int i = 0; i < datos.length; i++) { + for (int j = 0; j < datos[i].length; j++) { + if ( datos[i][j].equals(dato)) { + pos = new Posicion(i, j); + } + } + } + return pos; } @Override public String getData(String[][] datos, Posicion posicion) { - return null; + return datos[posicion.getX()][posicion.getY()]; } } diff --git a/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java b/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java index 927206e..e6e58f1 100644 --- a/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java +++ b/src/main/java/com/oracle/arrays/impl/UnidimensionalImpl.java @@ -2,13 +2,29 @@ import com.oracle.arrays.Unidimensional; +import java.util.Arrays; + public class UnidimensionalImpl implements Unidimensional { @Override public void ordenamiento(int[] arr) { + Arrays.sort(arr); } @Override public int[] ordenamientoReversa(int[] arr) { - return null; + for (int i = arr.length - 2; i >= 0; i--) { + int j = i + 1; + + while (j < arr.length) { + int key = arr[j-1]; + if (arr[j] > arr[j-1]) { + arr[j-1] = arr[j]; + arr[j] = key; + } + j++; + } + + } + return arr; } }