Skip to content

Commit 7210ca2

Browse files
rvswebrvsweb
authored
Merge pull request #41 from rvsweb/rama_repaso
Añadir cambios al repositorio con arreglo en los ejemplos
2 parents 4177e1e + 2a445aa commit 7210ca2

File tree

7 files changed

+721
-224
lines changed

7 files changed

+721
-224
lines changed

‎PIA/UT01. Introducción a la Programación de Inteligencia Artificial/1_Teoria/Repaso/00_EjemploDeCodigo1Declaraciones.ipynb‎ renamed to ‎PIA/UT01. Introducción a la Programación de Inteligencia Artificial/1_Teoria/Repaso/00_EjCod1DeclaracionesImpresiones.ipynb‎

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,26 @@
4444
},
4545
{
4646
"cell_type": "code",
47-
"execution_count": null,
47+
"execution_count": 1,
4848
"metadata": {},
49-
"outputs": [],
49+
"outputs": [
50+
{
51+
"name": "stdout",
52+
"output_type": "stream",
53+
"text": [
54+
"Hola , mundo!\n",
55+
"Nombre: Juan Edad : 25\n",
56+
"La suma de 3 y 5 es: 8\n",
57+
"Nombre: Ana , Edad: 30 \n",
58+
"Nombre: Carlos , edad: 22\n",
59+
"Grupo Black Sabbath\n",
60+
"Linea 1\n",
61+
"Linea 2\n",
62+
"Linea 3\n",
63+
"Hola-mundo!!!\n"
64+
]
65+
}
66+
],
5067
"source": [
5168
"# Imprimir cadena de texto\n",
5269
"print(\"Hola , mundo!\")\n",
@@ -60,24 +77,42 @@
6077
"a = 3 \n",
6178
"b = 5\n",
6279
"suma = a + b\n",
63-
"print(\"La suma de \" , a , \" y \" , b , \" es: \" , suma)\n",
80+
"print(\"La suma de : \" , a , \" y \" , b , \" es: \" , suma)\n",
6481
"\n",
6582
"# Formateo de cadenas con el metodo '.format()'\n",
6683
"nombre = \"Ana\"\n",
6784
"edad = 30\n",
6885
"print(\"Nombre: {} , Edad: {} \".format(nombre,edad))\n",
6986
"\n",
87+
"pais = \"España\"\n",
88+
"poblacion = 48000000\n",
89+
"print(\"Pais: {} , Poblacion: {} \".format(pais,poblacion))\n",
90+
"\n",
7091
"# Formateo de cadenas con 'f'\n",
7192
"nombre = \"Carlos\" \n",
7293
"edad = 22\n",
7394
"print(f\"Nombre: {nombre} , edad: {edad}\")\n",
7495
"\n",
96+
"nom1 = \"Black\"\n",
97+
"nom2 = \"Sabbath\"\n",
98+
"print(f\"Grupo {nom1} {nom2}\") \n",
99+
"\n",
75100
"# Salto de linea\n",
76101
"print(\"Linea 1\\nLinea 2\\nLinea 3\")\n",
77102
"\n",
78103
"# Uso de argumentos en la función print:\n",
79-
"print(\"Hola\" , \"mundo\" , sep=\"-\" , end=\"!!!\\n\")\n",
80-
"\n"
104+
"# sep = SEPARADOR\n",
105+
"# end = FINAL DE LA IMPRESION\n",
106+
"print(\"Hola\" , \"Mundo\" , sep=\"<>\")\n",
107+
"print(\"Hola\" , \"Mundo\" , sep=\"<>\" , end=\"!!!\\n\")\n",
108+
"print(\"Hola\" , \"Mundo\" , sep=\"||\" , end=\"|\\n\")\n",
109+
"# Array\n",
110+
"numeros = [1 , 2 ,3 , 4 , 5]\n",
111+
"print(\"Salida normal array: \" , numeros)\n",
112+
"print(\"Salida formateada: \")\n",
113+
"print(*numeros, sep=\", \")\n",
114+
"print(*numeros, sep=\" <-> \")\n",
115+
"print(*numeros, end=\" <-- \")"
81116
]
82117
}
83118
],

‎PIA/UT01. Introducción a la Programación de Inteligencia Artificial/1_Teoria/Repaso/00_EjemploDeCodigo2Expresiones.ipynb‎ renamed to ‎PIA/UT01. Introducción a la Programación de Inteligencia Artificial/1_Teoria/Repaso/00_EjCod2Expresiones.ipynb‎

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,42 +24,73 @@
2424
"# Expresiones\n",
2525
"a = 5 # Asignacion\n",
2626
"b = 10 # Asignacion\n",
27+
"\n",
2728
"c = a + b # Suma\n",
28-
"print(c)\n",
29+
"print(\"Valor de Suma : \" , c)\n",
30+
"\n",
2931
"c = a - b # Resta\n",
30-
"print(c)\n",
31-
"a * b # Multiplicacion\n",
32-
"print(a)\n",
32+
"print(\"Valor de Resta : \" , c)\n",
33+
"\n",
34+
"c = a * b # Multiplicacion\n",
35+
"print(\"Valor de Multiplicacion : \" , c)\n",
36+
"\n",
3337
"c = a / b # Division\n",
34-
"print(c)\n",
38+
"print(\"Valor de Division : \" , c)\n",
39+
"\n",
3540
"c = a % b # Modulo\n",
36-
"print(c)\n",
41+
"print(\"Valor de Modulo : \" , c)\n",
42+
"\n",
3743
"c = a ** b # Potencia\n",
38-
"print(c)\n",
44+
"print(\"Valor de Potencia : \" , c)\n",
45+
"\n",
3946
"c = a // b # Division entera\n",
40-
"print(c)\n",
47+
"print(\"Valor Division entera : \" , c)\n",
48+
"\n",
4149
"c = a == b # Igualdad\n",
42-
"print(c)\n",
50+
"print(\"Valor Igualdad : \" , c)\n",
51+
"\n",
4352
"c = a != b # Desigualdad \n",
44-
"print(c)\n",
53+
"print(\"Valor DesIgualdad : \" , c)\n",
54+
"\n",
4555
"c = a > b # Mayor que\n",
46-
"print(c)\n",
56+
"print(\"Valor Mayor que : \" , c)\n",
57+
"\n",
4758
"c = a < b # Menor que \n",
48-
"print(c)\n",
59+
"print(\"Valor Menor que : \" , c)\n",
60+
"\n",
4961
"c = a >= b # Mayor o igual que\n",
50-
"print(c)\n",
62+
"print(\"Valor Mayor o igual que : \" , c)\n",
63+
"\n",
5164
"c = a <= b # Menor o igual que \n",
52-
"print(c)\n",
65+
"print(\"Valor Menor o igual que : \" , c)\n",
66+
"\n",
67+
"# Booleanos\n",
68+
"a = True\n",
69+
"b = False\n",
70+
"\n",
5371
"c = a and b # Conjuncion\n",
54-
"print(c)\n",
72+
"print(\"a and b : \", c)\n",
73+
"\n",
5574
"c = a or b # Disyuncion - Separacion\n",
56-
"print(c)\n",
75+
"print(\"a or b : \" , c)\n",
76+
"\n",
5777
"c = not a # Negacion\n",
58-
"print(c)\n",
78+
"print(\"not a : \", c)\n",
79+
"\n",
80+
"c = not b # Negacion\n",
81+
"print(\"not b : \", c)\n",
82+
"\n",
5983
"c = a is b # Identidad\n",
60-
"print(c)\n",
84+
"print(\"a is b : \", c)\n",
85+
"\n",
86+
"c = b is a # Identidad\n",
87+
"print(\"b is a : \", c)\n",
88+
"\n",
6189
"c = a is not b # No identidad\n",
62-
"print(c)\n"
90+
"print(\"a is not b : \",c)\n",
91+
"\n",
92+
"c = b is not c # No identidad\n",
93+
"print(\"b is not c : \",c)\n"
6394
]
6495
}
6596
],

0 commit comments

Comments
 (0)