diff --git a/.gradle/7.1.1/executionHistory/executionHistory.bin b/.gradle/7.1.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000..b7c31cd 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..32c0028 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..c340543 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..63ed858 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/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c593acb..ad9958d 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..ad06378 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/.name b/.idea/.name new file mode 100644 index 0000000..8c4c5a2 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +bootcamps-ejercicios \ No newline at end of file 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..611e7c8 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ 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/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ 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/DynamicArrayList.class b/build/classes/java/main/com/oracle/arrays/DynamicArrayList.class new file mode 100644 index 0000000..5214412 Binary files /dev/null and b/build/classes/java/main/com/oracle/arrays/DynamicArrayList.class differ 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/DynamicArrayListImpl.class b/build/classes/java/main/com/oracle/arrays/impl/DynamicArrayListImpl.class new file mode 100644 index 0000000..5650152 Binary files /dev/null and b/build/classes/java/main/com/oracle/arrays/impl/DynamicArrayListImpl.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..0de38db 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..18fe185 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/main/com/oracle/dao/CityDao.class b/build/classes/java/main/com/oracle/dao/CityDao.class new file mode 100644 index 0000000..967a753 Binary files /dev/null and b/build/classes/java/main/com/oracle/dao/CityDao.class differ diff --git a/build/classes/java/main/com/oracle/dao/CountryDao.class b/build/classes/java/main/com/oracle/dao/CountryDao.class new file mode 100644 index 0000000..5d0a1ea Binary files /dev/null and b/build/classes/java/main/com/oracle/dao/CountryDao.class differ diff --git a/build/classes/java/main/com/oracle/dao/InMemoryWorldDao.class b/build/classes/java/main/com/oracle/dao/InMemoryWorldDao.class new file mode 100644 index 0000000..3d3fa49 Binary files /dev/null and b/build/classes/java/main/com/oracle/dao/InMemoryWorldDao.class differ diff --git a/build/classes/java/main/com/oracle/dao/WorldDao.class b/build/classes/java/main/com/oracle/dao/WorldDao.class new file mode 100644 index 0000000..488f7f0 Binary files /dev/null and b/build/classes/java/main/com/oracle/dao/WorldDao.class differ diff --git a/build/classes/java/main/com/oracle/domain/City.class b/build/classes/java/main/com/oracle/domain/City.class new file mode 100644 index 0000000..2ccb1d9 Binary files /dev/null and b/build/classes/java/main/com/oracle/domain/City.class differ diff --git a/build/classes/java/main/com/oracle/domain/Country.class b/build/classes/java/main/com/oracle/domain/Country.class new file mode 100644 index 0000000..ebc3e47 Binary files /dev/null and b/build/classes/java/main/com/oracle/domain/Country.class differ diff --git a/build/classes/java/main/com/oracle/stream/CountriesAndCities.class b/build/classes/java/main/com/oracle/stream/CountriesAndCities.class new file mode 100644 index 0000000..c37cc46 Binary files /dev/null and b/build/classes/java/main/com/oracle/stream/CountriesAndCities.class differ diff --git a/build/classes/java/main/com/oracle/stream/Person.class b/build/classes/java/main/com/oracle/stream/Person.class new file mode 100644 index 0000000..bbeb247 Binary files /dev/null and b/build/classes/java/main/com/oracle/stream/Person.class differ diff --git a/build/classes/java/main/com/oracle/stream/StreamEjemplo.class b/build/classes/java/main/com/oracle/stream/StreamEjemplo.class new file mode 100644 index 0000000..fe50ba3 Binary files /dev/null and b/build/classes/java/main/com/oracle/stream/StreamEjemplo.class differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index b09e7bb..fc770b5 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/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..b4ebbc5 100644 --- a/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java +++ b/src/main/java/com/oracle/arrays/impl/MultidimensionalImpl.java @@ -6,11 +6,21 @@ public class MultidimensionalImpl implements Multidimensional { @Override public Posicion getPosition(String[][] datos, String dato) { + for(int i=0;i< datos.length;i++){ + int j=0; + while(jarr[i+1]){ + int a=arr[i]; + int b=arr[i+1]; + arr[i+1]=a; + arr[i]=b; + flag=false; + } + } + } } @Override public int[] ordenamientoReversa(int[] arr) { - return null; + boolean flag=false; + while(!flag){ + flag=true; + for(int i=0;i> ciudadesMasPobladas = cityDao.findAllCities().stream().collect(Collectors.groupingBy(city -> countryDao.findCountryByCode(city.getCountryCode()).getContinent(),Collectors.maxBy(Comparator.comparingInt(City::getPopulation)))); + ciudadesMasPobladas.entrySet().forEach(System.out::println); } } diff --git a/src/main/java/com/oracle/stream/StreamEjemplo.java b/src/main/java/com/oracle/stream/StreamEjemplo.java index 182e2d8..b0be897 100644 --- a/src/main/java/com/oracle/stream/StreamEjemplo.java +++ b/src/main/java/com/oracle/stream/StreamEjemplo.java @@ -16,9 +16,9 @@ public static void main(String[] args) { personList.add(new Person("Alisa", 7900, 26, "female", "New York")); // Crear una nueva persona y agregarla a la lista - List personList2 = personList.stream().map().collect(Collectors.toList()); + //List personList2 = personList.stream().map().collect(Collectors.toList()); // Convertir km a millas - List personList3 = personList2.stream().map().collect(Collectors.toList()); + List personList3 = personList.stream().map(person -> {person.setKmPerYear((int)(person.getKmPerYear()*0.621371)); return person;}).peek(person -> System.out.println(person.getKmPerYear())).collect(Collectors.toList()); } } @@ -29,6 +29,14 @@ class Person { private String genre; private String city; + public int getKmPerYear() { + return kmPerYear; + } + + public void setKmPerYear(int kmPerYear) { + this.kmPerYear = kmPerYear; + } + public Person(String name, int kmPerYear, int age, String genre, String city) { this.name = name; this.kmPerYear = kmPerYear;