Updated to book version. Mas el algo es de ordenamiento no de busqueda

README-en.md

@@ -1,4 +1,4 @@
-# Pesky Tourist: Sorting
+# Pesky Tourist: Sorting and Nested Loops
 
 ![main1.png](images/main1.png)
 ![main2.png](images/main2-small.png)
@@ -8,11 +8,15 @@ Two common tasks when working with arrays of data is to search for and sort the
 
 ##Objectives
 
-Practice sorting arrays by selection and the bubble method.
-Practice the use of decision and repetition structures.
-Use methods from the `vector` C++ class.
-Use the methods of the `QImage` class from `Qt` to manipulate an image’s pixels.
-Learn about the median filter for image processing.
+1) Practice sorting arrays by selection and the bubble method.
+
+2) Practice the use of decision and repetition structures.
+
+3) Use methods from the `vector` C++ class.
+
+4) Use the methods of the `QImage` class from `Qt` to manipulate an image’s pixels.
+
+5) Learn about the median filter for image processing.
 
 This laboratory experience is an adaptation of the nifty assignment presented by John Nicholson in [1].
 
@@ -20,11 +24,15 @@ This laboratory experience is an adaptation of the nifty assignment presented by
 
 Before arriving at the laboratory you should have:
 
-Reviewed the selection sort and bubble sort algorithms.
-Familiarized yourself with the `push_back()`, `at(i)`,  `size()`, `clear()` methods in the C++ `vector` class.
-Familiariezed yourself with the `width()`, `height()`, `pixel(i, j)`, `setPixel(i,j, pixel)` methods in the `QImage` class from `Qt`.
-Studied the concepts and instructions for the laboratory session.
-Taken the Pre-Lab quiz that can be found on Moodle.
+1) Reviewed the selection sort and bubble sort algorithms.
+
+2) Familiarized yourself with the `push_back()`, `at(i)`,  `size()`, `clear()` methods in the C++ `vector` class.
+
+3) Familiariezed yourself with the `width()`, `height()`, `pixel(i, j)`, `setPixel(i,j, pixel)` methods in the `QImage` class from `Qt`.
+
+4) Studied the concepts and instructions for the laboratory session.
+
+5) Taken the Pre-Lab quiz that can be found on Moodle.
 
 ---
 
@@ -38,7 +46,7 @@ The smallest element in an image is called a pixel. This unit consists of a sing
 
 ![figure2.png](images/figure2.png)
 
-**Figura 1.** Distribution of bits for the alpha composition and the red, green and blue tones within the ARGB representation. Each tone can have a value between 0x00 (all eight bits on 0), and 0xFF (all eight bits on 1).
+**Figure 1.** Distribution of bits for the alpha composition and the red, green and blue tones within the ARGB representation. Each tone can have a value between 0x00 (all eight bits on 0), and 0xFF (all eight bits on 1).
 
 ---
 
@@ -63,7 +71,7 @@ Given three or more images of the same space, a median filter works as follows:
 
 ![main2.png](images/main2.png)
 
-**Figura 2.** Illustration of the median filter algorithm for a given pixel. The pixel’s colors are determined in the three images, then the median is calculated. The median of the pixel is used in the corresponding position of the merged image.
+**Figure 2.** Illustration of the median filter algorithm for a given pixel. The pixel’s colors are determined in the three images, then the median is calculated. The median of the pixel is used in the corresponding position of the merged image.
 
 ---
 
@@ -118,25 +126,25 @@ The objects of the `QImage` class have the following methods that will be useful
 
 ### Examples:
 
-`QRgb myRgb = qRgb(0xff, 0x00, 0xff);`: Assigns to `myRgb` the value `0xff00ff` that represents the color ![figure3.png](images/figure3.png)
+1) `QRgb myRgb = qRgb(0xff, 0x00, 0xff);`: Assigns to `myRgb` the value `0xff00ff` that represents the color ![figure3.png](images/figure3.png)
 
 Notice that the value of `0xff00ff` represents the values `0xff`, `0x00`, `0xff`, that correspond to the red, green and blue components of `myRgb`.
 
-2. If the following `4 x 4` image of pixels represents the object `originalImage`,
+2) If the following `4 x 4` image of pixels represents the object `originalImage`,
 
 ![main1.png](images/main1.png)
 
 then `originalImage.pixel(2,1)` returns the `rgb` value that represents the color blue (`0x0000ff`).
 
-3. The following instruction assigns the red color to the pixel in position `(2, 3)` in the edited image: 
+3) The following instruction assigns the red color to the pixel in position `(2, 3)` in the edited image: 
 
 `editedImage.setPixel(2,3,qRgb(0xff,0x00,0x00));`.
 
-4. The following instruction assigns a `greenContent` the value of the green value contained in the pixel `(1, 1)` of the `originalImage`:
+4) The following instruction assigns a `greenContent` the value of the green value contained in the pixel `(1, 1)` of the `originalImage`:
 
 `int greenContent = qGreen(originalImage.pixel(1,1));`.
 
-5. The following code assigns to the red component of the pixel `(1, 1)` of `editedImage` the average of the values of the red tone that are in pixel `(1, 1)` of `originalImage1` and `originalImage2` and does the same to the green and blue components.
+5) The following code assigns to the red component of the pixel `(1, 1)` of `editedImage` the average of the values of the red tone that are in pixel `(1, 1)` of `originalImage1` and `originalImage2` and does the same to the green and blue components.
 
 ---
 
@@ -163,11 +171,14 @@ int main() {
 ---
 
 ---
-!INCLUDE "../../eip-diagnostic/pesky-tourist/es/diag-pesky-tourist-01.html"
+!INCLUDE "../../eip-diagnostic/pesky-tourist/en/diag-pesky-tourist-01.html"
+<br>
 
-!INCLUDE "../../eip-diagnostic/pesky-tourist/es/diag-pesky-tourist-02.html"
+!INCLUDE "../../eip-diagnostic/pesky-tourist/en/diag-pesky-tourist-02.html"
+<br>
 
-!INCLUDE "../../eip-diagnostic/pesky-tourist/es/diag-pesky-tourist-03.html"
+!INCLUDE "../../eip-diagnostic/pesky-tourist/en/diag-pesky-tourist-03.html"
+<br>
 
 ---
 
@@ -198,9 +209,10 @@ To find the median of the components of the colors in a pixel, we have to use a
 
 #### Instructions
 
-Load the project `PeskyTourist` on to QtCreator by double-clicking on the file `PeskyTourist.pro` in the directory `Documents/eip/Sort-PeskyTourist` on your computer. You can also go to `http://bitbucket.org/raarceupr/sort-peskytourist` to download the folder `Sort-PeskyTourist` to your computer.
+1. Load the project `PeskyTourist` on to QtCreator by double-clicking on the file `PeskyTourist.pro` in the directory `Documents/eip/Sort-PeskyTourist` on your computer. You can also go to `https://bitbucket.org/eip-uprrp/sort-peskytourist` to download the folder `Sort-PeskyTourist` to your computer.
+
+2. The code that we provide creates the interface in Figure 3.
 
-The code that we provide creates the interface in Figure 3.
     ---
 
     ![figure3.png](images/figura3.png)
@@ -219,9 +231,9 @@ The code that we provide creates the interface in Figure 3.
 
 #### Instructions
 
-Complete the `Median` function that receives a vector of integers. The `Median` function should invoke the `Sort` function to order the integers and calculate the median. The function returns the calculated median.
+1. Complete the `Median` function that receives a vector of integers. The `Median` function should invoke the `Sort` function to order the integers and calculate the median. The function returns the calculated median.
 
-Create a unit test to validate the `Median` function and invoke it from the `RemoveNoise` function.
+2. Create a unit test to validate the `Median` function and invoke it from the `RemoveNoise` function.
 
 ### Exercise 3: Calculate the median of each pixel
 
@@ -259,4 +271,3 @@ Use "Deliverables" in Moodle to upload the `Filter.cpp` file that contains the f
 ##References
 
 [1] John Nicholson, http://nifty.stanford.edu/2014/nicholson-the-pesky-tourist/
-

README-es.md

@@ -94,9 +94,9 @@ El método que usaremos en esta experiencia de laboratorio para hallar la median
 ####Ejemplo: 
 Supón que debemos hallar la mediana de los tres píxeles con valores `0xff223344`, `0xff112233`, `0xff001155`.
 
-* La mediana del componente rojo es 0x11 (dado que los componentes rojos son `0x22`, `0x11` y `0x00`.
-* La mediana del componente verde es 0x22 (dado que los componentes verdes son `0x33`, `0x22` y `0x11`.
-*  La mediana del componente azul es 0x44 (dado que los componentes azules son `0x44`, `0x33` y `0x55`.
+* La mediana del componente rojo es 0x11 (dado que los componentes rojos son `0x22`, `0x11` y `0x00`).
+* La mediana del componente verde es 0x22 (dado que los componentes verdes son `0x33`, `0x22` y `0x11`).
+*  La mediana del componente azul es 0x44 (dado que los componentes azules son `0x44`, `0x33` y `0x55`).
 
 Por lo tanto, la mediana de los píxeles sera `0xff112244`, compuesto por las medianas de los componentes de colores rojo, verde y azul.
 
@@ -143,27 +143,27 @@ Los objetos de clase `QImage` tienen los siguiente métodos que serán útiles p
 
 ### Ejemplos:
 
-1. `QRgb myRgb = qRgb(0xff, 0x00, 0xff);`: Asigna a `myRgb` el valor `0xff00ff` que representa el color ![figure3.png](images/figure3.png)
+1) `QRgb myRgb = qRgb(0xff, 0x00, 0xff);`: Asigna a `myRgb` el valor `0xff00ff` que representa el color ![figure3.png](images/figure3.png)
 
-    Nota que el valor `0xff00ff` representa los valores `0xff`, `0x0`, `0xff`, que corresponden a los componentes rojo, verde y azul de `myRgb`.
+   Nota que el valor `0xff00ff` representa los valores `0xff`, `0x0`, `0xff`, que corresponden a los componentes rojo, verde y azul de `myRgb`.
 
-2. Si la siguiente imagen `4 x 4` de píxeles representa el objeto `originalImage`,
+2) Si la siguiente imagen `4 x 4` de píxeles representa el objeto `originalImage`,
 
-      ![main1.png](images/main1.png)
+   ![main1.png](images/main1.png)
 
-     entonces `originalImage.pixel(2,1)` devuelve un valor `rgb` que representa el color azul (`0x0000ff`).
+   entonces `originalImage.pixel(2,1)` devuelve un valor `rgb` que representa el color azul (`0x0000ff`).
 
-3. La siguiente instrucción asigna el color rojo al píxel en posición `(2,3)` en la imagen editada:
+3) La siguiente instrucción asigna el color rojo al píxel en posición `(2,3)` en la imagen editada:
 
-    `editedImage.setPixel(2,3,qRgb(0xff,0x00,0x00));`.
+   `editedImage.setPixel(2,3,qRgb(0xff,0x00,0x00));`.
 
 
-4. La siguiente instrucción le asigna a `greenContent` el valor del tono de verde que contiene el pixel `(1,1)` de  `originalImage`:
+4) La siguiente instrucción le asigna a `greenContent` el valor del tono de verde que contiene el pixel `(1,1)` de  `originalImage`:
 
-    `int greenContent = qGreen(originalImage.pixel(1,1));`.
+   `int greenContent = qGreen(originalImage.pixel(1,1));`.
 
 
-5. El siguiente código le asigna al componente rojo del píxel `(1,1)` de  `editedImage` el promedio de los valores del tono de rojo que contiene el píxel `(1,1)` de  `originalImage1` y  `originalImage2` y lo mismo hace con los componentes verde y de azul.
+5) El siguiente código le asigna al componente rojo del píxel `(1,1)` de  `editedImage` el promedio de los valores del tono de rojo que contiene el píxel `(1,1)` de  `originalImage1` y  `originalImage2` y lo mismo hace con los componentes verde y de azul.
 
 ---
 
@@ -192,10 +192,13 @@ int main() {
 ---
 
 !INCLUDE "../../eip-diagnostic/pesky-tourist/es/diag-pesky-tourist-01.html"
+<br>
 
 !INCLUDE "../../eip-diagnostic/pesky-tourist/es/diag-pesky-tourist-02.html"
+<br>
 
 !INCLUDE "../../eip-diagnostic/pesky-tourist/es/diag-pesky-tourist-03.html"
+<br>
 
 ---
 
@@ -233,7 +236,7 @@ Para hallar la mediana de los componentes de colores de los píxeles, debemos co
 #### Instrucciones
 
 
-1. Carga a QtCreator el proyecto `PeskyTourist`  haciendo doble "click" en el archivo `PeskyTourist.pro` en el directorio `Documents/eip/Sort-PeskyTourist` de tu computadora. También puedes ir a `http://bitbucket.org/eip-uprrp/sort-peskytourist` para descargar la carpeta `Sort-PeskyTourist` a tu computadora.
+1. Carga a QtCreator el proyecto `PeskyTourist`  haciendo doble "click" en el archivo `PeskyTourist.pro` en el directorio `Documents/eip/Sort-PeskyTourist` de tu computadora. También puedes ir a `http://bitbucket.org/raarceupr/sort-peskytourist` para descargar la carpeta `Sort-PeskyTourist` a tu computadora.
 
 2.  El código que te proveemos crea la interfaz de la Figura 3.
 
@@ -299,4 +302,4 @@ Utiliza "Entrega" en Moodle para entregar el archivo `Filter.cpp` que contiene l
 
 ##Referencias
 
-[1] John Nicholson, http://nifty.stanford.edu/2014/nicholson-the-pesky-tourist/
+[1] John Nicholson, http://nifty.stanford.edu/2014/nicholson-the-pesky-tourist/