Merge branch 'main' of https://github.com/matcom/programming

matcom · Sep 17, 2024 · 77ec22a · 77ec22a
2 parents 7432370 + 8ef73f2
commit 77ec22a
Show file tree

Hide file tree

Showing 294 changed files with 13,609 additions and 341 deletions.
diff --git a/Readme.md b/Readme.md
@@ -19,6 +19,16 @@ Las conferencias tienen un estilo muy interactivo. En vez de una clásica presen
 7. [Algebra](./conferences/07-algebra)
 8. [Matrices](./conferences/08-matrices)
 9. [Recursión](./conferences/09-recursion)
+10. [Más Recursión](./conferences/10-more-recursion)
+11. [Divide y Vencerás](./conferences/11-divide-and-conquer)
+12. [Backtrack](./conferences/12-backtrack)
+13. [Combinatorial](./conferences/13-combinatorial)
+14. [Inheritance](./conferences/14-inheritance)
+15. [Genericity and Interfaces](./conferences/15-genericity-and-interfaces)
+16. [IEnumerable and IEnumerator](./conferences/16-ienumerable-and-ienumerator)
+17. [IList and ICollection](./conferences/17-ilist-and-icollection)
+18. [Functional Programming](./conferences/18-functional-programming)
+
 
 ### Conferencias pasadas
 
@@ -40,7 +50,7 @@ Links a los proyectos que han sido orientados en varias ediciones del curso.
 
 - [**Moogle!**](https://github.com/matcom/moogle): Primer proyecto de programación, consiste en implementar las funcionalidades básicas de un buscador, incluyendo algún tipo de modelo de documentos (e.g., modelo vectorial), una función de *ranking*, y algunos operadores.
 
-- [**Domino**](https://github.com/matcom/domino): Segundo proyecto de programación, consiste en implementar una biblioteca de clases para experimentar con diferentes variantes del juego Dominó y diferentes estrategias de jugadores virtuales.
+- [**HULK**](./projects/hulk/Readme.md): Segundo proyecto de programación, consiste en implementar un intérprete para un subconjunto del lenguaje de programación HULK.
 
 ## Ejercicios
 

diff --git a/conferences/03-functions/.vscode/launch.json b/conferences/03-functions/.vscode/launch.json
diff --git a/conferences/03-functions/.vscode/tasks.json b/conferences/03-functions/.vscode/tasks.json
diff --git a/conferences/03-functions/src/.vscode/launch.json b/conferences/03-functions/src/.vscode/launch.json
diff --git a/conferences/03-functions/src/.vscode/tasks.json b/conferences/03-functions/src/.vscode/tasks.json
diff --git a/conferences/04-arrays/.vscode/launch.json b/conferences/04-arrays/.vscode/launch.json
diff --git a/conferences/04-arrays/.vscode/tasks.json b/conferences/04-arrays/.vscode/tasks.json
diff --git a/conferences/06-sorting/.vscode/launch.json b/conferences/06-sorting/.vscode/launch.json
diff --git a/conferences/06-sorting/.vscode/tasks.json b/conferences/06-sorting/.vscode/tasks.json
diff --git a/conferences/08-matrices/.vscode/launch.json b/conferences/08-matrices/.vscode/launch.json
diff --git a/conferences/08-matrices/.vscode/tasks.json b/conferences/08-matrices/.vscode/tasks.json
diff --git a/conferences/01-intro/Readme.md → conferences/2023/01-intro/Readme.md b/conferences/01-intro/Readme.md → conferences/2023/01-intro/Readme.md
diff --git a/conferences/01-intro/expressions/Program.cs → ...nces/2023/01-intro/expressions/Program.cs b/conferences/01-intro/expressions/Program.cs → ...nces/2023/01-intro/expressions/Program.cs
diff --git a/...s/01-intro/expressions/expressions.csproj → ...3/01-intro/expressions/expressions.csproj b/...s/01-intro/expressions/expressions.csproj → ...3/01-intro/expressions/expressions.csproj
diff --git a/.../01-intro/hello-world-oldskool/Program.cs → .../01-intro/hello-world-oldskool/Program.cs b/.../01-intro/hello-world-oldskool/Program.cs → .../01-intro/hello-world-oldskool/Program.cs
diff --git a/...orld-oldskool/hello-world-oldskool.csproj → ...orld-oldskool/hello-world-oldskool.csproj b/...orld-oldskool/hello-world-oldskool.csproj → ...orld-oldskool/hello-world-oldskool.csproj
diff --git a/conferences/01-intro/hello-world/Program.cs → ...nces/2023/01-intro/hello-world/Program.cs b/conferences/01-intro/hello-world/Program.cs → ...nces/2023/01-intro/hello-world/Program.cs
diff --git a/...s/01-intro/hello-world/hello-world.csproj → ...3/01-intro/hello-world/hello-world.csproj b/...s/01-intro/hello-world/hello-world.csproj → ...3/01-intro/hello-world/hello-world.csproj
diff --git a/conferences/01-intro/order/Program.cs → conferences/2023/01-intro/order/Program.cs b/conferences/01-intro/order/Program.cs → conferences/2023/01-intro/order/Program.cs
diff --git a/conferences/01-intro/order/order.csproj → conferences/2023/01-intro/order/order.csproj b/conferences/01-intro/order/order.csproj → conferences/2023/01-intro/order/order.csproj
diff --git a/conferences/01-intro/variables/Program.cs → ...rences/2023/01-intro/variables/Program.cs b/conferences/01-intro/variables/Program.cs → ...rences/2023/01-intro/variables/Program.cs
diff --git a/...ences/01-intro/variables/variables.csproj → .../2023/01-intro/variables/variables.csproj b/...ences/01-intro/variables/variables.csproj → .../2023/01-intro/variables/variables.csproj
diff --git a/conferences/02-conditionals/eliza/Program.cs → ...ces/2023/02-conditionals/eliza/Program.cs b/conferences/02-conditionals/eliza/Program.cs → ...ces/2023/02-conditionals/eliza/Program.cs
diff --git a/...rences/02-conditionals/eliza/eliza.csproj → ...s/2023/02-conditionals/eliza/eliza.csproj b/...rences/02-conditionals/eliza/eliza.csproj → ...s/2023/02-conditionals/eliza/eliza.csproj
diff --git a/conferences/02-conditionals/script.md → conferences/2023/02-conditionals/script.md b/conferences/02-conditionals/script.md → conferences/2023/02-conditionals/script.md
diff --git a/conferences/03-functions/Readme.md → conferences/2023/03-functions/Readme.md b/conferences/03-functions/Readme.md → conferences/2023/03-functions/Readme.md
diff --git a/conferences/03-functions/src/Program.cs → conferences/2023/03-functions/src/Program.cs b/conferences/03-functions/src/Program.cs → conferences/2023/03-functions/src/Program.cs
diff --git a/conferences/03-functions/src/src.csproj → conferences/2023/03-functions/src/src.csproj b/conferences/03-functions/src/src.csproj → conferences/2023/03-functions/src/src.csproj
diff --git a/conferences/04-arrays/src/Program.cs → conferences/2023/04-arrays/src/Program.cs b/conferences/04-arrays/src/Program.cs → conferences/2023/04-arrays/src/Program.cs
diff --git a/conferences/04-arrays/src/src.csproj → conferences/2023/04-arrays/src/src.csproj b/conferences/04-arrays/src/src.csproj → conferences/2023/04-arrays/src/src.csproj
diff --git a/conferences/04-arrays/src/words.txt → conferences/2023/04-arrays/src/words.txt b/conferences/04-arrays/src/words.txt → conferences/2023/04-arrays/src/words.txt
diff --git a/conferences/05-classes/App/App.csproj → conferences/2023/05-classes/App/App.csproj b/conferences/05-classes/App/App.csproj → conferences/2023/05-classes/App/App.csproj
diff --git a/conferences/05-classes/App/Program.cs → conferences/2023/05-classes/App/Program.cs b/conferences/05-classes/App/Program.cs → conferences/2023/05-classes/App/Program.cs
diff --git a/conferences/05-classes/Sets.sln → conferences/2023/05-classes/Sets.sln b/conferences/05-classes/Sets.sln → conferences/2023/05-classes/Sets.sln
diff --git a/conferences/05-classes/Sets/Set.cs → conferences/2023/05-classes/Sets/Set.cs b/conferences/05-classes/Sets/Set.cs → conferences/2023/05-classes/Sets/Set.cs
diff --git a/conferences/05-classes/Sets/Sets.csproj → conferences/2023/05-classes/Sets/Sets.csproj b/conferences/05-classes/Sets/Sets.csproj → conferences/2023/05-classes/Sets/Sets.csproj
diff --git a/conferences/05-classes/makefile → conferences/2023/05-classes/makefile b/conferences/05-classes/makefile → conferences/2023/05-classes/makefile
diff --git a/...rting.Tester/MatCom.Sorting.Tester.csproj → ...rting.Tester/MatCom.Sorting.Tester.csproj b/...rting.Tester/MatCom.Sorting.Tester.csproj → ...rting.Tester/MatCom.Sorting.Tester.csproj
diff --git a/...-sorting/MatCom.Sorting.Tester/Program.cs → ...-sorting/MatCom.Sorting.Tester/Program.cs b/...-sorting/MatCom.Sorting.Tester/Program.cs → ...-sorting/MatCom.Sorting.Tester/Program.cs
diff --git a/...ting/MatCom.Sorting/MatCom.Sorting.csproj → ...ting/MatCom.Sorting/MatCom.Sorting.csproj b/...ting/MatCom.Sorting/MatCom.Sorting.csproj → ...ting/MatCom.Sorting/MatCom.Sorting.csproj
diff --git a/...erences/06-sorting/MatCom.Sorting/Sort.cs → ...es/2023/06-sorting/MatCom.Sorting/Sort.cs b/...erences/06-sorting/MatCom.Sorting/Sort.cs → ...es/2023/06-sorting/MatCom.Sorting/Sort.cs
diff --git a/conferences/06-sorting/Readme.md → conferences/2023/06-sorting/Readme.md b/conferences/06-sorting/Readme.md → conferences/2023/06-sorting/Readme.md
diff --git a/conferences/06-sorting/Sorting.sln → conferences/2023/06-sorting/Sorting.sln b/conferences/06-sorting/Sorting.sln → conferences/2023/06-sorting/Sorting.sln
diff --git a/conferences/06-sorting/makefile → conferences/2023/06-sorting/makefile b/conferences/06-sorting/makefile → conferences/2023/06-sorting/makefile
diff --git a/conferences/07-algebra/Algebra.sln → conferences/2023/07-algebra/Algebra.sln b/conferences/07-algebra/Algebra.sln → conferences/2023/07-algebra/Algebra.sln
diff --git a/...ences/07-algebra/Algetool/Algetool.csproj → .../2023/07-algebra/Algetool/Algetool.csproj b/...ences/07-algebra/Algetool/Algetool.csproj → .../2023/07-algebra/Algetool/Algetool.csproj
diff --git a/conferences/07-algebra/Algetool/Matrix.cs → ...rences/2023/07-algebra/Algetool/Matrix.cs b/conferences/07-algebra/Algetool/Matrix.cs → ...rences/2023/07-algebra/Algetool/Matrix.cs
diff --git a/conferences/07-algebra/Algetool/Vector.cs → ...rences/2023/07-algebra/Algetool/Vector.cs b/conferences/07-algebra/Algetool/Vector.cs → ...rences/2023/07-algebra/Algetool/Vector.cs
diff --git a/conferences/07-algebra/App/App.csproj → conferences/2023/07-algebra/App/App.csproj b/conferences/07-algebra/App/App.csproj → conferences/2023/07-algebra/App/App.csproj
diff --git a/conferences/07-algebra/App/Program.cs → conferences/2023/07-algebra/App/Program.cs b/conferences/07-algebra/App/Program.cs → conferences/2023/07-algebra/App/Program.cs
diff --git a/conferences/08-matrices/Rogue.sln → conferences/2023/08-matrices/Rogue.sln b/conferences/08-matrices/Rogue.sln → conferences/2023/08-matrices/Rogue.sln
diff --git a/conferences/08-matrices/RogueGame/Program.cs → ...ces/2023/08-matrices/RogueGame/Program.cs b/conferences/08-matrices/RogueGame/Program.cs → ...ces/2023/08-matrices/RogueGame/Program.cs
diff --git a/...es/08-matrices/RogueGame/RogueGame.csproj → ...23/08-matrices/RogueGame/RogueGame.csproj b/...es/08-matrices/RogueGame/RogueGame.csproj → ...23/08-matrices/RogueGame/RogueGame.csproj
diff --git a/conferences/08-matrices/RogueLogic/Game.cs → ...ences/2023/08-matrices/RogueLogic/Game.cs b/conferences/08-matrices/RogueLogic/Game.cs → ...ences/2023/08-matrices/RogueLogic/Game.cs
diff --git a/.../08-matrices/RogueLogic/RogueLogic.csproj → .../08-matrices/RogueLogic/RogueLogic.csproj b/.../08-matrices/RogueLogic/RogueLogic.csproj → .../08-matrices/RogueLogic/RogueLogic.csproj
diff --git a/conferences/08-matrices/makefile → conferences/2023/08-matrices/makefile b/conferences/08-matrices/makefile → conferences/2023/08-matrices/makefile
diff --git a/conferences/09-recursion/README.md → conferences/2023/09-recursion/README.md b/conferences/09-recursion/README.md → conferences/2023/09-recursion/README.md
diff --git a/conferences/09-recursion/makefile → conferences/2023/09-recursion/makefile b/conferences/09-recursion/makefile → conferences/2023/09-recursion/makefile
diff --git a/...nces/09-recursion/recursion/recursion.sln → ...2023/09-recursion/recursion/recursion.sln b/...nces/09-recursion/recursion/recursion.sln → ...2023/09-recursion/recursion/recursion.sln
diff --git a/...ces/09-recursion/recursion/src/Program.cs → ...023/09-recursion/recursion/src/Program.cs b/...ces/09-recursion/recursion/src/Program.cs → ...023/09-recursion/recursion/src/Program.cs
diff --git a/...ces/09-recursion/recursion/src/src.csproj → ...023/09-recursion/recursion/src/src.csproj b/...ces/09-recursion/recursion/src/src.csproj → ...023/09-recursion/recursion/src/src.csproj
diff --git a/conferences/2023/10-more-recursion/01 Review Recursividad.pptx b/conferences/2023/10-more-recursion/01 Review Recursividad.pptx