From cfba0981054dee5db09ead7ed9e37742f354fada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Bernabe=20Mu=C3=B1oz=20Navarrete?= Date: Thu, 9 May 2024 21:45:09 -0400 Subject: [PATCH] fix proyecto + D5 --- Vinceto/D2/.gitignore | 29 ------- Vinceto/D2/src/Main.java | 27 ------ Vinceto/D3/Ejercicios/D3.iml | 11 --- .../Ejercicios/out/production/D3/Main.class | Bin 1129 -> 0 bytes .../D3/cl/desafiolatam/AreaRectangulo.class | Bin 1593 -> 0 bytes Vinceto/D3/Resistencia/DO_resistencia.drawio | 82 ------------------ Vinceto/D3/Resistencia/Resistencia.iml | 11 --- Vinceto/D3/Resistencia/src/Main.java | 15 ---- Vinceto/D4/.gitignore | 29 ------- Vinceto/D4/D4.iml | 11 --- Vinceto/D4/src/Main.java | 15 ---- Vinceto/D4/src/ep/Calificaciones.java | 39 --------- Vinceto/D4/src/ep/CompararCadenasEP.java | 27 ------ Vinceto/{D2/D2.iml => FundamentosJava.iml} | 0 .../D2/CalcularVelocidad.class | Bin 0 -> 1127 bytes .../FundamentosJava/D2/Promedio_Final.class | Bin 0 -> 2136 bytes .../FundamentosJava/D2/String_Y_Formato.class | Bin 0 -> 2634 bytes .../FundamentosJava/D3/AreaRectangulo.class | Bin 0 -> 1567 bytes .../D3}/HipotenusaTrianguloRectangulo.class | Bin 1942 -> 1916 bytes .../D3}/PerimetroRectangulo.class | Bin 1802 -> 1776 bytes .../FundamentosJava/D3}/Resistencia.class | Bin 1883 -> 1873 bytes .../D4}/CalculadoraSimple.class | Bin 2125 -> 2125 bytes .../FundamentosJava/D4/Calificaciones.class | Bin 0 -> 1817 bytes .../FundamentosJava/D4/CompararCadenas.class | Bin 0 -> 870 bytes .../D4/CompararCadenasEP.class | Bin 0 -> 1177 bytes .../FundamentosJava/D4/EstadoProyecto.class | Bin 0 -> 764 bytes .../FundamentosJava/D5/CalcularIMC.class | Bin 0 -> 2563 bytes .../FundamentosJava/D5/EvaluarExamen.class | Bin 0 -> 1107 bytes .../production/FundamentosJava}/Main.class | Bin 1129 -> 1129 bytes .../D2}/CalcularVelocidad.java | 2 +- .../Ejercicios => src/D2}/Promedio_Final.java | 2 +- .../D2}/String_Y_Formato.java | 2 +- .../D3}/AreaRectangulo.java | 2 +- .../D3}/HipotenusaTrianguloRectangulo.java | 2 +- .../D3}/PerimetroRectangulo.java | 2 +- .../src/desafio => src/D3}/Resistencia.java | 2 +- Vinceto/src/D4/CalculadoraSimple.java | 46 ++++++++++ .../src/eg => src/D4}/CompararCadenas.java | 2 +- .../{D4/src/eg => src/D4}/EstadoProyecto.java | 2 +- Vinceto/src/D5/CalcularIMC.java | 58 +++++++++++++ Vinceto/src/D5/EvaluarExamen.java | 22 +++++ Vinceto/{D3/Ejercicios => }/src/Main.java | 0 42 files changed, 135 insertions(+), 305 deletions(-) delete mode 100644 Vinceto/D2/.gitignore delete mode 100644 Vinceto/D2/src/Main.java delete mode 100644 Vinceto/D3/Ejercicios/D3.iml delete mode 100644 Vinceto/D3/Ejercicios/out/production/D3/Main.class delete mode 100644 Vinceto/D3/Ejercicios/out/production/D3/cl/desafiolatam/AreaRectangulo.class delete mode 100644 Vinceto/D3/Resistencia/DO_resistencia.drawio delete mode 100644 Vinceto/D3/Resistencia/Resistencia.iml delete mode 100644 Vinceto/D3/Resistencia/src/Main.java delete mode 100644 Vinceto/D4/.gitignore delete mode 100644 Vinceto/D4/D4.iml delete mode 100644 Vinceto/D4/src/Main.java delete mode 100644 Vinceto/D4/src/ep/Calificaciones.java delete mode 100644 Vinceto/D4/src/ep/CompararCadenasEP.java rename Vinceto/{D2/D2.iml => FundamentosJava.iml} (100%) create mode 100644 Vinceto/out/production/FundamentosJava/D2/CalcularVelocidad.class create mode 100644 Vinceto/out/production/FundamentosJava/D2/Promedio_Final.class create mode 100644 Vinceto/out/production/FundamentosJava/D2/String_Y_Formato.class create mode 100644 Vinceto/out/production/FundamentosJava/D3/AreaRectangulo.class rename Vinceto/{D3/Ejercicios/out/production/D3/cl/desafiolatam => out/production/FundamentosJava/D3}/HipotenusaTrianguloRectangulo.class (69%) rename Vinceto/{D3/Ejercicios/out/production/D3/cl/desafiolatam => out/production/FundamentosJava/D3}/PerimetroRectangulo.class (61%) rename Vinceto/{D3/Resistencia/out/production/Resistencia/desafio => out/production/FundamentosJava/D3}/Resistencia.class (63%) rename Vinceto/{D4/src/ep => out/production/FundamentosJava/D4}/CalculadoraSimple.class (52%) create mode 100644 Vinceto/out/production/FundamentosJava/D4/Calificaciones.class create mode 100644 Vinceto/out/production/FundamentosJava/D4/CompararCadenas.class create mode 100644 Vinceto/out/production/FundamentosJava/D4/CompararCadenasEP.class create mode 100644 Vinceto/out/production/FundamentosJava/D4/EstadoProyecto.class create mode 100644 Vinceto/out/production/FundamentosJava/D5/CalcularIMC.class create mode 100644 Vinceto/out/production/FundamentosJava/D5/EvaluarExamen.class rename Vinceto/{D3/Resistencia/out/production/Resistencia => out/production/FundamentosJava}/Main.class (56%) rename Vinceto/{D2/src/Ejercicios => src/D2}/CalcularVelocidad.java (97%) rename Vinceto/{D2/src/Ejercicios => src/D2}/Promedio_Final.java (98%) rename Vinceto/{D2/src/Ejercicios => src/D2}/String_Y_Formato.java (99%) rename Vinceto/{D3/Ejercicios/src/cl/desafiolatam => src/D3}/AreaRectangulo.java (96%) rename Vinceto/{D3/Ejercicios/src/cl/desafiolatam => src/D3}/HipotenusaTrianguloRectangulo.java (97%) rename Vinceto/{D3/Ejercicios/src/cl/desafiolatam => src/D3}/PerimetroRectangulo.java (97%) rename Vinceto/{D3/Resistencia/src/desafio => src/D3}/Resistencia.java (98%) create mode 100644 Vinceto/src/D4/CalculadoraSimple.java rename Vinceto/{D4/src/eg => src/D4}/CompararCadenas.java (97%) rename Vinceto/{D4/src/eg => src/D4}/EstadoProyecto.java (98%) create mode 100644 Vinceto/src/D5/CalcularIMC.java create mode 100644 Vinceto/src/D5/EvaluarExamen.java rename Vinceto/{D3/Ejercicios => }/src/Main.java (100%) diff --git a/Vinceto/D2/.gitignore b/Vinceto/D2/.gitignore deleted file mode 100644 index f68d109..0000000 --- a/Vinceto/D2/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -### IntelliJ IDEA ### -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/Vinceto/D2/src/Main.java b/Vinceto/D2/src/Main.java deleted file mode 100644 index 23935c0..0000000 --- a/Vinceto/D2/src/Main.java +++ /dev/null @@ -1,27 +0,0 @@ -//import Ejercicios.Promedio_Final; -//import Ejercicios.String_Y_Formato; -import Ejercicios.CalcularVelocidad; - -//TIP To Run code, press or -// click the icon in the gutter. -public class Main { - public static void main(String[] args) { - // Crear una instancia de la clase String_Y_Formato - /* - String_Y_Formato datos = new String_Y_Formato(); - - System.out.println("Ingrese los datos del usuario:"); - while (!datos.datosIngresados()){ - datos.leerDatos(); - } - System.out.println("Usuario:"); - datos.mostrarDatos(); - */ - - // Llamar al método main de la clase Promedio_Final - // Promedio_Final.main(args); - - // Llamar al método main de la clase CalcularVelocidad - CalcularVelocidad.main(args); - } -} \ No newline at end of file diff --git a/Vinceto/D3/Ejercicios/D3.iml b/Vinceto/D3/Ejercicios/D3.iml deleted file mode 100644 index c90834f..0000000 --- a/Vinceto/D3/Ejercicios/D3.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Vinceto/D3/Ejercicios/out/production/D3/Main.class b/Vinceto/D3/Ejercicios/out/production/D3/Main.class deleted file mode 100644 index f2df8c12912177756a20ef91aae1142a2bb3b432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1129 zcmaJ=T~8B16g|_HZd(_M1&W9ti}KN;Qop}ie6R_Dq^L;=Joq#$BMjZ{G`mv_KKmnl z_rYg%#u1R0&Ck)9_c{7U)vKDeS&cHqaZyttPvD9&0a*cih&!`Oga^3gF&uNZ2j9(m-Fn5Dm4 zeHjb&j91G8EflEiqK!$MW0-97mZ&S=<$6o%J$ec?_jO42OKbh~xQMZN-o`X8Fj$cr z&o|hZcHd5U)50Z&)H;`hNY&MjV8}P5FP?SV+alQD+a5&<4drrglLyk=`@xjnlVl;? zFv(TQZbu}=QoP2$It)zGS|c0}b}4Uc0E}U{skz%)=bgStuBp0#D^{ejku^$7rs*`% zr%LHi2fVW`^q$%Y^J!FaxQSa9ZkxW{VVM2*kx2hQwM3<7r`O6A?rIerGQ5j7rVs3q zuF~*55zaQ0YIQr+)BTG@P9$y|cEkX9yyTP9kH*)hsB_P2N-gL!yvHykon?nH*lWHo zg1X1UP=pp9GR&PSZ;)#Xj~OogA8Mu;m53Q!q(7SZB|zFp(|(z56*?K6LyMomK1Qz{ z+RbYqNoj!H1KGInQGu5?(+FWkN5~$|CU-dG><{lDI~J a1g_%-of(2I(YlNKbj#7x13W?%Q-1(NdKilU diff --git a/Vinceto/D3/Ejercicios/out/production/D3/cl/desafiolatam/AreaRectangulo.class b/Vinceto/D3/Ejercicios/out/production/D3/cl/desafiolatam/AreaRectangulo.class deleted file mode 100644 index f3a0c34b8937b896c423f0904691728d68a8d33a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1593 zcmaJ>U2hXd6g}gwb)1dk*n}idU@4)=(w6N9{fM2?f=!yF4p59tt4ft7>q)YBy<_c; zQS(oDX{G#x@(?7d_9bup27U|W&f00$!oreg=FZ$XbI!eY@5|RO{sHg}ek>q`w1JF? zEOHE`$NUL*d>-sO_jVr(S25()y}(m98PcnE+d!USE_NCy&v#lb4+0TRp@3-vrimF8 z$52{_krF+Ilov3}H{+Y0bhd*2K($mTc&}D~fs%fIj$v_iqKn1LE~R z*!|E8PQmh6Ac9-LekdYg`P|y&k*Hb)Ea9Ai^CsTI1%}EgkHl3{+SfpP4C^BnaU6)H z7wp%584^o`re^=gH31XLxn#n^Wrji^ep3xO*!4vmzeXNc7>W(9q~!%qPL6!9BQ>|H zCO*IlgAr5kb*v_Eu-kdq#6BU9`)UyKs#T_RerVz&e9W-W<6Tjgfy>n+PaV)IQan(R z25pQ;C#4y17%sZL(-9Hh^Q6xe?>V<9IS;4;s1^pkWXRNIhg8fqy+GU@^maw~kjJ{p zP3dyK%|lPyqs@#u@aRFS`EJ-6;r6($jkBxC2#3fy$q~D*&Bv} zN-c89eVChMk?OZNiDH;(DeiW6cz;B;(2|4D6&s#TQ)OKEbzLe{(zm5lkqUW#N2mkY ziDq+X6mSO{2ENyE-(*;ht16BxC0BNZGn6q*#Rhkk3=bKeCNn#79D;80pyP{ZxhZ9L z(61#bZWNEi&e+9=hkY@@JsGm$=X_eTNs@K$`z=q2S{~a}2X}nyE1-+CuBJ^ zGn%v4o`d}vAAd@tKBi54Mx!}ee~ueuP2mfCNjr3zEg^$E?Wy8sar-YAKR?6NbIew= z&rmL(P5+J5F%};!Wsh-jbEWw7cTDSp_m8nm)*t`A($?yj+qOOCMi#jh*K#X%cP&Tm zi@6uL1`vYgnug}OfjJrt5|$@EQz&5?7l`#0YMwTVnAUoOG?O0k|C;6$Lad=mYBT7gMyoVob+AsIK1+8ixJi3Cd`rGF$h<}= iO}*c+vKBdh7X#eFZJP50QK$bFejuwrt0wLek)=2I_K}hR diff --git a/Vinceto/D3/Resistencia/DO_resistencia.drawio b/Vinceto/D3/Resistencia/DO_resistencia.drawio deleted file mode 100644 index 72e3d9a..0000000 --- a/Vinceto/D3/Resistencia/DO_resistencia.drawio +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Vinceto/D3/Resistencia/Resistencia.iml b/Vinceto/D3/Resistencia/Resistencia.iml deleted file mode 100644 index c90834f..0000000 --- a/Vinceto/D3/Resistencia/Resistencia.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Vinceto/D3/Resistencia/src/Main.java b/Vinceto/D3/Resistencia/src/Main.java deleted file mode 100644 index 930198c..0000000 --- a/Vinceto/D3/Resistencia/src/Main.java +++ /dev/null @@ -1,15 +0,0 @@ -//TIP To Run code, press or -// click the icon in the gutter. -public class Main { - public static void main(String[] args) { - //TIP Press with your caret at the highlighted text - // to see how IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - - for (int i = 1; i <= 5; i++) { - //TIP Press to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing . - System.out.println("i = " + i); - } - } -} \ No newline at end of file diff --git a/Vinceto/D4/.gitignore b/Vinceto/D4/.gitignore deleted file mode 100644 index f68d109..0000000 --- a/Vinceto/D4/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -### IntelliJ IDEA ### -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/Vinceto/D4/D4.iml b/Vinceto/D4/D4.iml deleted file mode 100644 index c90834f..0000000 --- a/Vinceto/D4/D4.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Vinceto/D4/src/Main.java b/Vinceto/D4/src/Main.java deleted file mode 100644 index 930198c..0000000 --- a/Vinceto/D4/src/Main.java +++ /dev/null @@ -1,15 +0,0 @@ -//TIP To Run code, press or -// click the icon in the gutter. -public class Main { - public static void main(String[] args) { - //TIP Press with your caret at the highlighted text - // to see how IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - - for (int i = 1; i <= 5; i++) { - //TIP Press to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing . - System.out.println("i = " + i); - } - } -} \ No newline at end of file diff --git a/Vinceto/D4/src/ep/Calificaciones.java b/Vinceto/D4/src/ep/Calificaciones.java deleted file mode 100644 index 55d7440..0000000 --- a/Vinceto/D4/src/ep/Calificaciones.java +++ /dev/null @@ -1,39 +0,0 @@ -package ep; - -import java.util.Scanner; - -public class Calificaciones { - public static void main(String[] args) { - Scanner sc = new Scanner(System.in); - - System.out.println("Ingrese el nombre del estudiante:"); - String estudiante = sc.nextLine(); - - System.out.println("Ingrese el nombre de la asignatura:"); - String asignatura = sc.nextLine(); - - System.out.println("Ingrese el nombre del docente:"); - String docente = sc.nextLine(); - - System.out.println("Ingrese la nota 1:"); - int nota1 = sc.nextInt(); - - System.out.println("Ingrese la nota 2:"); - int nota2 = sc.nextInt(); - - System.out.println("Ingrese la nota 3:"); - int nota3 = sc.nextInt(); - - float promedio = (nota1 + nota2 + nota3) / 3.0f; - - System.out.printf("Estudiante: %s\nAsignatura: %s\nDocente: %s\nNota 1: %d\nNota 2: %d\nNota 3: %d\nPromedio: %.2f\n", - estudiante, asignatura, docente, nota1, nota2, nota3, promedio); - - // Indicar al estudiante si aprueba o reprueba - if (promedio < 4) { - System.out.println("El estudiante está Reprobado."); - } else { - System.out.println("El estudiante está Aprobado."); - } - } -} diff --git a/Vinceto/D4/src/ep/CompararCadenasEP.java b/Vinceto/D4/src/ep/CompararCadenasEP.java deleted file mode 100644 index 170e6eb..0000000 --- a/Vinceto/D4/src/ep/CompararCadenasEP.java +++ /dev/null @@ -1,27 +0,0 @@ -package ep; - -public class CompararCadenasEP { - public static void main(String[] args) { - // Declarar dos cadenas de texto - String cadenaUno = "Hola"; - String cadenaDos = "Hola"; - - // Comparar las cadenas de texto con equals, y mostrar un mensaje en pantalla - if (cadenaUno.equals(cadenaDos)) { - System.out.println("Las cadenas son iguales (usando equals)"); - } else { - System.out.println("Las cadenas no son iguales (usando equals)"); - } - - // Comparar las cadenas de texto con compareTo y ver cuál es mayor, menor o iguales - int comparacion = cadenaUno.compareTo(cadenaDos); - if (comparacion == 0) { - System.out.println("Las cadenas son iguales (usando compareTo)"); - } else if (comparacion < 0) { - System.out.println("La cadena Uno es menor que la cadena Dos (usando compareTo)"); - } else { - System.out.println("La cadena Uno es mayor que la cadena Dos (usando compareTo)"); - } - } -} - diff --git a/Vinceto/D2/D2.iml b/Vinceto/FundamentosJava.iml similarity index 100% rename from Vinceto/D2/D2.iml rename to Vinceto/FundamentosJava.iml diff --git a/Vinceto/out/production/FundamentosJava/D2/CalcularVelocidad.class b/Vinceto/out/production/FundamentosJava/D2/CalcularVelocidad.class new file mode 100644 index 0000000000000000000000000000000000000000..b48ff76b5f0d5c206c97cb84ff2dd3d54df47c8a GIT binary patch literal 1127 zcmZuxTTc@~6#k|cwk@k%3gsfoq7>VLtRgB>1QBRL(uhe-4e@E%4rOpVOSW60KT95p z(dZBGM;Xs-3)I+sn8~?)=R23#-+#XU0`LZ<6e5Tkh?$6EfMNKQpL5&gs%{?~oeC#l z7}$_X2Ad4gT)t``!7vg!wF2qd6^AP&{3KEsG+>&zh1>t2RK7F=(O`&3#V}qDBc*5W ztFu;634FmD#S{z->--}OlexYw`Kr#4HZg{ABI31(*A3V^U#csx1SS|}_Ep^%O>Vi| zs>x=+l_R+&l=Z2xZly4VX#;mm%-}9V`ifEy3WIT`F;<&VSmTn^BoVzV?aLh24E9E;)3n_+n>gg07nOKHR0}N{+&y7B% zeC!GBOuX1dqbc>YB%IO{6DxX4;*RSzg@IMdzPn=YaMx+M+^=3$!w}o?YJzx|r4nyj zjU(Z|=SMDSM$4YV-75E`mb=PWa3Y%wnQ}j{BB3?7UY|^^m+kc|$j<#b#i#q2Y4e&6 znL1_m?kwRZua|>?m8eslNs-}tFbt`R*YX`vlA3GNlC1uNE#j7Ccik{yFXwYULbi%{k*{FXr_(H z#WwEkY2kiXD9vZpT1;!^V?Pl&j84S9VWHB-(g*T=e3N^Dau6X5Qsy+h*GUY~9uFf+ zQUMukVFEj()!bG)`LTglBn=Y7O|sK7#S&g)n~Ke1mVP7KR7(NV6t|5S*>}l1g1x^B CkONx) literal 0 HcmV?d00001 diff --git a/Vinceto/out/production/FundamentosJava/D2/Promedio_Final.class b/Vinceto/out/production/FundamentosJava/D2/Promedio_Final.class new file mode 100644 index 0000000000000000000000000000000000000000..5b89508a8583409651e9e9a0bf19231e21f13318 GIT binary patch literal 2136 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 literal 0 HcmV?d00001 diff --git a/Vinceto/out/production/FundamentosJava/D3/AreaRectangulo.class b/Vinceto/out/production/FundamentosJava/D3/AreaRectangulo.class new file mode 100644 index 0000000000000000000000000000000000000000..fbcfdcb70dd00317f26ec74f6958a276c74a78dd GIT binary patch literal 1567 zcmaJ>U2hvj6g}gwb)1dkB&11NTDCMLae*3W`A8fJt=*6Wr!BZjK}bjwdzx&$-nDke z75OK90VzL$KBQ6+yyT7Fz;7v>Sv&1Uv9RQsxifdpJ?Gxp`}eDte*w6I?+QpEZ6RYL zi=05|iF_(6p7i%B_jjMDmKMmZxxTA!38a_HI~MW+Q?XNDyI!T)lD@CPF%&Rv!L~7h z;whBoL8MhzAm#c3vyJ$s8&o#^USBtLsARWVfQ6EYKP51~Jkq7SVPN2L=PJ_D z*O39O4@oDbS*S2)^&6GjtjG5(I?Lbp0)b2|Xp{J4!}Zm@es@=e4`nQ6x)HRbw z*u%|?-gg;erf~+TN~o?hFW}sAGLOU5mUnnA!##6(#4!&|5d}n@H5v%!gNj-v)|sbh zVoB-{m}qL*>TJv2kYAx0^uv}~cTF*7PHVkxaQJZV1c8opD0|yV?+5KD55~N7*K>{! ziRrYJ=Y&kq@nM`HM@6fSn9O0lfN!v2VbfG#OJFgk73Y{`4mzqbkUA*Jx@_qnJP>%6 ztntus5O_oSZBIpujUedsd)36-8|EyrbL!&5gPt1Uo=ofD!#;VvNs=|`c}-U<=Fr|W z-*wHCQKTXZ+X7e5Xc|S;!hI&}|6N(dfi7Ieb@m_gOF@_p#PK6q70!Zl_Sy@G-{a$t zIhtc`;uDVcaD4+eX^r7ie8wGK77NHA&pln-C~o}$>&NF9dx6Q->~l;{pG*IV)Dh+% zEo6^yX=ADQ>{pDNgLjXxNb9$M|1s9`DYvciDK}blE3V|0%AJ)Q-RE;JaSb4X;hKiw zx{fK17KP=>XAC8b<04sKVT&xINS_iu$297g!4~`41I*$F%;9Ht1Bvr^j0=d^t&G;2 z)J#3}|AKQ0Ay%+TwHfqK#|xgi3T$;GDI>&1I_0GvSJwG I7!nvH0TvD*0RR91 diff --git a/Vinceto/D3/Ejercicios/out/production/D3/cl/desafiolatam/PerimetroRectangulo.class b/Vinceto/out/production/FundamentosJava/D3/PerimetroRectangulo.class similarity index 61% rename from Vinceto/D3/Ejercicios/out/production/D3/cl/desafiolatam/PerimetroRectangulo.class rename to Vinceto/out/production/FundamentosJava/D3/PerimetroRectangulo.class index 6a63c6a85fa817684918f6333d778bfd92b82045..4ac2b459c225e7ac68f24ef5a8cde4822afd0e2d 100644 GIT binary patch delta 90 zcmeC;`@qX_>ff$?3=9lT6FI_}#axUx=DRSlNcgxIPd>u*kC}rZVDbzWH9>whh9EA6 tV1^KOhEN^`S%$F5mzfW3-p69jBpS%T$l%Wq4m5%b$ckWyVu)do1ORhp6$k(T delta 116 zcmeys+r`Im>ff$?3=9mm6FI^Kl#_GxQ&Ni)(=zjO5=#Fg GkOTmp-XHk@ diff --git a/Vinceto/D3/Resistencia/out/production/Resistencia/desafio/Resistencia.class b/Vinceto/out/production/FundamentosJava/D3/Resistencia.class similarity index 63% rename from Vinceto/D3/Resistencia/out/production/Resistencia/desafio/Resistencia.class rename to Vinceto/out/production/FundamentosJava/D3/Resistencia.class index 02bac9e49e6fb5ef85c6f215d9aaecd572226c25..2de7e3b8eff2524734aebd42bfb34c63bd1d2634 100644 GIT binary patch delta 91 zcmcc3cae|d)W2Q(7#J9wCUV3w^SKyr%uQxu5%6&_-h7iul98E%A#m~u7I{H_Hilp> uh7g8Oc7`w>26=|?$;>Q=Ha};HXA%u!U}Okjhya?w1!P4sL^H%PNCE(7^b}YC delta 101 zcmcb}cbkvn)W2Q(7#J9ACvwDc2&beLC#GfQZ_G$$;uQ6P@;0Aml4KO*XJZKDVhCag yW@iZDVUTACoh;3Ah?#>SeDZ5%`OSA(;+aGP7#JDC7$ShCaRFJ84ABg+43Yo~0U1yL diff --git a/Vinceto/D4/src/ep/CalculadoraSimple.class b/Vinceto/out/production/FundamentosJava/D4/CalculadoraSimple.class similarity index 52% rename from Vinceto/D4/src/ep/CalculadoraSimple.class rename to Vinceto/out/production/FundamentosJava/D4/CalculadoraSimple.class index f7eb5c61aa7d4839a411174484235a6d584403b8..f13859799ff58f2c034616af25a487e0cc12cf5c 100644 GIT binary patch delta 230 zcmWlRJxfAi07lR2_2YWG~q5bNgQO*$a2U7P9BZ2 zg_|xObi91vqsK9QP8e{?m^0>_vmn417pw^K%O!tY@y|6I!oozv_=6Z05EA$L+V9jlcsAQx_2t`AZqf6jW&{V^zS1M*fwFNr(9~?CH9|TED zI5@Nf!VQg)OLL>(c=&U9-yNXbSwN=KW*m!D!qbrNnz*or<2$Dn2$?Aw_^4!t4>@P|`9{D#WO=#yRU; zu*DN`1|+aZ@+==OqHAM*TDU?z=oia6{G7YEXZOcjK}nf2?v Rj2Q^7X-Tfj)uuz2%>}zVE>!>k diff --git a/Vinceto/out/production/FundamentosJava/D4/Calificaciones.class b/Vinceto/out/production/FundamentosJava/D4/Calificaciones.class new file mode 100644 index 0000000000000000000000000000000000000000..e3a0bf146a9d0f2dcba5a468a5c77d4ad46f87db GIT binary patch literal 1817 zcmZux-E$LF6#v~c$=#-bhO}u@v2_a+Q=pA)5HYFP(hrUH3zilFsJ%&U#~Pd+)$I6m;;gTO=S;OK+A`A4beZZ;$xlF95n=iYOE=XXBt{pa78e*w6TY78Ot zafIWDAj*(oYQ{8J3+Oiz>PT@_&{j$x#T zh|?rq9k6ZJwA)}BMj0lHcFmOysY^?@oqE}odX+@k@S0Uq*q+SCFow4{PRH>!#uGil~^5EgKBsWv5C5 zHmK%ovso`o_m(JIw3A$SD#F?ouBr53GwgkBlGD)o8%PC$sta`^M>5?RzMgD47j8{C z_c*4@+^8trH=Y5)jdd=WqSa|ffK3*iVW<8EBh3&|Gd#z@ih)eC=kMj{a#3ac!J%WS z-U-7Km4_SRz)zIp28THQ==e93LK#let;jV~)oAE=HD?tyOyU!I0M#!9iiaqDi=<^~ zWwb^vya0RVAAd$)bxfQ1oWAiuUdIM${n*47?T|BjN_PFU_v#Pu(sT5`ppHF9GC6XH z^uyVTaAN}FwKJQYbr_fmZCaq>O;s;18768uku zN`04%Qh3HFMaIHLDVmBLA!n3$D(bIViu-FKI;tJvL*o$FZjWlo>p%X4lL}**@Sk8n ziK`^4)cc@P-$jbP90Qcv5Ix3eDu7PU{S*c9gW z-9eZleUCdRQ9HKa;Vwy0infn?Byoy)2lq+W@Fii6BlI7I?C1E3gLCY){){o|KBrJ+ IG76#cKekV`i~s-t literal 0 HcmV?d00001 diff --git a/Vinceto/out/production/FundamentosJava/D4/CompararCadenas.class b/Vinceto/out/production/FundamentosJava/D4/CompararCadenas.class new file mode 100644 index 0000000000000000000000000000000000000000..36749a8b800d2ac3fe9a427b610ea8647ec54cc4 GIT binary patch literal 870 zcmZuvO>@#v6g>|p2@q%v&ld`OsN)XDMPXc}+8MM9T|MB5uaZ1WLTCH~{s(`7 zD;K(`GcMe?^FQf$A7NUcPBQnt`*qIA&HMfL$4>wUc$h^3NdqYhD@Ze}o$yoM9C3fx zeBL_|{fHs`So$)0!jP;tj!l>hn+H<(r^1&5<#4AXLjLC07v;D-;+}~tL+zp=yws6} zg}i}+g;lIAFm|Ir`a@zA?kP#y`yv2?G1hP+e@S1g zzNL5MFjVImd^JyEV4K12JZiR;H|7Bk+OZIZR9g)M!>TKN@oeJtMDT+5MwGE#)#syQ z9!MR}lBwveq$QQy%TO)C^0*|4>-E=jJ3QA&bsh|9y7-?mLnhwMOJ8a3i+?biKX2$L zg2;Cx-hX$<$1`2ou9^gW@l9oPl7HW$TEHN$lj!=NuH5k+4&Ckby~hf zR+oV!Zj-g*2He42iZZC9K^Z;#QD0^9+qU7_nZw<^Gvq#@@C{e&jWbj}Bd3pBbkxX6 zXyhtk6CFiqdQ21uv4R}Q%TL*y7!fKjT-jplpx7kQ{oRQ2CV7JaG!Ds GJopFy!^X`3 literal 0 HcmV?d00001 diff --git a/Vinceto/out/production/FundamentosJava/D4/CompararCadenasEP.class b/Vinceto/out/production/FundamentosJava/D4/CompararCadenasEP.class new file mode 100644 index 0000000000000000000000000000000000000000..52c4ae4a2424eda3f275b09d8d66af9b0061eba3 GIT binary patch literal 1177 zcma)5%Tg0T6g^D>lT3yH6A}bP2VZ%B#0U5w6bl0ulmk))vd~pCbj88RbeK%6;#0KT zyVeC(x$p!01iwWsZ)Z}0V6@Dn`gQI-_uSikzy1316~JRG>li>xL)^e1h8RW<`5RvL zxL+$j+dmXe$S}0*`fj+w5Gxe-5=bz_*QLjG=tyZW3=AXPO#5N&W#7v=pxp(>4j9~fnXT1U0-aq>iZ(t<@+9;n6`Ad zx5ool?K_9@@Rdu?Bxm;{s}NhAyL2tN!pk%7sCzGj^PoolnLe;8eOngQM@2tu9((nw*FntKLg z$ipNJ8QjM>mXO67Ca_7UQe28uk^j9m*HbKDku(oso$MD$b)LQlcu35T$il?nPt}dO R`v0KTPithoM92UtzX2U488rX^ literal 0 HcmV?d00001 diff --git a/Vinceto/out/production/FundamentosJava/D4/EstadoProyecto.class b/Vinceto/out/production/FundamentosJava/D4/EstadoProyecto.class new file mode 100644 index 0000000000000000000000000000000000000000..30ad60d6befa65da68daa1be06ddeba6336d9ffc GIT binary patch literal 764 zcmZuvO>fgc6r4@cI&qxuG<+n0X$wt?zyfhVN>%X{B%}b5Qsu&FW3R#nXE$=3O8qMw z5FjMZZ~%z|7jFC}gm~*zLKX4ht>5g<%p0$N{rUa_z(d@ykwV%+#=!c z*F~Xy9!(5+%{GPn7lDC2Whe||?!SJ<=cm^8P%kOu6KRI4osDtJd|X^blkVF*DKK;6 zR4-BI(aLDu*#8FhIoZBU)ocT4T%qc$4!|W5Act-25Msz5Nz8~oDBn3~zCrN|tZLya zN}q7M`4;tNIry*ww-T^Lz`GT2E&=j}aDiTpaT><>IvD^KbvD&Js$}0n0edLoCQ7)6 n3hvWiV+L!i%(07W3ICATdo)^`x*RgUQDybAML>su6!!lDrfH<7 literal 0 HcmV?d00001 diff --git a/Vinceto/out/production/FundamentosJava/D5/CalcularIMC.class b/Vinceto/out/production/FundamentosJava/D5/CalcularIMC.class new file mode 100644 index 0000000000000000000000000000000000000000..b7f08b19d2426d116c1efe103d93184ea22d9887 GIT binary patch literal 2563 zcmaJ@Yf}?f7=AV+*(9t8;TEiyXn`h(#0$1UsznKwC_$!i&}v&ms$w$Av;FP&*?XOy8ce(_uXMrZmf?BzMTp@xArA9l}q_dU;f-sgSabMo6?s}BL3 zz?TvD&?LjJAb_BR)&+G*O_f!nlsYrFpcNbm!RK{DcaBMDN+f4xge0`NPBlj_r}72W zFf=QS2%2Rm3bvqS9ZG)LcC?BFpKeI#oN`y{W-4n`Yfj#=G_{hBKt`+BzfD3cv8hXP zR_xHOpaY#GV%Es(3D}IK8*5-8bQ6V^ie{N{-6-l;Yg*i{#kHbZ9F3p{+hjbYU^{k5 zXkVk#fFMDx3cRx5TW90yLAJV4N+)Lp-(3pg*iBzUyY6HS(xE!p2%bi-j6MbZct%1? z=5T6UEf;EK)yn3^C4?*LvT03_i3EQlo4gQ0QbIJNmvqM^sg|9ZrH;l0&|U?D*e9Xc zoO3j4oKYR~KPY8FNKy4CI5V1UdMF1J9K<0Bp+cRAgg_#bNoK?rhZQ`F=Oje5CAC~5 z$x1=&kV$$;Xbd~bav4!DD%`s(>Y_Go8U@ukr#tf;*^X*Bc5tkhUi?KN;h1oKLBM4< zh4bOK@Hio%e>0UgG6*5Vtuxx3X2)&Kio06Ii<+BRk&}}OUKBMPD3ncG6PB!kQ#j4| zM3ypUZLX}jiK1RP3By8BmdMhhJ7v9S4#umd6~Ce`@ySG6nytlaMx4sfP&IAc(U;7j z5Y9+IaO~g>H_{ODEP{+yE~!N`ICkWZE8-WzIrh!8X;sv6aO~)s@ggfAZ_Zg-mFWrL zRZ=~}XgIvY;e=(G7VBc%ERyBcDc#VfYn3_8I;*<8qf;hxIICK^nAeSdXI{6N`leW!tO|Fk_Tupb?Dsk8LO`zH7HZj`0 zWsPTq;3S%mJ7y(p$vbLcF{f7Rfyfoju+;@d?k_SeGOn#ZM%?Bjx4c=i3ff6sWU{rP zxrRh5({#c#9owm|bR_yJqu9-`5%`-ttmkDW)iuVBwNn2sh^FmNh5#OFvL84Ijn z|A-uuS1>#prhiOc#Swsu+(`%0i(jqc=$fS`yoxb*au>}4e%ynf5OkYdy2r4U;~<)O zptK`|7-{YzwLV$~8Ne{_yfj)cNxutdMG0+K;1Ou?vRXo?8|Ea}_VKzcVV>1-{4P?}hvrJx!#@3$0FZlz9;pgNgqBMN{nESYkjhdnXgyDB zIQj}_!RTwb!JmlfsXxT%M5Ij+qZDgoKlM1k+#Mu~L#)VQOyDq1b2g2U2Iezvg$SIS zTOn(j1RkSJ#!_eJ7XE|7b)x&QjMw?@;QU=i_J;d>%YD9skNG7+>nHdOU!dn7;_o^f literal 0 HcmV?d00001 diff --git a/Vinceto/out/production/FundamentosJava/D5/EvaluarExamen.class b/Vinceto/out/production/FundamentosJava/D5/EvaluarExamen.class new file mode 100644 index 0000000000000000000000000000000000000000..8cdad7854d06947b3c761cd49db03e0af3cbc245 GIT binary patch literal 1107 zcmZuwTTc@~6#k|y-O`p@TM+MyQPNVSisFSLq85~-qOqij@oCzQb#Ob|Om_+V5=qo& zpTz_cO?)x&!T+T3%(hi9>?U(Lm+yRYE1xCInokFF~l@fXoaU?7xlNiGA5tPbK#}h4vkW>ug z<-k+Ag*Daoy^5y=Zx!RPFlyqDF-&HUHOW;?gme-aj1v*pCtm-+o@uH2U@@Fv$gHWR z79C*=$8Kx4B^uIQh~p$qSvZ}<8JuNE_o*E6X0X}@%Q0MgOoChxQ>mK8T-9(rpM;Gm zhPV>jUdi=qjtG)diY|{*Qt6A~62qgCsELl<;M(>TCmz12al0XGE$V(-XkM4!KP$V< zH7VVO(4ur4IU&TRd(y#sd6pNy(f%#uVsfJRsJ8SNJuSi`eP#dvRnS6NhdwmP4Z12 zqo$g5x=l#>uJ_^2B=A_j1sGU~VW>jcc=Lp}d%WTm*VlEiDoq(vN1ixqdIVD_(2$rf z1WE~_v|giIfp$jwz{~;Ir$9YNt5K5>*J(}m&Nnbmw?W**Es_}LABfNoRKCJ`v4_C} zO5+|w4Kx3BypC zp`ihlGeM!#be<$aHjQW=!zf||s~E#N&D3*@2Xt-nBTBf9JG3Y87z<=aQ%UP0?$Z00 U0(tls@)oQxjT6H?5{0n*2eW7bNB{r; literal 0 HcmV?d00001 diff --git a/Vinceto/D3/Resistencia/out/production/Resistencia/Main.class b/Vinceto/out/production/FundamentosJava/Main.class similarity index 56% rename from Vinceto/D3/Resistencia/out/production/Resistencia/Main.class rename to Vinceto/out/production/FundamentosJava/Main.class index f2df8c12912177756a20ef91aae1142a2bb3b432..bd3341e03c9293a32143477de2a33d7c94d5843c 100644 GIT binary patch delta 77 zcmaFK@sfk%)W2Q(7#J9wHgYI4$#5{}GcvGdD%dJ8^0P4*axoY&7_&2&@Gyuom`=7~ fI<%RS*_%<+fPs-gkHHM6iwnpyXRu_jW{?B`jkyf! delta 78 zcmaFK@sfk%)W2Q(7#J9AH*zR53G%Zs=yNd`Fc`8k81XQOGZ;^HXF9~q!C=bBz?!LG gtH8LKli8b5RF8p?!GysKsErHAGH0-4ux5}10G$>L@Bjb+ diff --git a/Vinceto/D2/src/Ejercicios/CalcularVelocidad.java b/Vinceto/src/D2/CalcularVelocidad.java similarity index 97% rename from Vinceto/D2/src/Ejercicios/CalcularVelocidad.java rename to Vinceto/src/D2/CalcularVelocidad.java index 488ad0b..76ee2b1 100644 --- a/Vinceto/D2/src/Ejercicios/CalcularVelocidad.java +++ b/Vinceto/src/D2/CalcularVelocidad.java @@ -1,4 +1,4 @@ -package Ejercicios; +package D2; import java.util.Scanner; public class CalcularVelocidad { public static void main(String[] args) { diff --git a/Vinceto/D2/src/Ejercicios/Promedio_Final.java b/Vinceto/src/D2/Promedio_Final.java similarity index 98% rename from Vinceto/D2/src/Ejercicios/Promedio_Final.java rename to Vinceto/src/D2/Promedio_Final.java index 62bde81..e3515cf 100644 --- a/Vinceto/D2/src/Ejercicios/Promedio_Final.java +++ b/Vinceto/src/D2/Promedio_Final.java @@ -1,4 +1,4 @@ -package Ejercicios; +package D2; import java.util.Scanner; public class Promedio_Final { public static void main(String[] args) { diff --git a/Vinceto/D2/src/Ejercicios/String_Y_Formato.java b/Vinceto/src/D2/String_Y_Formato.java similarity index 99% rename from Vinceto/D2/src/Ejercicios/String_Y_Formato.java rename to Vinceto/src/D2/String_Y_Formato.java index 56a8b34..a72f5b5 100644 --- a/Vinceto/D2/src/Ejercicios/String_Y_Formato.java +++ b/Vinceto/src/D2/String_Y_Formato.java @@ -1,4 +1,4 @@ -package Ejercicios; +package D2; import java.util.Scanner; public class String_Y_Formato { /* diff --git a/Vinceto/D3/Ejercicios/src/cl/desafiolatam/AreaRectangulo.java b/Vinceto/src/D3/AreaRectangulo.java similarity index 96% rename from Vinceto/D3/Ejercicios/src/cl/desafiolatam/AreaRectangulo.java rename to Vinceto/src/D3/AreaRectangulo.java index f518f13..14d601e 100644 --- a/Vinceto/D3/Ejercicios/src/cl/desafiolatam/AreaRectangulo.java +++ b/Vinceto/src/D3/AreaRectangulo.java @@ -1,4 +1,4 @@ -package cl.desafiolatam; +package D3; import java.util.Scanner; diff --git a/Vinceto/D3/Ejercicios/src/cl/desafiolatam/HipotenusaTrianguloRectangulo.java b/Vinceto/src/D3/HipotenusaTrianguloRectangulo.java similarity index 97% rename from Vinceto/D3/Ejercicios/src/cl/desafiolatam/HipotenusaTrianguloRectangulo.java rename to Vinceto/src/D3/HipotenusaTrianguloRectangulo.java index 517660f..7e8479c 100644 --- a/Vinceto/D3/Ejercicios/src/cl/desafiolatam/HipotenusaTrianguloRectangulo.java +++ b/Vinceto/src/D3/HipotenusaTrianguloRectangulo.java @@ -1,4 +1,4 @@ -package cl.desafiolatam; +package D3; import java.util.Scanner; diff --git a/Vinceto/D3/Ejercicios/src/cl/desafiolatam/PerimetroRectangulo.java b/Vinceto/src/D3/PerimetroRectangulo.java similarity index 97% rename from Vinceto/D3/Ejercicios/src/cl/desafiolatam/PerimetroRectangulo.java rename to Vinceto/src/D3/PerimetroRectangulo.java index d612531..e3185af 100644 --- a/Vinceto/D3/Ejercicios/src/cl/desafiolatam/PerimetroRectangulo.java +++ b/Vinceto/src/D3/PerimetroRectangulo.java @@ -1,4 +1,4 @@ -package cl.desafiolatam; +package D3; import java.util.Scanner; diff --git a/Vinceto/D3/Resistencia/src/desafio/Resistencia.java b/Vinceto/src/D3/Resistencia.java similarity index 98% rename from Vinceto/D3/Resistencia/src/desafio/Resistencia.java rename to Vinceto/src/D3/Resistencia.java index 79162aa..03bd929 100644 --- a/Vinceto/D3/Resistencia/src/desafio/Resistencia.java +++ b/Vinceto/src/D3/Resistencia.java @@ -1,4 +1,4 @@ -package desafio; +package D3; import java.util.Scanner; diff --git a/Vinceto/src/D4/CalculadoraSimple.java b/Vinceto/src/D4/CalculadoraSimple.java new file mode 100644 index 0000000..59e81ce --- /dev/null +++ b/Vinceto/src/D4/CalculadoraSimple.java @@ -0,0 +1,46 @@ +package D4; + +import java.util.Scanner; + +public class CalculadoraSimple { + public static void main(String[] args) { + Scanner scanner = new Scanner(System.in); + System.out.print("Ingrese el primer número: "); + double numero1 = scanner.nextDouble(); + System.out.print("Ingrese el segundo número: "); + double numero2 = scanner.nextDouble(); + System.out.println("\nSeleccione la operación que desea realizar:"); + System.out.println("1. Suma"); + System.out.println("2. Resta"); + System.out.println("3. Multiplicación"); + System.out.println("4. División"); + System.out.print("Ingrese el número correspondiente a la operación: "); + int opcion = scanner.nextInt(); + switch (opcion) { + case 1: + System.out.println("Operación: Suma"); + System.out.println("Resultado: " + (numero1 + numero2)); + break; + case 2: + System.out.println("Operación: Resta"); + System.out.println("Resultado: " + (numero1 - numero2)); + break; + case 3: + System.out.println("Operación: Multiplicación"); + System.out.println("Resultado: " + numero1 * numero2); + break; + case 4: + if (numero2 != 0.0) { + System.out.println("Operación: División"); + System.out.println("Resultado: " + numero1 / numero2); + } else { + System.out.println("No se puede dividir entre cero."); + } + break; + default: + System.out.println("La opción seleccionada no es válida."); + } + + scanner.close(); + } +} \ No newline at end of file diff --git a/Vinceto/D4/src/eg/CompararCadenas.java b/Vinceto/src/D4/CompararCadenas.java similarity index 97% rename from Vinceto/D4/src/eg/CompararCadenas.java rename to Vinceto/src/D4/CompararCadenas.java index aad0818..97613eb 100644 --- a/Vinceto/D4/src/eg/CompararCadenas.java +++ b/Vinceto/src/D4/CompararCadenas.java @@ -1,4 +1,4 @@ -package eg; +package D4; public class CompararCadenas { public static void main(String[] args) { diff --git a/Vinceto/D4/src/eg/EstadoProyecto.java b/Vinceto/src/D4/EstadoProyecto.java similarity index 98% rename from Vinceto/D4/src/eg/EstadoProyecto.java rename to Vinceto/src/D4/EstadoProyecto.java index 5c3ae3e..779ec25 100644 --- a/Vinceto/D4/src/eg/EstadoProyecto.java +++ b/Vinceto/src/D4/EstadoProyecto.java @@ -1,4 +1,4 @@ -package eg; +package D4; public class EstadoProyecto { diff --git a/Vinceto/src/D5/CalcularIMC.java b/Vinceto/src/D5/CalcularIMC.java new file mode 100644 index 0000000..9e07b62 --- /dev/null +++ b/Vinceto/src/D5/CalcularIMC.java @@ -0,0 +1,58 @@ +package D5; +import java.util.Scanner; + +public class CalcularIMC { + public static void main(String[] args) { + Scanner sc = new Scanner(System.in); + System.out.println("Primero indique su edad:"); + int edad = sc.nextInt(); + if (mayorEdad(edad)) { + double altura = obtenerDato("Digite su altura: "); + double peso = obtenerDato("Digite su Peso: "); + double imc = calcular(altura, peso); + String evaluacion = evaluarImc(imc); + System.out.println("IMC: " + imc); + System.out.println("Evaluación: " + evaluacion); + } else { + System.out.println("Debes ser mayor de edad"); + } + sc.close(); + } + + private static boolean mayorEdad(int edad) { + return edad >= 18; + } + + public static double obtenerDato(String mensaje) { + Scanner sc = new Scanner(System.in); + double dato; + do { + System.out.println(mensaje); + dato = sc.nextDouble(); + if (dato <= 0) { + System.out.println("Dato inválido, por favor ingrese un valor positivo."); + } + } while (dato <= 0); + return dato; + } + + public static double calcular(double altura, double peso) { + return peso / (altura * altura); + } + + private static String evaluarImc(double imc) { + String evaluacion = ""; + if (imc < 18.5) { + evaluacion = "Delgado"; + } else if (imc >= 18.5 && imc <= 24.9) { + evaluacion = "Normal"; + } else if (imc > 24.9 && imc <= 29.9) { + evaluacion = "Sobrepeso"; + } else if (imc > 29.9) { + evaluacion = "Obeso"; + } else { + evaluacion = "Error"; + } + return evaluacion; + } +} \ No newline at end of file diff --git a/Vinceto/src/D5/EvaluarExamen.java b/Vinceto/src/D5/EvaluarExamen.java new file mode 100644 index 0000000..8384352 --- /dev/null +++ b/Vinceto/src/D5/EvaluarExamen.java @@ -0,0 +1,22 @@ +package D5; + +import java.util.Scanner; + +public class EvaluarExamen { + public static void main(String[] args) { + Scanner scanner = new Scanner(System.in); + + System.out.println("Ingrese el promedio:"); + double promedio = scanner.nextDouble(); + + if (promedio < 4) { + System.out.println("Debes dar una prueba de recuperación para poder rendir el examen final"); + } else if (promedio >= 4 && promedio <= 5.5) { + System.out.println("Debes rendir el examen final para aprobar"); + } else { + System.out.println("Felicitaciones! Te eximiste del examen y aprobaste"); + } + + scanner.close(); + } +} diff --git a/Vinceto/D3/Ejercicios/src/Main.java b/Vinceto/src/Main.java similarity index 100% rename from Vinceto/D3/Ejercicios/src/Main.java rename to Vinceto/src/Main.java