updated sources and readme

Testing.md

@@ -0,0 +1,703 @@
+[English](#markdown-header-testing-and-unit-testing) | [Español](#markdown-header-pruebas-y-pruebas-unitarias)
+
+#Pruebas y pruebas unitarias
+
+![main1.png](images/main1.png)
+![main2.png](images/main2.png)
+![main3.png](images/main3.png)
+
+
+Como habrás aprendido en experiencias de laboratorio anteriores, lograr que un programa compile es solo una pequeña parte de programar. El compilador se encargará de decirte si hubo errores de sintaxis, pero no podrá detectar errores en la lógica del programa. Es muy importante el probar las funciones del programa para validar que producen los resultados correctos y esperados.
+
+Una manera de hacer estas pruebas es “a mano”, esto es, corriendo el programa múltiples veces, ingresando valores representativos (por medio del teclado) y visualmente verificando que el programa devuelve los valores esperados. Una forma más conveniente es implementar funciones dentro del programa cuyo propósito es verificar que otras funciones produzcan resultados correctos. En esta experiencia de laboratorio practicarás ambos métodos de verificación.
+
+##Objetivos:
+
+1. Validar el funcionamiento de varias funciones haciendo pruebas "a mano".
+2. Crear pruebas unitarias para validar funciones, utilizando la función `assert` 
+
+
+
+##Pre-Lab:
+
+Antes de llegar al laboratorio debes:
+
+1. Haber repasado los conceptos básicos relacionados a pruebas y pruebas unitarias.
+
+2. Haber repasado el uso de la función `assert` para hacer pruebas.
+
+3. Haber estudiado los conceptos e instrucciones para la sesión de laboratorio.
+
+4. Haber tomado el quiz Pre-Lab que se encuentra en Moodle.
+
+---
+
+---
+
+##Haciendo pruebas a una función. 
+
+Cuando probamos la validez de una función debemos probar casos que activen los diversos resultados de la función. 
+
+---
+
+**Ejemplo 1:** si fueras a validar una función `esPar(unsigned int n)` que determina si un entero positivo *n* es par, deberías hacer pruebas a la función tanto con números pares como números impares. Un conjunto adecuado de pruebas para dicha función podría ser:
+
+
+|   Prueba   | Resultado esperado |
+|------------|--------------------|
+| `esPar(8)` | true               |
+| `esPar(7)` | false                   |
+
+---
+
+**Ejemplo 2:** Digamos que un amigo ha creado una función `unsigned int rangoEdad(unsigned int edad)` que se supone que devuelva 0 si la edad está entre 0 y 5 (inclusive), 1 si la edad está entre 6 y 18 inclusive, y 2 si la edad es mayor de 18. Una fuente común de errores en funciones como esta son los valores próximos a los límites de cada rango, por ejemplo, el número 5 se presta para error si el programador  no usó una comparación correcta. Un conjunto adecuado  de pruebas para la función `rangoEdad` sería:
+
+|      Prueba     | Resultado esperado |
+|-----------------|--------------------|
+| `rangoEdad(5)`  |                  0 |
+| `rangoEdad(2)`  |                  0 |
+| `rangoEdad(6)`  |                  1 |
+| `rangoEdad(18)` |                  1 |
+| `rangoEdad(17)` |                  1 |
+| `rangoEdad(19)` |                  2 |
+| `rangoEdad(25)` |                  2 |
+
+---
+
+###La función `assert`
+
+
+La función `assert(bool expression)` se puede utilizar como herramienta rudimentaria para validar de funciones. `assert` tiene un funcionamiento muy sencillo y poderoso.  Si la expresión que colocamos entre los paréntesis de `assert` es *cierta* la función permite que el programa continúe con la próxima instrucción. De lo contrario, si la expresión que colocamos entre los paréntesis es *falsa*, la función `assert` hace que el programa termine e imprime un mensaje al terminal que informa al usuario sobre la instrucción de `assert` que falló. 
+
+Por ejemplo, el siguiente programa correrá de principio a fin sin problemas pues todos las expresiones incluidas en los paréntesis de los asserts evalúan a *true*.
+
+---
+
+```cpp
+#include <iostream>
+#include <cassert>
+using namespace std;
+
+int main() {
+   int i = 10, j = 15;
+   assert(i == 10);
+   assert(j == i + 5);
+   assert(j != i);
+   assert( (j < i) == false);
+   cout << "Eso es todo, amigos!" << endl;
+   return 0;
+}
+
+```
+
+**Figura 1.** Ejemplo de programa que pasa todas las pruebas de `assert`.
+
+---
+
+El siguiente programa no correrá hasta el final pues el segundo `assert` (`assert(j == i);`)  contiene una expresión  (`j==i`) que evalúa a *false*.
+
+---
+
+```cpp
+
+#include <iostream>
+#include <cassert>
+using namespace std;
+
+int main() {
+   int i = 10, j = 15;
+   assert(i == 10);
+   assert(j == i);
+   assert(j != i);
+   assert( (j < i) == false);
+   cout << "Eso es todo, amigos!" << endl;
+   return 0;
+}
+
+```
+
+**Figura 2.** Ejemplo de programa que no "pasa" una prueba de `assert`.
+
+---
+
+Al correr el pasado programa, en lugar de obtener la frase `”Eso es todo amigos!”` en el terminal, obtendremos un mensaje como el siguiente:
+
+`Assertion failed: (j == i), function main, file ../programa01/main.cpp, line 8.`
+
+El programa no ejecuta más instrucciones después de la línea 8.
+
+####¿Cómo usar assert para validar funciones?
+
+Digamos que deseas automatizar la validación de la función `rangoEdad`. Un forma de hacerlo es crear una función que llame a la función `rangoEdad` con diversos argumentos y verifique que lo devuelto concuerde con el resultado esperado. Si incluimos cada comparación entre lo devuelto por `rangoEdad` y el resultado esperado dentro de un `assert`, obtenemos una función que se ejecuta de principio a fin solo si todas las invocaciones devolvieron el resultado esperado.
+
+---
+
+```cpp
+void test_rangoEdad() {
+   assert(rangoEdad(5) == 0);
+   assert(rangoEdad(2) == 0);
+   assert(rangoEdad(6) == 1);
+   assert(rangoEdad(18) == 1);
+   assert(rangoEdad(17) == 1);
+   assert(rangoEdad(19) == 2);
+   assert(rangoEdad(25) == 2);
+   cout << "rangoEdad passed all tests!!!" << endl;
+}
+```
+
+**Figura 3.** Ejemplo de una función para pruebas usando `assert`.
+
+
+---
+
+---
+
+
+##Sesión de laboratorio:
+
+###Ejercicio 1: Diseñar pruebas "a mano"
+
+En este ejercicio practicarás cómo diseñar pruebas para validar funciones, utilizando solamente la descripción de la función y la interfaz que se usa para interactuar con la función. 
+
+El ejercicio **NO requiere programación**, solo requiere que entiendas la descripción de la función, y tu habilidad para diseñar pruebas. Este ejercicio y el Ejercicio 2 son una adaptación del ejercicio en [1].
+
+**Ejemplo 3.** Supón que una amiga te provee un programa. Ella asegura que el programa resuelve el siguiente problema: 
+
+`"dados tres enteros, despliega el valor máximo".` 
+
+Supón que el programa tienen una interfaz como la siguiente:
+
+---
+
+![figure4.png](images/figure4.png)
+
+**Figura 4** - Interfaz de un programa para hallar el valor máximo entre tres enteros.
+
+---
+
+Podrías determinar si el programa provee resultados válidos **sin analizar el código fuente**. Por ejemplo, podrías intentar los siguientes casos:
+
+* a = 4, b = 2, c = 1; resultado esperado: 4
+* a = 3, b = 6, c = 2; resultado esperado: 6
+* a = 1, b = 10, c = 100; resultado esperado: 100
+
+Si alguno de estos tres casos no da el resultado esperado, el programa de tu amiga no funciona. Por otro lado, si los tres casos funcionan, entonces el programa tiene una probabilidad alta de estar correcto.
+
+####Funciones para validar
+
+En este ejercicio estarás diseñando pruebas que validen varias versiones de las funciones que se describen abajo. Cada una de las funciones tiene cuatro versiones, "Alpha", "Beta", "Gamma" y "Delta".
+
+
+* **3 Sorts:** una función que recibe tres "strings" y los ordena en orden lexicográfico (alfabético). Por ejemplo, dados `jirafa`, `zorra`, y `coqui`, los ordena como: `coqui`, `jirafa`, y `zorra`.  Para simplificar el ejercicio, solo usaremos "strings" con letras minúsculas. La Figura 5 muestra la interfaz de esta función. Nota que hay un menú para seleccionar la versión implementada.
+
+  ---
+
+
+    ![figure5.png](images/figure5.png)
+
+    **Figura 5** - Interfaz de la función `3 Sorts`.
+
+  ---
+
+
+
+* **Dice:** cuando el usuario marca el botón `Roll them!`, el programa genera dos números aleatorios entre 1 y 6. El programa informa la suma de los números aleatorios. 
+
+  ---
+
+    ![figure6.png](images/figure6.png)
+
+    **Figura 6** - Interfaz de la función `Dice`.
+
+  ---
+
+* **Rock, Paper, Scissors:** cada uno de los jugadores entra su jugada y el programa informa quién ganó. La Figura 7 muestra las opciones en las que un objeto le gana a otro. La interfaz del juego se muestra en la  Figura 8.
+
+  ---
+
+    ![figure7.jpg](images/figure7.jpg)
+
+    **Figura 7** - Formas de ganar en el juego "Piedra, papel y tijera".
+
+  ---
+
+    ![figure8.png](images/figure8.png)
+
+    **Figura 8** - Interfaz de la función `Rock, Paper, Scissors`.
+
+  ---
+
+
+* **Zulu time:** Dada una hora en tiempo Zulu (Hora en el Meridiano de Greenwich) y la zona militar en la que el usuario desea saber la hora, el programa muestra la hora en esa zona. El formato para el dato de entrada es en formato de 23 horas `####`, por ejemplo `2212` sería las 10:12 pm. La lista de zonas militares válidas la puedes encontrar en  http://en.wikipedia.org/wiki/List_of_military_time_zones. Lo que sigue son ejemplos de cómo deben ser los resultados del programa:
+
+  * Dada hora Zulu 1230 y zona A (UTC+1), el resultado debe ser 1330.
+  * Dada hora Zulu 1230 y zona N (UTC-1), el resultado debe ser 1130.
+  * Puerto Rico está en la zona militar Q (UTC-4), por lo tanto, cuando es 1800 en hora Zulu, son las 1400 en Puerto Rico.
+  
+  ---
+
+    ![figure9.png](images/figure9.png)
+
+    **Figura 9** - Interfaz de la función `Zulu time`.
+
+  ---
+
+####Instrucciones
+
+1. Para cada una de las funciones descritas arriba, escribe en tu libreta las pruebas que harás para determinar la validez de cada implementación (Alpha, Beta, Gamma y Delta). Para cada función, piensa en los errores lógicos que el programador pudo haber cometido y escribe pruebas que determinen si se cometió ese error. Para cada prueba, escribe los valores que utilizarás y el resultado que esperas obtener.
+
+  Por ejemplo, puedes organizar tus respuestas en una tabla como la que sigue:
+
+  ---
+
+
+  | 3 Sorts |                           |                           |           |            |            |
+  |---------|---------------------------|---------------------------|-----------|------------|------------|
+  | Num     | Prueba                    | Result Alpha              | Res. Beta | Res. Gamma | Res. Delta |
+  | 1       | "alce", "coyote", "zorro" | "alce", "coyote", "zorro" | ....      | ....       |            |
+  | 2       | "alce", "zorro", "coyote" | "zorro", "alce", "coyote" | ....      | ....       |            |
+  | ....    | ....                      | ....                      | ....      | ....       | ....       |
+
+  **Figura 10** - Tabla para organizar los resultados de las pruebas.
+
+  ---
+
+  Puedes ver ejemplos de cómo organizar tus resultados [aquí](http://i.imgur.com/ggDZ3TQ.png) y [aquí](http://i.imgur.com/rpApVqm.png). 
+
+
+
+###Ejercicio 2: Hacer pruebas "a mano"
+
+El proyecto `testing` implementa varias versiones de cada una de las cuatro funciones simples que se decribieron en el Ejercicio 1. Algunas o todas las implementaciones pueden estar incorrectas. Tu tarea es, usando las pruebas que diseñaste en el Ejercicio 1, probar las versiones de cada función para  determinar cuáles de ellas, si alguna, están  implementadas correctamente.
+
+Este ejercicio **NO requiere programación**, debes hacer las pruebas **sin mirar el código.**
+
+####Instrucciones
+
+1. Carga a Qt el proyecto `Testing`  haciendo doble "click" en el archivo `Testing.pro` en el directorio `Documents/eip/Testing` de tu computadora. También puedes ir a `http://bitbucket.org/eip-uprrp/testing` para descargar la carpeta `Testing` a tu computadora.
+
+2. Configura el proyecto y corre el programa. Verás una pantalla similar a la siguiente:
+  
+  ---
+
+    ![figure11.png](images/figure11.png)
+
+    **Figura 11** - Ventana para seleccionar la función que se va a probar.
+
+  ---
+
+3. Selecciona el botón de `3 Sorts` y obtendrás la interfaz de la Figura 5.
+
+4. La "Version Alpha" en la caja indica que estás corriendo la primera versión del algoritmo `3 Sorts`. Usa las pruebas que escribiste en el Ejercicio 1 para validar la "Version Alpha". Luego, haz lo mismo para las versiones Beta, Gamma y Delta. Escribe cuáles son las versiones correctas (si alguna) de la función y porqué. Recuerda que, para cada función, algunas o todas las implementaciones pueden estar incorrectas. Además, especifica cuáles pruebas te permitieron determinar  las  versiones que son incorrectas.
+
+
+
+###Ejercicio 3: Usar `assert` para realizar pruebas unitarias
+
+Hacer pruebas "a mano" cada vez que corres un programa es una tarea que resulta "cansona" bien rápido. En los ejercicios anteriores lo hiciste para unas pocas funciones simples. !Imagínate hacer lo mismo para un programa complejo completo como un buscador o un procesador de palabras!
+
+Las *pruebas unitarias* ayudan a los programadores a validar códigos y simplificar el proceso de depuración ("debugging") a la vez que evitan la tarea tediosa de hacer pruebas a mano en cada ejecución.
+
+####Instrucciones:
+
+1. En el menú de QT, ve a `Build` y selecciona `Clean Project "Testing"`.
+
+2. Carga a Qt el proyecto `UnitTests`  haciendo doble "click" en el archivo `UnitTests.pro` en el directorio `Documents/eip/Testing` de tu computadora. También puedes ir a `http://bitbucket.org/eip-uprrp/testing` para descargar la carpeta `Testing` a tu computadora.
+
+3. El proyecto solo contiene el archivo de código fuente `main.cpp`. Este archivo contiene cuatro funciones: `fact`, `isALetter`, `isValidTime`, y `gcd`, cuyos resultados son solo parcialmente correctos. 
+
+  Estudia la descripción de  cada una de las funciones que aparece como comentarios antes el código de la función para saber la tarea que se espera haga la función.
+
+  Tu tarea es escribir pruebas unitarias para cada una de las funciones para identificar los resultados erróneos. ** No necesitas reescribir las funciones para corregirlas. **
+
+  Para la función `fact` se provee la función  `test_fact()`  como función de prueba unitaria. Si invocas esta función desde `main`, compilas y corres el programa debes obtener un mensaje como el siguiente:
+
+    `Assertion failed: (fact(2) == 2), function test_fact, file ../UnitTests/ main.cpp, line 69.`
+
+  Esto es suficiente para saber que la función `fact` NO está correctamente implementada. 
+
+4. Nota que, al fallar la prueba anterior, el programa no continuó su ejecución. Para poder probar el código que escribirás, comenta la invocación de `test_fact()` en `main`.
+
+5. Escribe una prueba unitaria llamada `test_isALetter` para la función `isALetter`. En la prueba unitaria escribe varias  afirmaciones ("asserts") para probar algunos datos de entrada y sus valores esperados (mira la función `test_fact` para que te inspires). Invoca `test_isALetter` desde `main` y ejecuta tu programa. Si la función `isALetter` pasa las pruebas que escribiste, continúa escribiendo "asserts" y ejecutando tu programa hasta que alguno de los `asserts` falle. 
+
+6. Comenta la invocación de `test_isALetter` en `main` para que puedas continuar con las otras funciones.
+
+7. Repite los pasos 5 y 6 paras las otras dos funciones, `isValidTime` y `gcd`.  Recuerda que debes llamar a cada una de las funciones de prueba unitaria desde `main` para que corran. 
+
+---
+
+---
+
+##Entregas
+
+1. Utiliza "Entrega 1" en Moodle para entregar la tabla con las pruebas que diseñaste en el Ejercicio 1 y que completaste en el Ejercicio 2 con los resultados de las pruebas de las funciones.
+
+2. Utiliza "Entrega 2" en Moodle para entregar el archivo `main.cpp` que contiene las funciones `test_isALetter`, `test_isValidTime`, `test_gcd` y sus invocaciones. Recuerda utilizar buenas prácticas de programación, incluir el nombre de los programadores y documentar tu programa.
+
+---
+
+---
+
+## Referencias
+
+[1] http://nifty.stanford.edu/2005/TestMe/
+
+---
+
+---
+
+---
+
+
+
+[English](#markdown-header-testing-and-unit-testing) | [Español](#markdown-header-pruebas-y-pruebas-unitarias)
+
+#Testing and Unit Testing
+
+![](http://demo05.cloudimage.io/s/resize/215/i.imgur.com/D0laI5r.png)
+![](http://demo05.cloudimage.io/s/resize/215/i.imgur.com/ggDZ3TQ.png)
+![](http://demo05.cloudimage.io/s/resize/215/i.imgur.com/V6xFo00.png)
+
+
+
+As you have learned in previous labs, getting a program to compile is only a minor part of programming. The compiler will tell you if there are syntactical errors, but it isn't capable of detecting logical problems in your program. It's very important to test the program's functions to validate that they produce correct results.
+
+These tests can be performed by hand, this is, running the program multiple times, providing representative inputs and visually checking that the program outputs correct results. A more convenient way is to implement functions in the program whose sole purpose is to validate that other functions are working correctly. In this lab you will be practicing both testing methods.
+
+
+##Objectives:
+
+1. Design tests to validate several programs “by-hand”, then use these tests to determine if the program works as expected. 
+2. Create unit tests to validate functions, using the `assert` function.
+
+
+##Pre-Lab:
+
+Before you get to the laboratory you should have:
+
+1. Reviewed the basic concepts related to testing and unit tests.
+
+2. Reviewed how to use the `assert` function to validate another function.
+
+3. Studied the concepts and instructions for this laboratory session.
+
+4. Taken the Pre-Lab quiz available in Moodle.
+
+---
+
+---
+
+## Testing a function
+
+When we test a function's validity we should test cases that activate the various results the function could return.
+
+---
+
+**Example 1:** if you were to validate the function `isEven(unsigned int n)` that determines if a positive integer *n* is even, you should test the function using even and odd numbers. A set of tests for that function could be:
+
+
+|     Test     | Expected Result |
+|--------------|-----------------|
+| `isEven(8)`  | true            |
+| `isEven(7)`  | false           |
+
+---
+
+**Example 2:** Suppose that a friend has created a function `unsigned int ageRange(unsigned int age)` that is supposed to return 0 if the age is between 0 and 5 (inclusive), 1 if the age is between 6 and 18 inclusive, and 2 if the age is above 18. A common source of errors in functions like this one are the values near to the limits of each range, for example, the number 5 can cause errors if the programmer did not use a correct comparison. One good set of tests for the `ageRange` function would be:
+
+|      Test      | Expected Result |
+|----------------|-----------------|
+| `ageRange(5)`  |               0 |
+| `ageRange(2)`  |               0 |
+| `ageRange(6)`  |               1 |
+| `ageRange(18)` |               1 |
+| `ageRange(17)` |               1 |
+| `ageRange(19)` |               2 |
+| `ageRange(25)` |               2 |
+
+---
+
+###`Assert` Function:
+
+The `assert(bool expression)` function can be used as a rudimentary tool to validate functions. `assert` has a very powerful yet simple functionality. If the expression that we place between the `assert` parenthesis is *true*, the function allows the program to continue onto the next instruction. Otherwise, if the expression we place between the parenthesis is *false*, the `assert` function causes the program to terminate and prints an error message on the terminal that informs the user about the `assert` instruction that failed.
+
+For example, the following program will run from start to finish without problems since every expression included in the assert's parentheses evaluates to *true*.
+
+---
+
+```cpp
+#include <iostream>
+#include <cassert>
+using namespace std;
+
+int main() {
+   int i = 10, j = 15;
+   assert(i == 10);
+   assert(j == i + 5);
+   assert(j != i);
+   assert( (j < i) == false);
+   cout << "That's all, folks!" << endl;
+   return 0;
+}
+
+```
+
+**Figure 1.** Example of a program that passes all of the `assert` tests.
+
+---
+
+The following program will not run to completion because the second `assert` (`assert(j == i);`) contains an expression (`j==i`) that evaluates to *false*.
+
+---
+
+```cpp
+
+#include <iostream>
+#include <cassert>
+using namespace std;
+
+int main() {
+   int i = 10, j = 15;
+   assert(i == 10);
+   assert(j == i);
+   assert(j != i);
+   assert( (j < i) == false);
+   cout << "That's all, folks!" << endl;
+   return 0;
+}
+
+```
+
+**Figure 2.** Example of a program that does not pass an `assert` test.
+
+---
+
+When the program is run, instead of getting the phrase `”That's all, folks!”` in the terminal, we will obtain something like:
+
+`Assertion failed: (j == i), function main, file ../program01/main.cpp, line 8.`
+
+The program will not execute the remaining instructions after line 8.
+
+#### How to use assert to validate functions?
+
+Suppose that  you want to automate the validation of the `ageRange`. One way to do it is by  implementing and calling a function that calls the `ageRange` function with different arguments and verifies that each returned value is equal to  the expected result. If the `ageRange` function returns a value that is not expected, the testing function aborts the program and reports the test that failed. The following illustrates a function to test the `ageRange` function. Observe that it consists of one assert per each of the tests we had listed earlier. 
+
+---
+
+```cpp
+void test_ageRange() {
+   assert(ageRange(5) == 0);
+   assert(ageRange(2) == 0);
+   assert(ageRange(6) == 1);
+   assert(ageRange(18) == 1);
+   assert(ageRange(17) == 1);
+   assert(ageRange(19) == 2);
+   assert(ageRange(25) == 2);
+   cout << "ageRange passed all tests!!!" << endl;
+}
+```
+
+**Figure 3.** Example of a test function using `assert`.
+
+
+---
+
+---
+
+##Laboratory Session:
+
+###Exercise 1: Designing tests by hand
+
+In this exercise you will practice how to design tests to validate functions, using only the function's description and the graphical user interface that is used interact with the function.
+
+The exercise **DOES NOT require programming**, it only requires that you understand the function’s description, and your ability to design tests. This exercise and Exercise 2 are an adaptation of the exercise in [1].
+
+**Example 3** Suppose that a friend provides you with a program. She makes sure the program solves the following problem:
+
+`"given three integers, it displays the max value".`
+
+Suppose that the program has an interface like the following:
+
+---
+
+![figure4.png](images/figure4.png)
+
+**Figure 4** - Interface for a program that finds the max value out of three integers.
+
+---
+
+You could determine if the program provides valid results **without analyzing the source code**. For example, you could try the following cases:
+
+* a = 4, b = 2, c = 1; expected result: 4
+* a = 3, b = 6, c = 2; expected result: 6
+* a = 1, b = 10, c = 100; expected result: 100
+
+If one of these three cases does not have the expected result, your friend's program does not work. On the other hand, if the three cases work, then the program has a high probability of being correct.
+
+
+####Functions to validate
+
+In this exercise you will be designing tests to validate various versions of the functions that are described below. Each one of the functions has four versions, "Alpha", "Beta", "Gamma" and "Delta".
+
+* **3 Sorts:** a function that receives three strings and orders them in lexicographic (alphabetical) order. For example, given `giraffe`, `fox`, and `coqui`, it would order them as: `coqui`, `fox`, and `giraffe`. To simplify the exercise, we will be using strings with lowercase **letters**. Figure 5 shows the function's interface. Notice there is a menu to select the implemented version.
+
+  ---
+
+    ![figure5.png](images/figure5.png)
+
+    **Figure 5** - Interface for the `3 Sorts` function.
+
+  ---
+
+
+* **Dice:** when the user presses the `Roll them!` button, the program generates two random integers between 1 and 6. The program informs the sum of the two random numbers.
+
+  ---
+
+    ![figure6.png](images/figure6.png)
+
+    **Figure 6** - Interface for the `Dice` function.
+
+  ---
+
+
+* **Rock, Paper, Scissors:** each one of the players enters their play and the program informs who the winner is. Figure 7 shows the options where one object beats the other. The game's interface is shown in Figure 8.
+
+  ---
+
+  ![figure7.jpg](images/figure7.jpg)
+
+  **Figure 7** - Ways to win in "Rock, paper, scissors".
+
+  ---
+
+    ![figure8.png](images/figure8.png)
+
+    **Figure 8** - Interface for the `Rock, Paper, Scissors` function.
+
+  ---
+
+
+* **Zulu time:** Given a time in Zulu format (time at the Greenwich Meridian) and the military zone in which the user wants to know the time, the program shows the time in that zone. The format for the entry data is in the 24 hour format `####`, for example `2212` would be 10:12pm. The list of valid military zones can be found in http://en.wikipedia.org/wiki/List_of_military_time_zones. The following are examples of some valid results:
+
+  * Given Zulu time 1230 and zone A (UTC+1), the result should be 1330.
+  * Given Zulu time 1230 and zone N (UTC-1), the result should be 1130.
+  * Puerto Rico is in military zone Q (UTC-4), therefore, when its 1800 in Zulu time, it's 1400 in Puerto Rico.
+
+  ---
+
+    ![figure9.png](images/figure9.png)
+
+    **Figure 9** - Interface for the `Zulu time` function.
+
+  ---
+
+
+####Instructions
+
+1. For each of the functions described above, write in your notebook the tests that you will do to determine the validity of each implementation (Alpha, Beta, Gamma and Delta). For each function, think of the logical errors that the programmer could have made and write tests that determine if these errors were made. For each test, write the values that you will use and the expected result.
+
+  For example, you could organize your answers in a table like the following:
+
+
+  ---
+
+
+  | 3 Sorts |                           |                           |           |            |            |
+  |---------|---------------------------|---------------------------|-----------|------------|------------|
+  | Num     | Test                    | Alpha Result              | Beta Result | Gamma Result | Delta Result |
+  | 1       | "deer", "coyote", "fox" | "coyote", "deer", "fox" | ....      | ....       |            |
+  | 2       | "deer", "fox", "coyote" | "fox", "deer", "coyote" | ....      | ....       |            |
+  | ....    | ....                      | ....                      | ....      | ....       | ....       |
+
+        
+  **Figure 10** - Table to organize the test results.
+
+  ---
+
+You can see examples of how to organize your results [here](http://i.imgur.com/ggDZ3TQ.png) and [here](http://i.imgur.com/rpApVqm.png).
+
+
+###Exercise 2: Doing tests “by hand”
+
+The `testing` project implements several versions of each of the four functions that were described in Exercise 1. Some or all of the implementations could be incorrect. Your task is, using the tests you designed in Exercise 1, to test the versions for each function to determine which of them, if any, are implemented correctly.
+
+This exercise **DOES NOT require programming**, you should make the tests **without looking at the code.**
+
+####Instructions
+
+1. Load the `Testing` project onto Qt by double clicking the `Testing.pro` file in the `Documents/eip/Testing` directory on your computer. You can also go to `http://bitbucket.org/eip-uprrp/testing` to downloaded the `Testing` folder on your computer.
+
+2. Configure the project and run the program. You will see a window similar to the following:
+
+  ---
+
+    ![figure11.png](images/figure11.png)
+
+    **Figure 11** - Window to select the function that will be tested.
+
+  ---
+
+3. Select the button for `3 Sorts` and you will obtain the interface in Figure 5.
+
+4. The "Alpha Version" in the box indicates that you're running the first version of the `3 Sorts` algorithm. Use the tests that you wrote in Exercise 1 to validate the "Alpha Version". Afterwards, do the same with the Beta, Gamma and Delta versions. Write down which are the correct versions of the function (if any), and why. Remember that, for each function, some or all of the implementations could be incorrect. Additionally, specify which tests allowed you to determine the incorrect versions.
+
+
+
+###Exercise 3: Using `assert` to make unit tests
+
+Doing tests by hand each time you run a program is a tiresome task. In the previous exercises you did it for a few simple functions. Imagine doing the same for a complex program like a search engine or a word processor.
+
+*Unit tests* help programmers validate code and simplify the process of debugging while avoiding having to do these tests by hand in each execution.
+
+####Instructions:
+
+1. In the Qt menu, go to `Build` and select `Clean Project "Testing"`.
+
+2. Load the `UnitTests` project onto Qt by double clicking the `UnitTests.pro` file in the `Documents/eip/Testing` directory on your computer. You can also go to `http://bitbucket.org/eip-uprrp/testing` to download the `Testing` folder on your computer.
+
+3. The project only contains the source code file `main.cpp`. This file contains four functions: `fact`, `isALetter`, `isValidTime`, and `gcd`, whose results are only partially correct.
+
+    Study the description of each function that appears as a comment before the function's code to understand the task that the function is supposed to carry out.
+
+    Your task is to write unit tests for each of the functions to identify the erroneous results. **You do not need to rewrite the functions to correct them.**
+
+    For the `fact` function, a `test_fact()` is provided as a unit test function. If you invoke the function from `main`, compile and run the program you should obtain a message like the following:
+
+     `Assertion failed: (fact(2) == 2), function test_fact, file ../UnitTests/ main.cpp, line 69.`
+
+     This is evidence enough to establish that the `fact` function is NOT correctly implemented.
+
+4. Notice that, by failing the previous test, the program did not continue its execution. To test the code you will write, comment the `test_fact()` call in `main`.
+
+5. Write a unit test called `test_isALetter` for the `isALetter` function. Write various asserts in the unit test to try some data and its expected values (use the `test_fact` function for inspiration). Invoke `test_isALetter` from `main` and execute your program. If the `isALetter` function passes the test you wrote, continue writing asserts and executing the program until one of them fails.
+
+6. Comment the `test_isALetter` call in `main` so you can continue with the other functions.
+
+7. Repeat the steps in 5 and 6 for the other two functions, `isValidTime` and `gcd`. Remember that you should call each of the unit test functions from `main` for them to run.     
+
+---
+
+---
+
+##Deliverables
+
+1. Use "Deliverables 1" in Moodle to hand in the table with the tests you designed in Exercise 1 and that you completed in Exercise 2 with the results from the function tests.
+
+2. Use "Deliverables 2" in Moodle to hand in the `main.cpp` file that contains the `test_isALetter`, `test_isValidTime`, `test_gcd` functions and their calls. Remember to use good programming techniques, include the name of the programmers involved and document your program.
+
+---
+
+---
+
+## References
+
+[1] http://nifty.stanford.edu/2005/TestMe/
+
+---
+
+---
+
+---
+
+

Testing.pro

@@ -25,4 +25,3 @@ FORMS    += mainwindow.ui
 
 RESOURCES += \
     images.qrc
-

UnitTests/UnitTests.pro

@@ -0,0 +1,7 @@
+TEMPLATE = app
+CONFIG += console
+CONFIG -= app_bundle
+CONFIG -= qt
+
+SOURCES += main.cpp
+

UnitTests/main.cpp

@@ -0,0 +1,130 @@
+#include <iostream>
+#include <cassert>
+
+using namespace std;
+
+//
+// Function fact(n): Given a positive number n will return its factorial.
+//
+unsigned int fact(unsigned int n) {
+
+    if (n <= 0) return 0;
+
+    int result = 1;
+
+    for (int i = 1; i < n; i++)
+        result = result * i;
+
+    return result;
+}
+
+
+// 
+// Function isALetter(c):
+// Given a character c will return true if it is a letter,
+// otherwise returns false.
+//
+
+bool isALetter(char c) {
+    return ( c >= 'A' && c <= 'z');
+}
+
+//
+// Function isValidTime(n:
+// Given a time in military format, e.g. 1147, determines if it is valid. 
+// Returns true if valid, false otherwise.
+//
+
+bool isValidTime(unsigned int n) {
+    return ( n >= 0 && n <= 2359 );
+}
+
+
+//
+// Function gcd(a,b):
+// Given two positive integeres, determines their greatest common divisor 
+// and returns it.
+//
+
+int gcd ( int a, int b ) {
+    int c;
+
+    while ( a > 1 ) {
+        c = a;
+        a = b % a;
+        b = c;
+    }
+    return b;
+}
+
+
+//
+// Function test_fact():
+// This function is provided as an example unit test for the fact() function. 
+//
+
+void test_fact() {
+    assert( fact(1) == 1 );
+    assert( fact(2) == 2);
+    assert( fact(4) == 24);
+    cout << "Function fact() passed all the tests!!" << endl;
+}
+
+//
+// EXERCISE 3
+//
+
+
+//
+// Function test_isALetter():
+// This function is provided as an example unit test for the isALetter() function.
+//
+
+void test_isALetter() {
+    assert( isALetter('a') );
+    assert( isALetter('Z'));
+    assert( isALetter('2')==0);
+    assert( isALetter('$')==0);
+    assert( isALetter('^')==0);
+    cout << "Function isALetter() passed all the tests!!" << endl;
+}
+
+//
+// Function test_isValidTime():
+// This function is provided as an example unit test for the isValidTime() function.
+//
+
+void test_isValidTime() {
+    assert( isValidTime(0002) );
+    assert( isValidTime(1234) );
+    assert( isValidTime(4800)==0 );
+    assert( isValidTime(1278)==0 );
+    cout << "Function isValidTime() passed all the tests!!" << endl;
+}
+
+//
+// Function test_gcd():
+// This function is provided as an example unit test for the gcd() function.
+//
+
+void test_gcd() {
+    assert( gcd(1,1)==1 );
+    assert( gcd(2,2)==2 );
+    assert( gcd(3,2)==1 );
+    assert( gcd(12,9)==3 );
+    assert( gcd(12,6)==6 );
+    cout << "Function gcd() passed all the tests!!" << endl;
+}
+
+
+
+int main()
+{
+    cout << "Go ahead and test!\n";
+    test_fact();
+ // test_gcd();
+ // test_isALetter();
+ // test_isValidTime();
+    
+    return 0;
+}

functions.cpp

@@ -111,32 +111,59 @@ void mySortDelta(QString &a, QString &b, QString &c) {
 }
 
 
+//========================================================
+// Functions for the dice roller
+//========================================================
+
+//This is the correct dice roller
+void MainWindow::diceAlpha(){
+    int total = diceFinal01 + diceFinal02 + 2;
+    line[0]->setText(QString::number(total));
+}
 
+//This version sums the first dice twice
+void MainWindow::diceBeta(){
+    int total = diceFinal01 + diceFinal01 + 2;
+    line[0]->setText(QString::number(total));
+}
+
+//This one substracts the second dice to the first one
+void MainWindow::diceGamma(){
+    int total = diceFinal01 - diceFinal02;
+    line[0]->setText(QString::number(total));
+}
+
+//This one takes the number 6 as a 12
+void MainWindow::diceDelta(){
+    int total = diceFinal01 + diceFinal02;
+    line[0]->setText(QString::number(total));
+}
 
 // =========================================================
 // Rock Paper Scissor Functions
 // =========================================================
 
 
+
 int RPSAlpha(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'P' )    return TIE;
-        else if (p2 == 'R') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'P' )    return 0;
+        else if (p2 == 'R') return 1;
+        else                return 2;
     }
 
     else if (p1 == 'R') {
-        if ( p2 == 'R' )    return TIE;
-        else if (p2 == 'S') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'R' )    return 0;
+        else if (p2 == 'S') return 1;
+        else                return 2;
     }
 
     else {
-        if ( p2 == 'S' )    return TIE;
-        else if (p2 == 'P') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'S' )    return 0;
+        else if (p2 == 'P') return 1;
+        else                return 2;
     }
 }
 
@@ -145,20 +172,20 @@ int RPSBeta(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'S' )    return TIE;
-        else if (p2 == 'R') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'S' )    return 0;
+        else if (p2 == 'R') return 1;
+        else                return 2;
     }
     else if (p1 == 'R') {
-        if ( p2 == 'S' )    return TIE;
-        else if (p2 == 'P') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'S' )    return 0;
+        else if (p2 == 'P') return 1;
+        else                return 2;
     }
 
     else {
-        if ( p2 == 'S' )    return TIE;
-        else if (p2 == 'R') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'S' )    return 0;
+        else if (p2 == 'R') return 1;
+        else                return 2;
     }
 }
 
@@ -168,40 +195,41 @@ int RPSGamma(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'P' )    return TIE;
-        else if (p2 == 'S') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'P' )    return 0;
+        else if (p2 == 'S') return 1;
+        else                return 2;
     }
     else if (p1 == 'R') {
-        if ( p2 == 'R' )    return TIE;
-        else if (p2 == 'P') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'R' )    return 0;
+        else if (p2 == 'P') return 1;
+        else                return 2;
     }
     else {
-        if ( p2 == 'P' )    return TIE;
-        else if (p2 == 'S') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'P' )    return 0;
+        else if (p2 == 'S') return 1;
+        else                return 2;
     }
 }
 
 
+
 int RPSDelta(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'P' )    return TIE;
-        else if (p2 == 'S') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'P' )    return 0;
+        else if (p2 == 'S') return 1;
+        else                return 2;
     }
     else if (p1 == 'R') {
-        if ( p2 == 'R' )    return TIE;
-        else if (p2 == 'P') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'R' )    return 0;
+        else if (p2 == 'P') return 1;
+        else                return 2;
     }
     else {
-        if ( p2 == 'P' )    return TIE;
-        else if (p2 == 'S') return P1_WON;
-        else                return P2_WON;
+        if ( p2 == 'P' )    return 0;
+        else if (p2 == 'S') return 1;
+        else                return 2;
     }
 }
 
@@ -213,6 +241,11 @@ int RPSDelta(char p1, char p2) {
 
 QMap<int,QString> M;
 
+///
+/// \brief initCheckWMaps: initialize the values in the dictionary that is used throughout
+///                        the check functions.
+///
+
 void initCheckWMaps() {
 
     M[1] = "one";       M[2] = "two";       M[3]  = "three";      M[4] = "four";
@@ -226,6 +259,13 @@ void initCheckWMaps() {
 }
 
 
+///
+/// \brief validateCheckQty: determines is entered text is a valid number in [0,999999999]
+/// \param st text entered by the user
+/// \param qty text converted to integer
+/// \return true if the entered text is valid
+///
+
 bool validateCheckQty(QString st, unsigned int &qty) {
     int i = 0;
     for (i = 0; i < st.length() ; i++) {
@@ -238,9 +278,13 @@ bool validateCheckQty(QString st, unsigned int &qty) {
     return true;
 }
 
+///
+/// \brief wordForNumber: Given a number n in [0,999] returns the word equivalent
+/// \param n: the number
+/// \return a Qstring containing the number in words
+///
 
-
-QString wordForNumber(unsigned int n) {
+QString wordForNumber(int n) {
     QString st;
 
     int tens = n % 100;
@@ -261,8 +305,13 @@ QString wordForNumber(unsigned int n) {
 }
 
 
+///
+/// \brief checkWAlpha: One of the functions to convert a number in [0,999999999] to words
+/// \param n: the number
+/// \return a Qstring containing the number in words
+///
 
-QString checkWAlpha(unsigned int n) {
+QString checkWAlpha(int n) {
     QString st;
 
     // the cents
@@ -279,8 +328,13 @@ QString checkWAlpha(unsigned int n) {
     return st;
 }
 
+///
+/// \brief checkWBeta: One of the functions to convert a number in [0,999999999] to words
+/// \param n: the number
+/// \return a Qstring containing the number in words
+///
 
-QString checkWBeta(unsigned int n) {
+QString checkWBeta(int n) {
     QString st;
 
     st = wordForNumber(n % 1000);
@@ -292,8 +346,13 @@ QString checkWBeta(unsigned int n) {
     return st;
 }
 
+///
+/// \brief checkWGamma: One of the functions to convert a number in [0,999999999] to words
+/// \param n: the number
+/// \return a Qstring containing the number in words
+///
 
-QString checkWGamma(unsigned int n) {
+QString checkWGamma(int n) {
     QString st;
 
     st = wordForNumber(n % 10);
@@ -305,9 +364,14 @@ QString checkWGamma(unsigned int n) {
     return st;
 }
 
+///
+/// \brief checkWDelta: One of the functions to convert a number in [0,999999999] to words
+/// \param n: the number
+/// \return a Qstring containing the number in words
+///
 
 
-QString checkWDelta(unsigned int n) {
+QString checkWDelta(int n) {
     QString st;
 
     n /= 10;
@@ -342,6 +406,7 @@ bool validZuluTime(const QString &time, const QString &zone, int &hours, int &mi
     return true;
 }
 
+//This is the correct one
 
 QString zuluAlpha(int hours, int minutes, char zone) {
     int diff = 0;
@@ -399,3 +464,161 @@ QString zuluDelta(int hours, int minutes, char zone) {
 
     return QString::number(hours)  + QString::number(minutes);
 }
+
+
+
+// =========================================================
+// APFT Functions
+// =========================================================
+
+
+//This it the correct one
+
+void MainWindow::APFTAlpha(){
+    //For each one of these variables we apply the formula that they use
+    //to set the points
+    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
+
+    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
+
+    double running_time = qFloor((line[2]->text().left(2).append('.' + line[2]->text().right(2))).toDouble());
+    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
+
+    //Since the maximum of points that one can obtain
+    //on each excercise type is 100, we restrict it
+    if (sit_ups > 100){
+        sit_ups = 100;
+    }
+    else if (sit_ups < 0){
+        sit_ups = 0;
+    }
+    if (push_ups > 100){
+        push_ups = 100;
+    }
+    else if (push_ups < 0){
+        push_ups = 0;
+    }
+    if (two_mile_run > 100){
+        two_mile_run = 100;
+    }
+    else if (two_mile_run < 0){
+        two_mile_run = 0;
+    }
+
+    //Finally we set the outputs.
+    line[3]->setText(QString::number(sit_ups));
+    line[4]->setText(QString::number(push_ups));
+    line[5]->setText(QString::number(two_mile_run));
+    line[6]->setText(QString::number(push_ups + sit_ups + two_mile_run));
+    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
+        label[7]->setText("PASS");
+    }
+    else{
+        label[7]->setText("FAIL");
+    }
+}
+
+//This one do not check if the number is greater than 100
+
+void MainWindow::APFTBeta(){
+    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
+
+    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
+
+    double running_time = qFloor((line[2]->text().left(2).append('.' + line[2]->text().right(2))).toDouble());
+    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
+
+    line[3]->setText(QString::number(sit_ups));
+    line[4]->setText(QString::number(push_ups));
+    line[5]->setText(QString::number(two_mile_run));
+    line[6]->setText(QString::number(push_ups + sit_ups + two_mile_run));
+    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
+        line[7]->setText("PASS");
+    }
+    else{
+        line[7]->setText("FAIL");
+    }
+}
+
+//This one switch the results
+
+void MainWindow::APFTGamma(){
+    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
+    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
+    double running_time = qFloor((line[2]->text().left(2).append('.' + line[2]->text().right(2))).toDouble());
+    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
+
+    if (sit_ups > 100){
+        sit_ups = 100;
+    }
+    else if (sit_ups < 0){
+        sit_ups = 0;
+    }
+    if (push_ups > 100){
+        push_ups = 100;
+    }
+    else if (push_ups < 0){
+        push_ups = 0;
+    }
+    if (two_mile_run > 100){
+        two_mile_run = 100;
+    }
+    else if (two_mile_run < 0){
+        two_mile_run = 0;
+    }
+
+    line[5]->setText(QString::number(sit_ups));
+    line[3]->setText(QString::number(push_ups));
+    line[4]->setText(QString::number(two_mile_run));
+    line[6]->setText(QString::number(push_ups + sit_ups + two_mile_run));
+    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
+        line[7]->setText("PASS");
+    }
+    else{
+        line[7]->setText("FAIL");
+    }
+}
+
+//This one do not sums the points but the quantities of each excercise
+
+void MainWindow::APFTDelta(){
+    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
+    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
+    double running_time = qFloor((line[2]->text().left(2).append('.'
+                                   + line[2]->text().right(2))).toDouble());
+    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
+
+    if (sit_ups > 100){
+        sit_ups = 100;
+    }
+    else if (sit_ups < 0){
+        sit_ups = 0;
+    }
+    if (push_ups > 100){
+        push_ups = 100;
+    }
+    else if (push_ups < 0){
+        push_ups = 0;
+    }
+    if (two_mile_run > 100){
+        two_mile_run = 100;
+    }
+    else if (two_mile_run < 0){
+        two_mile_run = 0;
+    }
+
+    int sumaTo = line[0]->text().toInt() + line[1]->text().toInt() + running_time;
+    line[3]->setText(QString::number(sit_ups));
+    line[4]->setText(QString::number(push_ups));
+    line[5]->setText(QString::number(two_mile_run));
+    line[6]->setText(QString::number(sumaTo));
+    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
+        line[7]->setText("PASS");
+    }
+    else{
+        line[7]->setText("FAIL");
+    }
+}
+
+
+

functions.h

@@ -4,316 +4,28 @@
 #include <string>
 using namespace std;
 
-
-/// \fn validateSorts
-/// \~English
-/// \brief Function to validate that sort is invoked with non-empty strings
-/// \param a first QSring
-/// \param b second Qstring
-/// \param c third QString
-/// \return true if non of the QStrings are empty
-/// \~Spanish
-/// \brief Valida que los QStrings que se van a ordenar no estén vacios.
-/// \param a primer QSring
-/// \param b segundo Qstring
-/// \param c tercer QString
-/// \return true si ninguno de los QString está vacio
 bool validateSorts(const QString &a, const QString &b, const QString &c);
-
-/// \fn mySortAlpha
-/// \~English
-/// \brief A function to sort the QStrings. Returns the order 
-/// strings through the parameters (a is smallest, c is largest).
-/// \param a reference to first QSring
-/// \param b reference to second Qstring
-/// \param c reference to third QString
-/// \~Spanish
-/// \brief Función para ordenar QStrings. Devuelve los QStrings
-/// ordenados a través de los parámetros (a para el menor, c para el mayor).
-/// \param a referencia al primer QSring
-/// \param b referencia al segundo Qstring
-/// \param c referencia al tercer QString
 void mySortAlpha(QString &a, QString &b, QString &c);
-
-/// \fn mySortBeta
-/// \~English
-/// \brief A function to sort the QStrings. Returns the order 
-/// strings through the parameters (a is smallest, c is largest).
-/// \param a reference to first QSring
-/// \param b reference to second Qstring
-/// \param c reference to third QString
-/// \~Spanish
-/// \brief Función para ordenar QStrings. Devuelve los QStrings
-/// ordenados a través de los parámetros (a para el menor, c para el mayor).
-/// \param a referencia al primer QSring
-/// \param b referencia al segundo Qstring
-/// \param c referencia al tercer QString
 void mySortBeta(QString &a, QString &b, QString &c);
-
-/// \fn mySortGamma
-/// \~English
-/// \brief A function to sort the QStrings. Returns the order 
-/// strings through the parameters (a is smallest, c is largest).
-/// \param a reference to first QSring
-/// \param b reference to second Qstring
-/// \param c reference to third QString
-/// \~Spanish
-/// \brief Función para ordenar QStrings. Devuelve los QStrings
-/// ordenados a través de los parámetros (a para el menor, c para el mayor).
-/// \param a referencia al primer QSring
-/// \param b referencia al segundo Qstring
-/// \param c referencia al tercer QString
 void mySortGamma(QString &a, QString &b, QString &c);
-
-/// \fn mySortDelta
-/// \~English
-/// \brief First function to sort the QStrings. Returns the order 
-/// strings through the parameters (a is smallest, c is largest).
-/// \param a reference to first QSring
-/// \param b reference to second Qstring
-/// \param c reference to third QString
-/// \~Spanish
-/// \brief Función para ordenar QStrings. Devuelve los QStrings
-/// ordenados a través de los parámetros (a para el menor, c para el mayor).
-/// \param a referencia al primer QSring
-/// \param b referencia al segundo Qstring
-/// \param c referencia al tercer QString
 void mySortDelta(QString &a, QString &b, QString &c);
 
-
-/// \fn validZuluTime
-/// \~English
-/// \brief Function to validate the arguments that will be passed to the
-///  Zulu functions.  Returns the integer hour and minutes through last two parameters.
-/// \param time QString that contains the time in military format.
-/// \param zone  QString that specifies military zone.
-/// \param hours hours, extracted from the time parameter
-/// \param minutes minutes, extracted from the time parameter
-/// \return true if the time and zone are valid. 
-/// \~Spanish
-/// \brief Función para validar los argumentos que serán pasados a
-/// funciones Zulu.  Devuelve (como enteros) la hora y minutos a través de los 
-/// últimos dos parámetros.
-/// \param time QString que contiene la hora en formato militar, e.g. "15:22"
-/// \param zone  QString que contiene zona militar.
-/// \param hours horas, extraida del argumento pasado a time.
-/// \param minutes minutos, extraidos del argumento pasado a time.
-/// \return true si la hora (time) y la zona son válidas. 
 bool validZuluTime(const QString &time, const QString &zone, int &hours, int &minutes);
-
-
-/// \fn zuluAlpha
-/// \~English
-/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return a QString of the Zulu time, in military time format
-/// \~Spanish
-/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluAlpha(int hours, int minutes, char zone);
-
-
-/// \fn zuluBeta
-/// \~English
-/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return a QString of the Zulu time, in military time format
-/// \~Spanish
-/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluBeta(int hours, int minutes, char zone);
-
-
-/// \fn zuluGamma
-/// \~English
-/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return a QString of the Zulu time, in military time format
-/// \~Spanish
-/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluGamma(int hours, int minutes, char zone);
-
-
-/// \fn zuluDelta
-/// \~English
-/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return a QString of the Zulu time, in military time format
-/// \~Spanish
-/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
-/// \param hours 
-/// \param minutes 
-/// \param zone 
-/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluDelta(int hours, int minutes, char zone);
 
-
-// Constants for the rock, paper, scisor functions.
-const int TIE = 0;
-const int P1_WON = 1;
-const int P2_WON = 2;
-
-
-/// \fn RPSAlpha
-/// \~English
-/// \brief Given play by the first and second players, returns who won the rock, paper
-/// scisors match.
-/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
-/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
-/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
-/// \~Spanish
-/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
-/// papel y tijera ((R)ock, (P)aper, (S)cisors)
-/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
-/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
-/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
 int RPSAlpha(char p1, char p2);
-
-/// \fn RPSBeta
-/// \~English
-/// \brief Given play by the first and second players, returns who won the rock, paper
-/// scisors match.
-/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
-/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
-/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
-/// \~Spanish
-/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
-/// papel y tijera ((R)ock, (P)aper, (S)cisors)
-/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
-/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
-/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
 int RPSBeta(char p1, char p2);
-
-/// \fn RPSGamma
-/// \~English
-/// \brief Given play by the first and second players, returns who won the rock, paper
-/// scisors match.
-/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
-/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
-/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
-/// \~Spanish
-/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
-/// papel y tijera ((R)ock, (P)aper, (S)cisors)
-/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
-/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
-/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
 int RPSGamma(char p1, char p2);
-
-/// \fn RPSDelta
-/// \~English
-/// \brief Given play by the first and second players, returns who won the rock, paper
-/// scisors match.
-/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
-/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
-/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
-/// \~Spanish
-/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
-/// papel y tijera ((R)ock, (P)aper, (S)cisors)
-/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
-/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
-/// \param zone 
-/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
 int RPSDelta(char p1, char p2);
 
-
-/// \fn initCheckWMaps
-/// \~English
-/// \brief Initialize the values in the dictionary (M) that is used throughout
-/// the check functions.
-/// \~Spanish
-/// \brief Inicializa los valores del diccionario que se utiliza a través del 
-/// las funciones 'check' 
 void initCheckWMaps();
-
-
-
-/// \fn validateCheckQty
-/// \~English
-/// \brief Given a QString determines its numerical value and if the 
-/// the value is in the range [0,999999999]
-/// \param st a QString with a numeric value, e.g. "4520"
-/// \param qty unsigned integer to return the numeric value, e.g. 4520
-/// \return true if the QString was converted to an integer and is in the valid range
-/// \~Spanish
-/// \brief Dado un string determina su valor numérico y si el valor está en el 
-/// rango [0,999999999]
-/// \param st un QString con un valor numérico, e.g. "4520"
-/// \param qty entero sin signo para devolver el valor numérico, e.g. 4520
-/// \return true si el QString se pudo convertir a entero y está en el rango
 bool validateCheckQty(QString st, unsigned int &qty);
-
-
-/// \fn wordForNumber
-/// \~English
-/// \brief Given a number n in [0,999] returns the word equivalent
-/// \param n the unsigned integer, e.g. 34
-/// \return a QString containing the number in words, e.g. "thirty four"
-/// \~Spanish
-/// \brief Dado un número entero en el rango [0,999] devuelve su representación en palabras
-/// \param n el entero sin signo, e.g. 34
-/// \return un QString que contiene el valor en palabras, e.g. "thirty four"
-QString wordForNumber(unsigned int n);
-
-/// \fn checkWAlpha
-/// \~English
-/// \brief Given a unsigned integer returns its value as a string of words (in English)
-/// \param n the unsigned integer, e.g. 42
-/// \return QString containing the value (in words), e.g. "fourty two"
-/// \~Spanish
-/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
-/// \param n el entero sin signo, e.g. 42
-/// \return QString que contien el valor en palabras, e.g. "fourty two"
-QString checkWAlpha(unsigned int n);
-
-/// \fn checkWBeta
-/// \~English
-/// \brief Given a unsigned integer returns its value as a string of words (in English)
-/// \param n the unsigned integer, e.g. 42
-/// \return QString containing the value (in words), e.g. "fourty two"
-/// \~Spanish
-/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
-/// \param n el entero sin signo, e.g. 42
-/// \return QString que contien el valor en palabras, e.g. "fourty two"
-QString checkWBeta(unsigned int n);
-
-/// \fn checkWGamma
-/// \~English
-/// \brief Given a unsigned integer returns its value as a string of words (in English)
-/// \param n the unsigned integer, e.g. 42
-/// \return QString containing the value (in words), e.g. "fourty two"
-/// \~Spanish
-/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
-/// \param n el entero sin signo, e.g. 42
-/// \return QString que contien el valor en palabras, e.g. "fourty two"
-QString checkWGamma(unsigned int n);
-
-/// \fn checkWDelta
-/// \~English
-/// \brief Given a unsigned integer returns its value as a string of words (in English)
-/// \param n the unsigned integer, e.g. 42
-/// \return QString containing the value (in words), e.g. "fourty two"
-/// \~Spanish
-/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
-/// \param n el entero sin signo, e.g. 42
-/// \return QString que contien el valor en palabras, e.g. "fourty two"
-QString checkWDelta(unsigned int n);
+QString checkWAlpha(int n);
+QString checkWBeta(int n);
+QString checkWGamma(int n);
+QString checkWDelta(int n);
 
 #endif // FUNCTIONS_H

images.qrc

@@ -6,6 +6,5 @@
         <file>resources/d4.png</file>
         <file>resources/d5.png</file>
         <file>resources/d6.png</file>
-        <file>resources/logo.png</file>
     </qresource>
 </RCC>

main.cpp

@@ -6,17 +6,64 @@
 #include <cassert>
 #include <QDebug>
 
+void testSort() {
+    QString a = "AAA" , b = "BBB" , c = "CCC";
+    mySortBeta(a,b,c);
+    assert( a < b && b < c);
 
+    a = "AAA", b = "CCC", c = "BBB";
+    mySortBeta(a,b,c);
+    assert( a < b && b < c);
+
+    a = "BBB", b = "AAA", c = "CCC";
+    mySortBeta(a,b,c);
+    assert( a < b && b < c);
+
+    a = "BBB", b = "CCC", c = "AAA";
+    mySortBeta(a,b,c);
+    assert( a < b && b < c);
+
+    a = "CCC", b = "AAA", c = "BBB";
+    mySortBeta(a,b,c);
+    //qDebug() << a << b << c;
+    assert( a < b && b < c);
+
+    a = "CCC", b = "BBB", c = "AAA";
+    mySortBeta(a,b,c);
+    assert( a < b && b < c);
+
+    qDebug() << "Passed Test for Sort!!!!";
+}
+
+void testCheck() {
+
+    assert( checkWAlpha(91) == QString("ninety one"));
+    assert( checkWAlpha(891) == QString("eight hundred ninety one"));
+    assert( checkWAlpha(100) == QString("one hundred"));
+    assert( checkWAlpha(59123) == QString("fifty nine thousand one hundred twenty three"));
+    assert( checkWAlpha(100001) == QString("one hundred thousand one"));
+    assert( checkWAlpha(100000) == QString("one hundred thousand"));
+    assert( checkWAlpha(100000000) == QString("one hundred million"));
+    qDebug() << "Passed Test for Check Word!!!!";
+}
 
 int main(int argc, char *argv[])
 {
+//    testSort();
+    initCheckWMaps(); /*** DONT FORGET ***/
+
+//    testCheck();
+//    qDebug() << checkWAlpha(91);
+//    qDebug() << checkWAlpha(891);
+//    qDebug() << checkWAlpha(801);
 
-    initCheckWMaps(); 
 
     srand(time(NULL));
     QApplication a(argc, argv);
     MainWindow w;
     w.show();
 
+
+
     return a.exec();
 }

mainwindow.cpp

@@ -6,7 +6,6 @@
 #include "secondwindow.cpp"
 
 #include <QDebug>
-#include <QTimer>
 #include <QtCore/qmath.h>
 #include <QMessageBox>
 #include "functions.h"
@@ -42,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     // We need to know whenever the second window is closed to show the
     // main window, or to hide when the second one is showed
-    connect(window, SIGNAL(closeIt(bool)), this, SLOT(showMW(bool)));
+    connect(window, SIGNAL(cerrado(bool)), this, SLOT(mostrar(bool)));
 
     if(!dice1.load(":/images/resources/d1.png") || !dice2.load(":/images/resources/d1.png")){
         qDebug() << "Error1 Loading image";
@@ -56,8 +55,9 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-void MainWindow::showMW(bool doShow){
-    if (doShow){
+//This function show the main window and delete all the items created on the closed one or hide the mainwindow
+void MainWindow::mostrar(bool si){
+    if (si==true){
         show();
 
         // Deleting pointers and point them to NULL
@@ -79,13 +79,14 @@ void MainWindow::showMW(bool doShow){
 
         // Create the new window and connecting it again with the signal
         window = new secondwindow;
-        connect(window, SIGNAL(closeIt(bool)), this, SLOT(showMW(bool)));
+        connect(window, SIGNAL(cerrado(bool)), this, SLOT(mostrar(bool)));
     }
     else hide();
 }
 
-
-void MainWindow::setOption(QString str){
+//It is a slot that reads what item of the combo box was selected and save it
+//into a member
+void MainWindow::whatOption(QString str){
     option = str;
 }
 
@@ -99,8 +100,212 @@ void MainWindow::clearLines(){
     score1 = score2 = 0;
 }
 
+//It forces the input 1 to be valid
+void MainWindow::RPSnormalizer1(QString str){
+    //For every character in the string only allow
+    //the character 'R' for rock, 'P' for paper and
+    //'S' for scissors. Delete all the other characters
+    //different from this three, and if is 'r', 'p' or 's'
+    //make it uppercase.
+    for (int i = 0; i< str.size(); i++){
+        if      (str[i] == 'r'){
+            str[i] = 'R';
+        }
+        else if (str[i] == 'p'){
+            str[i] = 'P';
+        }
+        else if (str[i] == 's'){
+            str[i] = 'S';
+        }
+
+        else if (str[i] == 'R' || str[i] == 'P' ||
+                 str[i] == 'S');//then its ok, do nothing
+        else{
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    line[0]->setText(str);
+}
+
+//It forces the input 2 to be valid
+void MainWindow::RPSnormalizer2(QString str){
+    for (int i = 0; i< str.size(); i++){
+        if      (str[i] == 'r'){
+            str[i] = 'R';
+        }
+        else if (str[i] == 'p'){
+            str[i] = 'P';
+        }
+        else if (str[i] == 's'){
+            str[i] = 'S';
+        }
+        else if (str[i] == 'R' || str[i] == 'P' ||
+                 str[i] == 'S');//then its ok, do nothing
+        else{
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    line[1]->setText(str);
+}
+
+//It forces the input 3 to be valid
+void MainWindow::RPSnormalizer3(QString str){
+    //Verify that the string do not contains other thing than
+    //numbers
+    for (int i = 0; i< str.size(); i++){
+        if (!str[i].isDigit()){
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    //Left zeros do not count, delete them
+    while (str[0] == '0'){
+        str = str.mid(1);
+    }
+
+    //If the player exagerates the number of games to win
+    //change the string to the maximum number allowed
+    if (str.toInt() > 150){
+        str = "150";
+    }
+
+    line[2]->setText(str);
+}
+
+//It forces the input to be valid
+void MainWindow::CheckWnormalizer(QString str){
+    //Just allow numbers
+    for (int i = 0; i< str.size(); i++){
+        if (!str[i].isDigit()){
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    //Zeros on the left side do not count (delete them)
+    while (str[0] == '0'){
+        str = str.mid(1);
+    }
+
+    //The maximum is 999,999,999
+    if (str.toDouble() > 999999999){
+        str = "999999999";
+    }
+
+    line[0]->setText(str);
+}
+
+
+
+//It forces the first input of Zulu to be valid
+void MainWindow::Zulunormalizer1(QString str){
+    //Just allow numbers to be written
+    for (int i = 0; i< str.size(); i++){
+        if (!str[i].isDigit()){
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    //The maximum here is 2359, so force it to be the
+    //maximum when the user write a larger number
+    if (str.toInt() > 2359){
+        str = "2359";
+    }
+
+    line[0]->setText(str);
+}
+
+//It forces the second input of Zulu to be valid
+void MainWindow::Zulunormalizer2(QString str){
+    //Just allow one character to be written
+    if (str.size() > 1){
+        str = str[1];
+    }
+
+    //If that only character is 'e', 'c', 'm' or 'p'
+    //the uppercase it
+    if (str[0] == 'e' || str[0] == 'c' ||
+            str[0] == 'm' || str[0] == 'p'){
+        str = str[0].toUpper();
+    }
+    //If we get here is because the character is not
+    //the lowercase letters allowed... so if they are
+    //not the uppercase letters that we admit we have
+    //to delete it.
+    else if (str[0] != 'E' || str[0] != 'C' ||
+             str[0] != 'M' || str[0] != 'P'){
+        str = "";
+    }
+
+    line[1]->setText(str);
+}
+
+//It forces the first input of APFT to be valid
+void MainWindow::APFTnormalizer1(QString str){
+    //Just admit numbers, delete the other type of
+    //characters
+    for (int i = 0; i< str.size(); i++){
+        if (!str[i].isDigit()){
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    //Left zeros are not valid
+    while (str[0] == '0'){
+        str = str.mid(1);
+    }
+
+    line[0]->setText(str);
+}
+
+//It forces the second input of APFT to be valid
+void MainWindow::APFTnormalizer2(QString str){
+    //Just allow the numbers to be written
+    for (int i = 0; i< str.size(); i++){
+        if (!str[i].isDigit()){
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    //Left-hand zeros? Delete them
+    while (str[0] == '0'){
+        str = str.mid(1);
+    }
+
+    line[1]->setText(str);
+}
+
+//It forces the third input of APFT to be valid
+void MainWindow::APFTnormalizer3(QString str){
+    //Allow just numbers on the string only if the
+    //character is not in the position 2
+    for (int i = 0; i< str.size(); i++){
+        if (!str[i].isDigit() && i != 2){
+            str = str.mid(0,i).append(str.mid(i+1));
+        }
+    }
+
+    //Then if there is a character in the position 2
+    //and it is not ':', then add it between the
+    //position 1 and 3
+    if (str.size() > 2 && str[2] != ':'){
+        while (str.size()>2 && !str[2].isDigit()){
+            str = str.mid(0,2).append(str.mid(3));
+        }
+        str = str.mid(0, 2).append(':').append(str.mid(2));
+    }
+    //If the size exceeds 5, then take the first five
+    //so then we will have the format mm:ss
+    if (str.size() > 5){
+        str = str.mid(0, 5);
+    }
 
-void MainWindow::callOneOfTheSorts(){
+    line[2]->setText(str);
+}
+
+//Checks which version of sort is selected and call it
+void MainWindow::sorts(){
     QString a = line[0]->text();
     QString b = line[1]->text();
     QString c = line[2]->text();
@@ -129,7 +334,10 @@ void MainWindow::callOneOfTheSorts(){
 }
 
 
-void MainWindow::callOneOfTheRPS(){
+
+
+//Checks which version of RPS is selected and call it
+void MainWindow::RPSs(){
 
     QString p1 = this->cmbPlayer01->currentText();
     QString p2 = this->cmbPlayer02->currentText();
@@ -152,6 +360,7 @@ void MainWindow::callOneOfTheRPS(){
 
     QString st;
 
+    qDebug() << winnerNum;
 
     switch(winnerNum) {
         case 1:  st = "Player 1"; break;
@@ -162,11 +371,14 @@ void MainWindow::callOneOfTheRPS(){
 
     line[0]->setText(st);
 
+
+
 }
 
+#include <QTimer>
 
 void MainWindow::paintDice() {
-    this->timerCounter++;
+    qDebug() << this->timerCounter++;
     int a, b;
     a = rand()%6;
     b = rand()%6;
@@ -187,12 +399,16 @@ void MainWindow::paintDice() {
     }
 }
 
+//Checks which version of dice is selected and call it
+void MainWindow::dices(){
+    // [rafa] Voy a hacer la animación aqui
+
 
-void MainWindow::callOneOfTheDices(){
 
     for (int i = 1; i <= 6; i++)
         this->diceImages.push_back(QImage(":/images/resources/d" + QString::number(i) + ".png"));
 
+
     aTimer = new QTimer;
     aTimer->setInterval(100);
     aTimer->setSingleShot(false);
@@ -204,38 +420,8 @@ void MainWindow::callOneOfTheDices(){
 }
 
 
-
-
-//========================================================
-// Functions for the dice roller
-//========================================================
-
-
-void MainWindow::diceAlpha(){
-    int total = diceFinal01 + diceFinal02 + 2;
-    line[0]->setText(QString::number(total));
-}
-
-
-void MainWindow::diceBeta(){
-    int total = diceFinal01 + diceFinal01 + 2;
-    line[0]->setText(QString::number(total));
-}
-
-
-void MainWindow::diceGamma(){
-    int total = diceFinal01 - diceFinal02;
-    line[0]->setText(QString::number(total));
-}
-
-
-void MainWindow::diceDelta(){
-    int total = diceFinal01 + diceFinal02;
-    line[0]->setText(QString::number(total));
-}
-
-
-void MainWindow::callOneOfTheChecks(){
+//Checks which version of check-writer is selected and call it
+void MainWindow::checkWs(){
     unsigned int qty;
     if (!validateCheckQty(line[0]->text(),qty)) {
         QMessageBox::warning(this, "Alert",
@@ -252,7 +438,8 @@ void MainWindow::callOneOfTheChecks(){
         line[1]->setText( checkWDelta(qty) );
 }
 
-void MainWindow::callOneOfTheZulus(){
+//Checks which version of zulu is selected and call it
+void MainWindow::zulus(){
     QString zuluTime = line[0]->text();
     QString zuluZone = line[1]->text();
     int hours, minutes;
@@ -260,7 +447,7 @@ void MainWindow::callOneOfTheZulus(){
     if (!validZuluTime(zuluTime, zuluZone, hours, minutes) ) {
 
         QMessageBox::warning(this, "Alert",
-                             "Either Zulu Time or Zone is not valid.");
+                             "Either Zulu Time or Zone is not valid");
         line[2]->setText("Error");
         return;
     }
@@ -275,7 +462,23 @@ void MainWindow::callOneOfTheZulus(){
 
 }
 
+//Checks which version of APFT is selected and call it
+void MainWindow::APFTs(){
+    if (option == "Version Alpha"){
+        APFTAlpha();
+    }
+    else if (option == "Version Beta"){
+        APFTBeta();
+    }
+    else if (option == "Version Gamma"){
+        APFTGamma();
+    }
+    else{
+        APFTDelta();
+    }
+}
 
+//Here is what happend when Sort-button is clicked
 void MainWindow::on_SortsButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -322,18 +525,19 @@ void MainWindow::on_SortsButton_clicked()
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(callOneOfTheSorts()));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
+    connect(button[0], SIGNAL(clicked()), this, SLOT(sorts()));
     connect(button[1], SIGNAL(clicked()), this, SLOT(clearLines()));
 
     //Now that we have set our new window, we hide the main-window
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    showMW(false);
+    mostrar(false);
     window->show();
 }
 
+//Here is what happend when Dice-button is clicked
 void MainWindow::on_DiceButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -377,17 +581,18 @@ void MainWindow::on_DiceButton_clicked()
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(callOneOfTheDices()));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
+    connect(button[0], SIGNAL(clicked()), this, SLOT(dices()));
 
     //Now that we have set our new window, we hide the main-window
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    showMW(false);
+    mostrar(false);
     window->show();
 }
 
+//Here is what happend when RPS-button is clicked
 void MainWindow::on_RPSButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -405,9 +610,17 @@ void MainWindow::on_RPSButton_clicked()
     cmbPlayer01->addItem("scisors");    cmbPlayer02->addItem("scisors");
 
 
+
+
+
     //The buttons needed here are the 'play' and 'clear' buttons
     button[0] = new QPushButton("Play");
+//    button[1] = new QPushButton("Clear");
 
+    //3 inputs and 1 output
+//    for (int i = 0; i<4; i++){
+//        line[i] = new QLineEdit;
+//    }
     line[0] = new QLineEdit;
     //The user is not able to write on the output line
     line[0]->setEnabled(false);
@@ -415,7 +628,13 @@ void MainWindow::on_RPSButton_clicked()
     //Labels to let the user understand the app
     label[0] = new QLabel("Player 1's moves");
     label[1] = new QLabel("Player 2's moves");
+//    label[2] = new QLabel("How many games to win:");
     label[2] = new QLabel("Winner:");
+//    label[4] = new QLabel("Tournament:");
+//    //lines for score
+//    line[4] = new QLineEdit;
+//    line[4]->setEnabled(false);
+
 
     //We create a new layout and insert the comboBox to it
     int row = 0;
@@ -432,18 +651,21 @@ void MainWindow::on_RPSButton_clicked()
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(callOneOfTheRPS()));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
+    connect(button[0], SIGNAL(clicked()), this, SLOT(RPSs()));
 
     //Now that we have set our new window, we hide the main-window
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    showMW(false);
+    mostrar(false);
     window->show();
+//    score1 = score2 = 0;
 }
 
 
+
+//Here is what happend when Zulu-button is clicked
 void MainWindow::on_ZuluButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -487,9 +709,9 @@ void MainWindow::on_ZuluButton_clicked()
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
     connect(button[0], SIGNAL(clicked()), this, SLOT(clearLines()));
-    connect(button[1], SIGNAL(clicked()), this, SLOT(callOneOfTheZulus()));
+    connect(button[1], SIGNAL(clicked()), this, SLOT(zulus()));
 
     // Rafa 2014-09-16 - Validation will be done when button is clicked
     //    connect(line[0], SIGNAL(textEdited(QString)), this, SLOT(Zulunormalizer1(QString)));
@@ -499,7 +721,6 @@ void MainWindow::on_ZuluButton_clicked()
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    showMW(false);
     window->show();
 }
 

mainwindow.h

@@ -28,183 +28,76 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-
-    /// \fn diceAlpha
-    /// \~English
-    /// \brief Computes the dice total based on the values of the dice.
-    /// \~Spanish
-    /// \brief Computa el total de puntos usando los valores de los dados.
     void diceAlpha();
-
-
-    /// \fn diceBeta
-    /// \~English
-    /// \brief Computes the dice total based on the values of the dice.
-    /// \~Spanish
-    /// \brief Computa el total de puntos usando los valores de los dados.
     void diceBeta();
-
-    /// \fn diceGamma
-    /// \~English
-    /// \brief Computes the dice total based on the values of the dice.
-    /// \~Spanish
-    /// \brief Computa el total de puntos usando los valores de los dados.
     void diceGamma();
-
-    /// \fn diceDelta
-    /// \~English
-    /// \brief Computes the dice total based on the values of the dice.
-    /// \~Spanish
-    /// \brief Computa el total de puntos usando los valores de los dados.
     void diceDelta();
 
+    void APFTAlpha();
+    void APFTBeta();
+    void APFTGamma();
+    void APFTDelta();
 
 private slots:
-
-
-    /// \fn on_SortsButton_clicked
-    /// \~English
-    /// \brief Called when Sort-button is clicked. Creates controls for secondary window,
-    /// displays it, and hides the main window.
-    /// \~Spanish
-    /// \brief Esta función es llamada cuando el usuario cliquea el boton de Sort. 
-    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
-    /// y esconde la ventana principal.
     void on_SortsButton_clicked();
-
-    /// \fn on_DiceButton_clicked
-    /// \~English
-    /// \brief Called when Dice button is clicked. Creates controls for secondary window,
-    /// displays it, and hides the main window.
-    /// \~Spanish
-    /// \brief Esta función es llamada cuando el usuario cliquea el boton de Dice. 
-    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
-    /// y esconde la ventana principal.
     void on_DiceButton_clicked();
-
-    /// \fn on_RPSButton_clicked
-    /// \~English
-    /// \brief Called when RPS button is clicked. Creates controls for secondary window,
-    /// displays it, and hides the main window.
-    /// \~Spanish
-    /// \brief Esta función es llamada cuando el usuario cliquea el boton de RPS. 
-    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
-    /// y esconde la ventana principal.  
     void on_RPSButton_clicked();
+    void on_ZuluButton_clicked();
 
+    void mostrar(bool si);
 
-    /// \fn on_ZuluButton_clicked
-    /// \~English
-    /// \brief Called when Zulu time button is clicked. Creates controls for secondary window,
-    /// displays it, and hides the main window.
-    /// \~Spanish
-    /// \brief Esta función es llamada cuando el usuario cliquea el boton de Zulu time. 
-    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
-    /// y esconde la ventana principal.  
-    void on_ZuluButton_clicked();
+    void whatOption(QString str);
 
-    /// \fn showMW
-    /// \~English
-    /// \brief This function either (1) shows the main window and deletes all the items created on 
-    /// the closed one or (2) hides the mainwindow
-    /// \param doShow if true then show the main window, else hide it. 
-    /// \~Spanish
-    /// \brief Esta función hace una de dos: (1) muestra la ventana principal y borra
-    /// todas los elementos creados en la secundaria, o (2) esconde la ventana principal
-    /// \param doShow si es true muestra la ventana principal, de lo contrario la esconde. 
-    void showMW(bool doShow);
-
-
-    /// \fn setOption
-    /// \~English
-    /// \brief A slot that reads what item of the combo box was selected and saves it
-    /// to a data member.
-    /// \~Spanish
-    /// \brief Un slot que lee la selección del combobox y lo guarda a un data member.
-    void setOption(QString str);
-
-
-    /// \fn clearLines
-    /// \~English
-    /// \brief Clear the text boxes in the GUIs.
-    /// \~Spanish
-    /// \brief Limpia las cajas de texto en los GUIs.
     void clearLines();
 
-    /// \fn callOneOfTheSorts
-    /// \~English
-    /// \brief Reads the version combobox, validates the inputs, and calls the
-    /// alpha, beta, gamma or delta sort function.
-    /// \~Spanish
-    /// \brief Lee el combobox, valida los inputs y llama a la versión
-    /// alpha, beta, gamma o delta de las funciones de sort
-    void callOneOfTheSorts();
-
-
-    /// \fn callOneOfTheRPS
-    /// \~English
-    /// \brief Reads the version combobox, validates the inputs, and calls the
-    /// alpha, beta, gamma or delta RPS function.
-    /// \~Spanish
-    /// \brief Lee el combobox, valida los inputs y llama a la versión
-    /// alpha, beta, gamma o delta de las funciones de RPS (piedra, papel y tijera)
-    void callOneOfTheRPS();
-
-
-    /// \fn callOneOfTheDices
-    /// \~English
-    /// \brief Reads the version combobox, validates the inputs, and calls the
-    /// alpha, beta, gamma or delta dice function.
-    /// \~Spanish
-    /// \brief Lee el combobox, valida los inputs y llama a la versión
-    /// alpha, beta, gamma o delta de las funciones de "dice".
-    void callOneOfTheDices();
-
-
-    /// \fn callOneOfTheChecks
-    /// \~English
-    /// \brief Reads the version combobox, validates the inputs, and calls the
-    /// alpha, beta, gamma or delta check function
-    /// \~Spanish
-    /// \brief Lee el combobox, valida los inputs y llama a la versión
-    /// alpha, beta, gamma o delta de las funciones de cheques.
-    void callOneOfTheChecks();
-
-
-    /// \fn callOneOfTheZulus
-    /// \~English
-    /// \brief Reads the version combobox, validates the inputs, and calls the
-    /// alpha, beta, gamma or delta zulu time function
-    /// \~Spanish
-    /// \brief Lee el combobox, valida los inputs y llama a la versión
-    /// alpha, beta, gamma o delta de las funciones de zulu time.
-    void callOneOfTheZulus();
-
-
-    /// \fn paintDice
-    /// \~English
-    /// \brief This function is called on every timer tick to "animate" the dice.
-    /// \~Spanish
-    /// \brief Función invocada en cada tick del timer para "animar" el dado.
+    void RPSnormalizer1(QString str);
+
+    void RPSnormalizer2(QString str);
+
+    void RPSnormalizer3(QString str);
+
+    void CheckWnormalizer(QString str);
+
+    void Zulunormalizer1(QString str);
+
+    void Zulunormalizer2(QString str);
+
+    void APFTnormalizer1(QString str);
+
+    void APFTnormalizer2(QString str);
+
+    void APFTnormalizer3(QString str);
+
+    void sorts();
+
+    void RPSs();
+
+    void dices();
+
+    void checkWs();
+
+    void zulus();
+
+    void APFTs();
+
     void paintDice();
 
 private:
-    Ui::MainWindow  *ui;
-    secondwindow    *window;
-    QGridLayout     *layout;
-    QPushButton     *button[2];
-    QLineEdit       *line[7];
-    QLabel          *label[7];
-    QComboBox       *method, *cmbPlayer01, *cmbPlayer02;
-    QTimer          *aTimer;
-
+    Ui::MainWindow *ui;
+    secondwindow *window;
+    QGridLayout *layout;
+    QPushButton *button[2];
     int buttonSize;
+    QLineEdit *line[7];
     int lineSize;
+    QLabel *label[7];
     int labelSize;
+    QComboBox *method, *cmbPlayer01, *cmbPlayer02;
     QString option;
     QImage dice1;
     QImage dice2;
     int diceFinal01, diceFinal02;
+    QTimer *aTimer;
     int timerCounter;
     int score1, score2;
 

mainwindow.ui

@@ -127,7 +127,7 @@
        <x>30</x>
        <y>54</y>
        <width>641</width>
-       <height>16</height>
+       <height>4</height>
       </rect>
      </property>
      <property name="styleSheet">
@@ -151,7 +151,9 @@
      </rect>
     </property>
     <property name="styleSheet">
-     <string notr="true">background-image: url(:/images/resources/logo.png);</string>
+     <string notr="true">background-image: url(/home/rgb/Desktop/eip/CaesarCipher/logo.png);
+border: 0px;
+</string>
     </property>
     <property name="frameShape">
      <enum>QFrame::StyledPanel</enum>
@@ -159,7 +161,6 @@
     <property name="frameShadow">
      <enum>QFrame::Raised</enum>
     </property>
-    <zorder>label</zorder>
    </widget>
   </widget>
  </widget>

secondwindow.cpp

@@ -7,5 +7,5 @@ secondwindow::secondwindow(QWidget *parent) :
 }
 
 void secondwindow::closeEvent(QCloseEvent *){
-    emit closeIt(true);
+    emit cerrado(true);
 }

secondwindow.h

@@ -7,37 +7,12 @@ class secondwindow : public QWidget
 {
     Q_OBJECT
 public:
-
-    /// \fn secondwindow
-    /// \~English
-    /// \brief Constructor.
-    /// \param parent this object's parent
-    /// \~Spanish
-    /// \brief Constructor
-    /// \param parent ventana padre
     explicit secondwindow(QWidget *parent = 0);
 
 signals:
-    /// \fn closeIt
-    /// \~English
-    /// \brief Just a signal that will be emitted when closing 
-	/// objects of this class
-	/// \param dummy this parameter is just for making this signal compatible with 
-    /// type of slot it will be connected.
-    /// \~Spanish
-    /// \brief Señal que será emitida al cerrar objetos de esta clase
-	/// \param dummy este parameterro existe para que la señal sea compatible con el
-	/// slot al que será conectada.
-    void closeIt(bool dummy);
+    void cerrado(bool si);
 
 protected:
-
-    /// \fn closeEvent
-    /// \~English
-    /// \brief Overloaded function that is called when an object of this class is closed.
-    /// \~Spanish
-    /// \brief Función sobrecargada que es invocada cuando se cierra un objeto de 
-    /// esta clase.  
     virtual void closeEvent(QCloseEvent *);
 
 public slots: