README-en.md edited on August 1, 2016

README-en.md

@@ -1,14 +1,14 @@
-#Recursion - Image Scrambler
+# Recursion - Image Scrambler
 
 ![main1.png](images/main1-small.png)
 ![main2.png](images/main2-small.png)
 ![main3.png](images/main3-small.png)
 
-[Verano 2016 - Rafa - Ive]
+[Verano 2016 - Coralys]
 
-One commonly used programming technique is *recursion*. With this technique, problems are solved by solving similar problems but for smaller cases. We can construct sets of objects or tasks using *recursive rules* and *initial values*. *Recursive functions* are functions that are self-invoking, using smaller sets or elements each time, until reaching a point where an initial value is used instead of self-invoking. In this laboratory experience you will practice the definition and implementation of recursive functions to scramble an image and make it incomprehensible.
+One commonly used programming technique is *recursion*. With this technique, problems are solved by solving similar problems, but for smaller cases. We can build sets of objects or tasks using *recursive rules* and *initial values*. *Recursive functions* are functions that are self-invoking, using smaller sets or elements each time, until reaching a point where the initial value is used instead of self-invoking. In this laboratory experience, you will practice the definition and implementation of recursive functions to scramble an image and make it incomprehensible.
 
-##Objectives:
+## Objectives:
 
 1. Define and implement recursive functions.
 
@@ -16,7 +16,7 @@ One commonly used programming technique is *recursion*. With this technique, pro
 
 3. Practice the use of decision and repetition structures.
 
-##Pre-Lab:
+## Pre-Lab:
 
 Before arriving at the laboratory you should have:
 
@@ -30,7 +30,7 @@ Before arriving at the laboratory you should have:
 
 ---
 
-##Scrambling images digitally
+## Scrambling images digitally
 
 When scrambling images digitally we reorder the pixels of the image to break the relation between adjacent pixels, making the original image incomprehensible. This technique is used frequently to cypher images and hide data. [1]
 
@@ -42,7 +42,7 @@ When scrambling images digitally we reorder the pixels of the image to break the
 
 ---
 
-There exist many methods that have been proposed to scramble images. In this laboratory experience you will use a simple method that has a natural implementation with recursive functions.
+There are many methods that have been proposed to scramble images. In this laboratory experience, you will use a simple method that has a natural implementation with recursive functions.
 
 ### Scramble it!
 
@@ -52,11 +52,11 @@ The method you will use to scramble the image works by exchanging rectangles of
 
 ![figure2.png](images/figure2.png)
 
-**Figure 2.** Level 1 scramble: (a) is the original image divided in quadrants, (b) is the image after scrambling the first level by exchanging diagonal quadrants.
+**Figure 2.** Level 1 scramble: (a) is the original image divided in quadrants, (b) is the image after scrambling it the first level by exchanging diagonal quadrants.
 
 ---
 
-The next level scramble, *level 2*, first exchanges the left and right halves of the image. Afterwards the *level 1* scramble is applied to each quadrant. Observe that the level 1 scramble is applied to each of the four quadrants of the original image.
+The next level scramble, *level 2*, first exchanges the left and right halves of the image. Afterwards, the *level 1* scramble is applied to each quadrant. Observe that the level 1 scramble is applied to each of the four quadrants of the original image.
 
 ---
 
@@ -81,7 +81,7 @@ If we follow the pattern, a *level 3* scramble starts by exchanging the diagonal
 
 To scramble an image repeat this process for a certain *level N*. What is the pattern? How would a *level 4* scramble start? In how many quadrants will we have divided the original image after completing the scramble?
 
-The algorithm to scramble that was just described is its own inverse. That is, if you apply the same algorithm to the scrambled image you should obtain the original image.
+The algorithm to scramble that was just described, is its own inverse. That is, if you apply the same algorithm to the scrambled image, you should obtain the original image.
 
 
 The following figures illustrate the exchanges that are done by level 1, 2 and 3 scrambles. 
@@ -97,7 +97,7 @@ The following figures illustrate the exchanges that are done by level 1, 2 and 3
 
 ![figure7.png](images/figure7.png)
 
-**Figure 7.** Level 2 scramble: (a) the left and right halves are exhanged, (b) a level 1 scramble is applied to each quadrant.
+**Figure 7.** Level 2 scramble: (a) the left and right halves are exchanged, (b) a level 1 scramble is applied to each quadrant.
 
 
 ---
@@ -134,7 +134,7 @@ The project which you will be working on today contains the `cropSwap` function
 
 Its parameters are:
 * `img`: reference to the image that we wish to modify (an object of the `QImage` class)
-* `x0`, `y0`,`x0`, `y0`: coordinates of the upper left corners of the rectangles.
+* `x0`, `y0`,`x1`, `y1`: coordinates of the upper left corners of the rectangles.
 * `width`, `height`: width and height (in pixels) of the rectangles.
 
 For example, if we wish to exchange the pixels of the upper and lower halves of an image *P* with width 100 and height 150, we invoke the function:
@@ -151,19 +151,20 @@ For example, if we wish to exchange the pixels of the upper and lower halves of
 The project `ImageScrambler` contains the skeleton of an application to scramble and unscramble images. In today’s laboratory experience you will work in the `Filter.cpp` file to complete the application.
 
 
-###Exercise 1: Pseudocode for the scrambling function
+### Exercise 1: Pseudocode for the scrambling function
 
 Write the pseudocode to express the scrambling algorithm described above as a recursive function.
 
 
-###Exercise 2: Recursive function to scramble an image
+### Exercise 2: Recursive function to scramble an image
 
-####Instructions
+**Instructions**
 
 1.	Load the project  `ImageScrambler` into `QtCreator`. There are two ways to do this:
    
-       * Using the virtual machine: Double click the file `ImageScrambler.pro` located in the folder `/home/eip/labs/recursion-imagescrambler` of your virtual machine.
-       * Downloading the project’s folder from `Bitbucket`: Use a terminal and write the command `git clone http:/bitbucket.org/eip-uprrp/recursion-imagescrambler` to download the folder `recursion-imagescrambler` from `Bitbucket`. Double click the file `ImageScrambler.pro` located in the folder that you downloaded to your computer.
+       * Using the virtual machine: Double click the file `ImageScrambler.pro` that can be found in the folder `/home/eip/labs/recursion-imagescrambler` of your virtual machine.
+       
+       * Downloading the project’s folder from `Bitbucket`: Use the terminal found in your virtual machine and write the `git clone http:/bitbucket.org/eip-uprrp/recursion-imagescrambler` command to download the folder `recursion-imagescrambler` from `Bitbucket`. Double click the file `ImageScrambler.pro` located in the folder that you downloaded to your computer.
 
 2. The code that we provide creates the interface in Figure 9.
 
@@ -191,14 +192,14 @@ Write the pseudocode to express the scrambling algorithm described above as a re
 
 1. Use “Deliverable 1” in Moodle to upload the file with the pseudocode for the recursive function.
 
-2. Use "Deliverable 2" in Moodle to upload the `Filter.cpp` file that contains the functions you implemented in this laboratory experience. Remember to use good programming techniques, include the names of the programmers involved, and to document your program.
+2. Use "Deliverable 2" in Moodle to upload the `Filter.cpp` file that contains the functions you implemented in this laboratory experience. Remember to use good programming techniques, by including the names of the programmers involved, and documenting your program.
 
 
 ---
 
 ---
 
-##References
+## References
 
 [1]  F. Maleki et al., ‘‘An Image Encryption System by
 Cellular Automata with Memory,’’ Proc. 3rd Int’l