Merge branch 'master' of https://bitbucket.org/eip-uprrp/repetitions-countingsquares

README-en.md

@@ -4,11 +4,11 @@
 ![main2.png](images/main2.png)
 ![main3.png](images/main3.png)
 
-[Verano 2016 - Rafa - Ive]
+[Verano 2016 - Rafa - Ive- Tatiana]
 
-One of the advantages of using computer programs is that we can easily implement repetitive tasks. Structures such as the `for`, `while`, and `do-while` allow us to repeat a block of instructions as many times as needed. These structures are also referred to as *repetition structures*. 
+One of the advantages of using computer programs is that we can easily implement repetitive tasks. Structures such as `for`, `while`, and `do-while` allow us to repeat a block of instructions as many times as needed. These structures are also referred to as *repetition structures*. 
 
-Algorithms are one of the fundamental concepts in Computer Science. Given a small set of instructions and the basic programming structures, we can solve many problems. In this laboratory experience you will practice the creation of algorithms simulating a robot that must explore a space using a set of very limited instructions.
+Algorithms are one of the fundamental concepts in Computer Science. Given a small set of instructions and the basic programming structures, we can solve many problems. In this laboratory experience, you will practice the creation of algorithms simulating a robot that must explore a space using a set of very limited instructions.
 
 ##Objectives:
 
@@ -36,7 +36,7 @@ Before arriving to the laboratory you should have:
 
 ## Counting Squares
 
-In this laboratory experience we will be programming a robot that has been placed in a grid of square rooms. Each one of the four walls in each room can have a door. Only the walls of adjoining rooms have doors. The walls that make up the grid's exterior do not have doors.
+In this laboratory experience, we will be programming a robot that has been placed in a grid of square rooms. Each one of the four walls in each room can have a door. Only the walls of adjoining rooms have doors. The walls that make up the grid's exterior do not have doors.
 
 ---
 
@@ -130,9 +130,11 @@ In the example, the code is trying to move the robot as many times as it can tow
 ---
 
 
-!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/en/diag02.html" <br>
+!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/en/diag02.html" 
+<br>
 
-!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/en/diag01.html" <br>
+!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/en/diag01.html" 
+<br>
 
 
 ---
@@ -162,7 +164,7 @@ Suppose that the robot is currently in the upper left room (northwest) of a **sq
 
 5. Suppose we want to minimize the amount of energy used by the robot. Can you create an algorithm that uses less steps for the same grid size?
 
-6. Once you have finished your algorithm, and made it correct and efficient, hand it in using Delivererable 1 in Moodle. On the algorithm's header, write and explain the expression you found about the number of rooms the robot should visit to complete its task for a grid of size $$n \times n$$ (For example, "The robot takes 2x+5 steps, 5 to arrive at the middle and 2n to count the rest").
+6. Once you have finished your algorithm, and made it correct and efficient, hand it in using Deliverable 1 in Moodle. On the algorithm's header, write and explain the expression you found about the number of rooms the robot should visit to complete its task for a grid of size $$n \times n$$ (For example, "The robot takes 2x+5 steps, 5 to arrive at the middle and 2n to count the rest").
 
 
 ### Exercise 2 -  Rectangular grid
@@ -179,13 +181,13 @@ Suppose that the robot is currently in the upper left room (northwest) of a **sq
 
 ### Exercise 3 - Rectangular grid, random position
 
-**Instrucciones**
+**Instructions**
 
 1. Suppose that now the robot starts its task in any of the rooms in a **rectangular** grid (not necessarily square). Design an algorithm so the robot can compute the number of rooms there are in the grid.
 
 2. To test this part of the program you should make sure the `MainGameWindow` object is created using the argument `Mode::RECT_RANDOM`.
 
-3. Once you have finished your algorithm, and made it correct and efficient, implement it in the `main` function. In the header of the program, write and explain the expression you found about the number of rooms the robot should visit to complete its task for a grid of size  $$m \times n$$. In this case, the number of rooms to visit will depend on the robot's initial position, so express the worst case, i.e. according to your algorithm, how many rooms should the robot visit if it starts in the *worst* room.
+3. Once you have finished your algorithm, and made it correctly and efficiently, implement it in the `main` function. In the header of the program, write and explain the expression you found about the number of rooms the robot should visit to complete its task for a grid of size  $$m \times n$$. In this case, the number of rooms to visit will depend on the robot's initial position, so express the worst case, i.e. according to your algorithm, how many rooms should the robot visit if it starts in the *worst* room.
 
 4. Hand in the `main.cpp` file with the code to calculate the number of rooms in a rectangular grid with the robot in a random position using Deliverable 3 in Moodle.
 
@@ -221,4 +223,6 @@ Use the "Deliverable" links in Moodle to hand in the algorithm for Exercise 1 an
 
 ## References
 
-[1] Luther A. Tychonievich, Mark S. Sherriff, and Ryan M. Layer, http://nifty.stanford.edu/2015/tychonievich-sherriff-layer-counting-squares/
+[1] Luther A. Tychonievich, Mark S. Sherriff, and Ryan M. Layer, http://nifty.stanford.edu/2015/tychonievich-sherriff-layer-counting-squares/
+
+

README-es.md

@@ -4,7 +4,7 @@
 ![main2.png](images/main2.png)
 ![main3.png](images/main3.png)
 
-[Verano 2016 - Rafa - Ive]
+[Verano 2016 - Rafa - Ive- Tatiana]
 
 Una de las ventajas de utilizar programas de computadoras es que podemos realizar tareas repetitivas fácilmente. Los ciclos como `for`, `while`, y `do-while` son  estructuras de control que nos permiten repetir un conjunto de instrucciones. A estas estructuras también se les llama *estructuras de repetición*.
 
@@ -51,7 +51,7 @@ Los únicos comandos que entiende el robot son:
 1. Verificar si hay una puerta en la pared del norte (N), sur (S), este (E) u oeste (W) del cuarto donde se encuentra.
 2. Moverse al cuarto que queda justo al norte (N), sur (S), este (E) u oeste (W) del cuarto actual.
 4. Crear variables y asignarle valores.
-3. Realizar operaciones suma, resta, multiplicación y división.
+3. Realizar operaciones de suma, resta, multiplicación y división.
 5. Usar estructuras de decisión y repetición.
 6. Desplegar resultados a pantalla.
 
@@ -95,7 +95,7 @@ int main(int argc, char *argv[]) {
 
 En el ejemplo estamos creando un robot dentro de un espacio cuadrado que solo sabe verificar si hay una puerta hacia el oeste y (si hay puerta) caminar hacia esa misma dirección.  Veamos la función, línea por línea.
 
-La primera línea crea el único objeto que debes crear, un objeto de clase `MainGameWindow`. El parámetro `Mode::SQUARE_TOP_LEFT` especifica que la cuadrícula será cuadrada y que el robot comenzará en la esquina superior izquierda. Otras opciones para el parámetro son `RECT_TOP_LEFT`, `RECT_RANDOM` y `PYRAMID_RANDOM`.
+La primera línea crea el único objeto que debes crear, un objeto de clase `MainGameWindow`. El parámetro `Mode::SQUARE_TOP_LEFT` especifica que la cuadrícula será un cuadrado y que el robot comenzará en la esquina superior izquierda. Otras opciones para el parámetro son `RECT_TOP_LEFT`, `RECT_RANDOM` y `PYRAMID_RANDOM`.
 
 `MainGameWindow *w = new MainGameWindow(Mode::SQUARE_TOP_LEFT);`
 
@@ -129,9 +129,11 @@ En el ejemplo, el código está tratando de mover al robot todas las veces que p
 
 ---
 
-!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/es/diag02.html" <br>
+!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/es/diag02.html" 
+<br>
 
-!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/es/diag01.html" <br>
+!INCLUDE "../../eip-diagnostic/repetitions-countingsquares/es/diag01.html" 
+<br>
 
 
 ---
@@ -150,11 +152,11 @@ Supón que el robot se encuentra en el cuarto superior izquierdo (extremo noroes
 1. Carga a `QtCreator` el proyecto `CountingSquares`. Hay dos maneras de hacer esto:
 
     * Utilizando la máquina virtual: Haz doble “click” en el archivo `CountingSquares.pro` que se encuentra  en el directorio `/home/eip/labs/repetitions-countingsquares` de la máquina virtual.
-    * Descargando la carpeta del proyecto de `Bitbucket`: Utiliza un terminal y escribe el commando `git clone http:/bitbucket.org/eip-uprrp/repetitions-countingsquares` para descargar la carpeta `repetitions-countingsquares` de `Bitbucket`. En esa carpeta, haz doble “click” en el archivo `CountingSquares.pro`.
+    * Descargando la carpeta del proyecto de `Bitbucket`: Utiliza un terminal y escribe el comando `git clone http:/bitbucket.org/eip-uprrp/repetitions-countingsquares` para descargar la carpeta `repetitions-countingsquares` de `Bitbucket`. En esa carpeta, haz doble “click” en el archivo `CountingSquares.pro`.
 
 2. Configura el proyecto. El proyecto consiste de varios archivos. **Solo escribirás código en el archivo** `main.cpp`. Los demás archivos contienen funciones que implementan la funcionalidad de las instrucciones que entiende el robot.
 
-3. Al escribir tu algoritmo debes asegurarte de que el objeto `MainGameWindow` es creado usando el argumento `Mode::SQUARE_TOP_LEFT`.  Recuerda, el robot no sabe de antemano cuantos cuartos hay. Prueba tu algoritmo con algunos ejemplos.
+3. Al escribir tu algoritmo debes asegurarte de que el objeto `MainGameWindow` es creado usando el argumento `Mode::SQUARE_TOP_LEFT`.  Recuerda, el robot no sabe de antemano cuántos cuartos hay. Prueba tu algoritmo con algunos ejemplos.
 
 4. Si el tamaño de la cuadrícula es 3x3, ¿cuántos cuartos debe visitar el robot para completar tu algoritmo? ¿Qué tal 4x4? ¿Qué tal $$n \times n$$ cuartos?
 
@@ -219,4 +221,6 @@ Utiliza los enlaces "Entrega" en Moodle para entregar el algoritmo del Ejercicio
 
 ## Referencias
 
-[1] Luther A. Tychonievich, Mark S. Sherriff, and Ryan M. Layer, http://nifty.stanford.edu/2015/tychonievich-sherriff-layer-counting-squares/
+[1] Luther A. Tychonievich, Mark S. Sherriff, and Ryan M. Layer, http://nifty.stanford.edu/2015/tychonievich-sherriff-layer-counting-squares/
+
+