README-en.md edited online with Bitbucket

README-en.md

@@ -5,7 +5,7 @@
 ![rsz_mariposa.png](images/rsz_mariposa.png)
 
 
-[version 2016.01.29]
+[Verano 2016 - Ive]
 
 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 parametric equations to plot interesting curves.
 
@@ -35,6 +35,8 @@ Before you get to the laboratory you should have:
 
 2. Studied the concepts and instructions for the laboratory session.
 
+3. Taken the Pre-Lab quiz, available in Moodle.
+
 ---
 
 ---
@@ -88,22 +90,17 @@ To plot a curve that is described by parametric equations, we compute the $$x$$
 ---
 
 
-!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-01.html"
+!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-01.html"
 <br>
 
-!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-02.html"
-<br>
-!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-03.html"
-<br>
-!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-04.html"
-<br>
-!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-05.html"
+!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-02.html"
 <br>
-!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-06.html"
+!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-03.html"
 <br>
-!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-07.html"
+!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-04.html"
 <br>
-
+
+
 
 ---
 
@@ -212,6 +209,16 @@ Suppose that all courses in Cheo's University are $$3$$ credits each and have th
 
 	b. Remember that, in C++, when both operands in the division are integers, the result will also be an integer; the remainder will be discarded. Use "type casting": `static_cast<type>(expression)` to solve this problem.
 
+	!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-05.html"
+	
+	---
+	
+	<br>
+	!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-06.html"
+	<br>
+	!INCLUDE "../../eip-diagnostic/pretty-plots/en/diag-pretty-plots-07.html"
+	
+	<br>
 3. Verify your program by computing the GPA of a student that has two A's and 2 B's; what is the average of this student? When your program is correct, save the `main.cpp` file and submit it using "Deliverable 2" in Moodle. Remember to follow the instructions regarding the names and types of the variables,  to include the names of the programmers, to document your program and to use good programming practices.