README-en.md edited on August 1, 2016

README-en.md

@@ -4,36 +4,37 @@
 ![main2.png](images/main2.png)
 ![main4.png](images/main4.png)
 
+[verano2016 - Coralys]
 
-Arithmetic expressions are an essential part of almost any algorithm that solves a useful problem. Therefore, a basic skill in any computer programming language is to implement arithmetic expressions correctly. In this laboratory experience you will practice the implementation of arithmetic expressions in C++ by writing equations for the quadratic formula and complete the code for a game in which a frog jumps from leaf to leaf.
+Arithmetic expressions are an essential part of almost any algorithm that solves a useful problem. Therefore, a basic skill in any computer programming language is to implement arithmetic expressions correctly. In this laboratory experience you will practice the implementation of arithmetic expressions in C++ by writing equations for the quadratic formula and completing the code for a game in which a frog jumps from leaf to leaf.
 
-##Objectives:
+## Objectives:
 
-1. To implement arithmetic expressions in C++ to produce graphs. 
-2. To use constants adequately. 
+1. To implement arithmetic expressions in C++ to produce the graphs that will define the trajectory of the frog's jump in the game. 
+2. To use constant variables adequately. 
 3. To define variables using adequate data types.
 4. To cast a data value to another type when necessary.
 
 
-##Pre-Lab:
+## Pre-Lab:
 
 Before you get to the laboratory you should have:
 
 1. Reviewed the following concepts:
 
-    a. implementing arithmetic expressions in C++.
+    a. Implementing arithmetic expressions in C++.
 
-    b. native data types in C++ (int, float, double)
+    b. Basic data types in C++ (int, float, double)
 
-    c. using  "type casting" to cast the value of variables to other data types within expressions.
+    c. Using "type casting" to cast the value of variables to other data types within expressions.
 
-    d. using arithmetic functions and constants from the `cmath` library.
+    d. Using arithmetic functions and constants from the `cmath` library.
 
-    e. quadratic equations and their graphs.
+    e. Quadratic equations and their graphs.
 
 2. Studied the concepts and instructions for the laboratory session.
 
-3. Taken the Pre-Lab quiz that can be found in Moodle.
+3. Taken the Pre-Lab quiz available in Moodle.
 
 
 
@@ -42,36 +43,33 @@ Before you get to the laboratory you should have:
 ---
 
 
-##Quadratic Formula
+## Quadratic Formula
 
-A *quadratic equation* has a form 
+A *quadratic equation* has the form 
 
 
 $$y = a x^2+ b x + c,$$
 
-where $$a, b, c$$ are real numbers and $$a\not=0$$. The graph of a quadratic equation is a *parabola* that opens up if $$a > 0$$ and opens dawn if $$a < 0$$.
+where $$a, b, c$$ are real numbers and $$a\not=0$$. The graph of a quadratic equation is a *parabola* that opens up if $$a > 0$$ and opens down if $$a < 0$$.
 
 A graph intersects the $$x$$-axis when $$ y = 0 $$ . Therefore, if a parabola intersects the $$x$$-axis, the intersects are given by the real solutions to the equation
 
-
-
 $$0 = a x^2 + b x + c.$$
 
-The solutions to the previous equation can be obtained using the *quadratic formula*:
 
 
+The solutions to the previous equation can be obtained using the *quadratic formula*:
 
 $$x=\frac{-b±\sqrt{b^2-4ac}}{2a}.$$
 
-Note that if the *discriminant*   $$b^2-4ac$$ of the quadratic formula is negative, the values of $$x$$ are complex numbers and are not plotted in the Cartesian plane. Therefore, if the discriminant is negative, the parabola does not intersect the $$x$$-axis. If the discriminant is equal to $$0$$, then the parabola intersects the $$x$$-axis in only one point (only the vertex touches the $$x$$-axis).
+Note that if the *discriminant*  $$b^2-4ac$$ of the quadratic formula is negative, the values of $$x$$ are complex numbers and are not plotted in the Cartesian plane. Therefore, if the discriminant is negative, the parabola does not intersect the $$x$$-axis. If the discriminant is equal to $$0$$, then the parabola intersects the $$x$$-axis in only one point (only the vertex touches the $$x$$-axis).
 
 If the discriminant is positive, the quadratic formula gives two solutions to the equation $$0 = a x^2 + b x + c$$ and these solutions are the intersects in the $$x$$-axis. For example, suppose that the quadratic formula gives two values
 
-
-
 $$ x = x_1 $$
 $$ x = x_2 $$
 
+
 Then, 
 
 $$a x^2 + b x + c = a(x-x_1)(x-x_2),$$
@@ -89,12 +87,10 @@ where $$x_1$$ and $$x_2$$ are the intersects in the $$x$$-axis. If $$a<0$$, the
 
 Note that the equation
 
-
 $$y=-(x-x_1)(x-x_2)$$
 
 is a quadratic equation and its parabola opens down and intersects the $$x$$-axis in $$x_1$$ and $$x_2$$. For example, the equation
 
-
 $$y=-(x+2)(x-3)=-x^2+x+6$$
 
 is a quadratic equation with a parabola that opens down and intersects the $$x$$-axis at $$x_1=-2$$ and $$x_2=3$$. Note that, in this equation, the values for $$a, b, c$$ are  $$a=-1, \ b=1, \ c=6$$.
@@ -118,9 +114,9 @@ is a quadratic equation with a parabola that opens down and intersects the $$x$$
 ---
 
 
-##Laboratory session:
+## Laboratory session:
 
-###Exercise 1
+### Exercise 1
 
 In this exercise you will implement the quadratic formula to complete a game in which a frog leaps from one leaf to another. You will assume that the leaves are in the $$x$$-axis and that the leap is determined by a parabola that opens down. If you want the frog to leap from leaf to leaf, you must find a quadratic equation with a parabola that opens down and intersects the $$x$$-axis in the places where the leaves are located. Your task is to write the equations for the quadratic formula.
 
@@ -128,11 +124,13 @@ In this exercise you will implement the quadratic formula to complete a game in
 
 **Instructions**
 
-1.   Double click the file `QuadraticFrog.pro` that is contained in the `Documents/eip/Expressions-QuadraticFrog` folder to load the project `QuadraticFrog` into Qt. You can also download the folder `Expressions-QuadraticFrog` from  `http://bitbucket.org/eip-uprrp/expressions-quadraticfrog`.
+1. Load the proyect `QuadraticFrog` into `QtCreator`. There are two ways to do this: 
+    * Using the virtual machine: Double click the file `QuadraticFrog.pro` that can be found in the `home/Documents/eip/Expressions-QuadraticFrog` of your virtual machine.
+    * Downloading the proyect's folder from `Bitbucket`: Use the terminal found in your virtual machine and write the `git clone http://bitbucket.org/eip-uprrp/expressions-quadraticfrog`command to download the folder `QuadraticFrog` from `Bitbucket`. Double click the file `QuadraticFrog.pro`located in the folder that you downloaded to your computer. 
 
 2. Configure the project and run the program by clicking the green arrow in the menu on the left side of the Qt Creator window. The program will display a message saying that the quadratic formula is wrong. This happens because the program has testing instructions that verify that the code implementation is correct. Your program is missing the code for the quadratic formula and this is why the message is displayed.
 
-3. You will write the equations for the quadratic formula in the file In the file  `QuadraticFormula.cpp` (in `Sources`). In the function  `QuadraticPlus` add the equation
+3. You will write the equations for the quadratic formula in the file `QuadraticFormula.cpp` (in `Sources`). In the function  `QuadraticPlus` add the equation
 
     $$result=\frac{-b+\sqrt{b^2-4ac}}{2a},$$
 
@@ -142,7 +140,7 @@ In this exercise you will implement the quadratic formula to complete a game in
 
     The other files of the project have code that will test your equations by evaluating several choices for $$a, b, c$$ and verifying that the equations produce the expected result. Code validation is an important part of software development.
 
-4. Run the program by clicking the green arrow in the menu on the left side of the Qt Creator window. If your equations are implemented correclty, you should obtain a window similar to the one in Figure 2.
+4. Run the program by clicking the green arrow in the menu on the left side of the Qt Creator window. If your equations are implemented correctly, you should obtain a window similar to the one in Figure 2.
 
     ---
 
@@ -152,10 +150,9 @@ In this exercise you will implement the quadratic formula to complete a game in
 
     ---
 
-5. Use "Deliver 1" in Moodle to submit the file  `QuadraticFormula.cpp` containing the code with the functions `QuadraticPlus` and `QuadraticMinus`. Remember to use good programming practices, to include the names of the programmers and to document your program.
-
-6. To play, the frog should leap jump from one leaf to another. Note that the leaves have values for $$x_1$$ and $$x_2$$. These values represent the intersects of the parabola with the $$x$$-axis. You should input the values for the coefficients $$a, b, c$$ of the quadratic equation so that its graph that is a parabola that opens down and intersects the $$x$$-axis in the values $$x_1, x_2$$ shown in the leaves. You can obtain these values noting that
+5. Use "Deliver 1" in Moodle to submit the file `QuadraticFormula.cpp` containing the code with the functions `QuadraticPlus` and `QuadraticMinus`. Remember to use good programming practices, by including the names of the programmers and documenting your program.
 
+6. To play, the frog should leap from one leaf to another. Note that the leaves have values for $$x_1$$ and $$x_2$$. These values represent the intersects of the parabola with the $$x$$-axis. You should input the values for the coefficients $$a, b, c$$ of the quadratic equation so that its graph that is a parabola that opens down and intersects the $$x$$-axis in the values $$x_1, x_2$$ shown in the leaves. You can obtain these values noting that
 
  $$a x^2 + b x + c = a(x-x_1)(x-x_2),$$
 
@@ -164,11 +161,11 @@ In this exercise you will implement the quadratic formula to complete a game in
 
 
 
-###Exercise 2
+### Exercise 2
 
 In this exercise you will write a program to obtain a student's grade point average (GPA).
 
-Suppose that all courses in Cheo's University are 3 credits each and have the following point values: $$A = 4$$ points per credit; $$B = 3$$ points per credit; $$C = 2$$ points per credit; $$D = 1$$ point per credit y $$F = 0$$ points per credit. 
+Suppose that all courses in Yauco's University are 3 credits each and have the following point values: $$A = 4$$ points per credit; $$B = 3$$ points per credit; $$C = 2$$ points per credit; $$D = 1$$ point per credit y $$F = 0$$ points per credit. 
 
 **Instructions**