diff --git a/P1/Practica 1.pdf b/P1/Practica 1.pdf new file mode 100644 index 0000000..cf72203 Binary files /dev/null and b/P1/Practica 1.pdf differ diff --git a/P1/README.md b/P1/README.md new file mode 100644 index 0000000..30dc9e6 --- /dev/null +++ b/P1/README.md @@ -0,0 +1,22 @@ +![IS.](https://zimbronapps.com/wp-content/uploads/2017/08/Ingenier%C3%ADa-de-Software-1024x700.png) + + +Este es mi primer proyecto de GitHub en el que he aprendido lenguaje Markdown. + +## Comandos útiles de Git: + +1. *init* sirve para inicializar un repositorio. +2. *add* sirve para añadir cambios. +3. *commit* es el comando para guardar cambios. +4. *merge* permite unir dos ramas. + +También hay un comando para cambiar la configuración como, por ejemplo: + +`git config --global user.name ` + +## Herramientas para las prácticas + +- [GitHub](https://github.com/) +- [YouTrack](https://www.jetbrains.com/youtrack/?gclid=CjwKCAjwwab7BRBAEiwAapqpTBP7Ley8f6k-kMe7LsIu8aGvc0DVg-Z7TBuE6pynINWK-NWiyjHddBoCAjgQAvD_BwE) +- [VisualParadigm](https://www.visual-paradigm.com/) +- [Eclipse](https://www.eclipse.org/downloads/) diff --git a/P1/fichero1.txt b/P1/fichero1.txt new file mode 100644 index 0000000..0efb33e --- /dev/null +++ b/P1/fichero1.txt @@ -0,0 +1,2 @@ +¡Hola mundo! +Marcos Rivera Gavilán diff --git a/P1/fichero2.txt b/P1/fichero2.txt new file mode 100644 index 0000000..edd7cf9 --- /dev/null +++ b/P1/fichero2.txt @@ -0,0 +1 @@ +Fichero creado en el editor de GitHub diff --git a/P2/Gestion-de-Parques.jpg b/P2/Gestion-de-Parques.jpg index 24c930b..77eccf1 100644 Binary files a/P2/Gestion-de-Parques.jpg and b/P2/Gestion-de-Parques.jpg differ diff --git a/P2/Gestion-de-Senderistas.jpg b/P2/Gestion-de-Senderistas.jpg index ca01034..dd3438c 100644 Binary files a/P2/Gestion-de-Senderistas.jpg and b/P2/Gestion-de-Senderistas.jpg differ diff --git a/P2/Gestion-de-Senderos.jpg b/P2/Gestion-de-Senderos.jpg index 95b66c1..8ef9b89 100644 Binary files a/P2/Gestion-de-Senderos.jpg and b/P2/Gestion-de-Senderos.jpg differ diff --git a/P2/Gestion-de-Trabajadores.jpg b/P2/Gestion-de-Trabajadores.jpg index 9a43a03..362a783 100644 Binary files a/P2/Gestion-de-Trabajadores.jpg and b/P2/Gestion-de-Trabajadores.jpg differ diff --git "a/P2/Gesti\303\263n-de-Rutas.jpg" "b/P2/Gesti\303\263n-de-Rutas.jpg" index c913a00..ab84126 100644 Binary files "a/P2/Gesti\303\263n-de-Rutas.jpg" and "b/P2/Gesti\303\263n-de-Rutas.jpg" differ diff --git a/P2/P2_GM5_equipo26.pdf b/P2/P2_GM5_equipo26.pdf new file mode 100644 index 0000000..06839bc Binary files /dev/null and b/P2/P2_GM5_equipo26.pdf differ diff --git a/P2/Practica 2.pdf b/P2/Practica 2.pdf new file mode 100644 index 0000000..b859d5b Binary files /dev/null and b/P2/Practica 2.pdf differ diff --git a/P2/Proyecto26.vpp.bak_000f b/P2/Proyecto26.vpp.bak_000f deleted file mode 100644 index cdce63b..0000000 Binary files a/P2/Proyecto26.vpp.bak_000f and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_001d b/P2/Proyecto26.vpp.bak_001d deleted file mode 100644 index ed09705..0000000 Binary files a/P2/Proyecto26.vpp.bak_001d and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_002d b/P2/Proyecto26.vpp.bak_002d deleted file mode 100644 index 8f1cc58..0000000 Binary files a/P2/Proyecto26.vpp.bak_002d and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_003d b/P2/Proyecto26.vpp.bak_003d deleted file mode 100644 index db04b4b..0000000 Binary files a/P2/Proyecto26.vpp.bak_003d and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_004d b/P2/Proyecto26.vpp.bak_004d deleted file mode 100644 index 33d9238..0000000 Binary files a/P2/Proyecto26.vpp.bak_004d and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_005d b/P2/Proyecto26.vpp.bak_005d deleted file mode 100644 index 28f0c71..0000000 Binary files a/P2/Proyecto26.vpp.bak_005d and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_006d b/P2/Proyecto26.vpp.bak_006d deleted file mode 100644 index 71e498b..0000000 Binary files a/P2/Proyecto26.vpp.bak_006d and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_007d b/P2/Proyecto26.vpp.bak_007d deleted file mode 100644 index 6357bfa..0000000 Binary files a/P2/Proyecto26.vpp.bak_007d and /dev/null differ diff --git a/P2/Proyecto26.vpp.bak_008d b/P2/Proyecto26.vpp.bak_008d deleted file mode 100644 index ea3fa97..0000000 Binary files a/P2/Proyecto26.vpp.bak_008d and /dev/null differ diff --git "a/P2/Pr\303\241ctica 2.pdf" "b/P2/Pr\303\241ctica 2.pdf" deleted file mode 100644 index 16a3312..0000000 Binary files "a/P2/Pr\303\241ctica 2.pdf" and /dev/null differ diff --git a/P3/CU1 _ Add Park.jpg b/P3/CU1 _ Add Park.jpg new file mode 100644 index 0000000..c2a1fe0 Binary files /dev/null and b/P3/CU1 _ Add Park.jpg differ diff --git a/P3/CU30 _ Get Route Report.jpg b/P3/CU30 _ Get Route Report.jpg new file mode 100644 index 0000000..bebee08 Binary files /dev/null and b/P3/CU30 _ Get Route Report.jpg differ diff --git a/P3/CU9 _ Delete Trail.jpg b/P3/CU9 _ Delete Trail.jpg new file mode 100644 index 0000000..19e7c66 Binary files /dev/null and b/P3/CU9 _ Delete Trail.jpg differ diff --git a/P3/Diagrama de Clases.jpg b/P3/Diagrama de Clases.jpg new file mode 100644 index 0000000..577fda3 Binary files /dev/null and b/P3/Diagrama de Clases.jpg differ diff --git a/P3/P3_GM5_equipo26.pdf b/P3/P3_GM5_equipo26.pdf new file mode 100644 index 0000000..319122b Binary files /dev/null and b/P3/P3_GM5_equipo26.pdf differ diff --git "a/P3/Pr\303\241ctica 3.pdf" "b/P3/Pr\303\241ctica 3.pdf" new file mode 100644 index 0000000..8bf0264 Binary files /dev/null and "b/P3/Pr\303\241ctica 3.pdf" differ diff --git a/P4/Practica 4.pdf b/P4/Practica 4.pdf new file mode 100644 index 0000000..2c8b330 Binary files /dev/null and b/P4/Practica 4.pdf differ diff --git a/P2/Proyecto26.vpp b/Proyecto26.vpp similarity index 55% rename from P2/Proyecto26.vpp rename to Proyecto26.vpp index 392e1e1..2573e6a 100644 Binary files a/P2/Proyecto26.vpp and b/Proyecto26.vpp differ