Améliorations exos structures

c9c61f48 · Adeline Pierrot · 2f075136 · c9c61f48 · c9c61f48 · c9c61f48
Commit c9c61f48 authored 7 years ago by Adeline Pierrot
--- a/test~coding~readingCppPrograms.fr/data/struct_bof_fonction_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_bof_fonction_1.cpp
+#include<iostream>
+#include<math.h>
+#define M_PIl          3.141592653589793238462643383279502884L /* pi */
+#include <iomanip>
+#include <stdio.h>
+using namespace std;
+
+
+struct cordonnee_polaire{
+    float R, Teta;
+};
+
+struct cordonnee_cartesienne{
+    float x, y;
+};
+
+
+cordonnee_cartesienne transforme(cordonnee_polaire a) {
+    cordonnee_cartesienne c;
+    c.x=a.R*cos(a.Teta);
+    c.y=a.R*sin(a.Teta);
+    return (c);
+}
+
+
+
+int main() {
+    cordonnee_polaire c1;
+    cordonnee_cartesienne c2;
+    c1.R = 1;
+    c1.Teta = 0*M_PIl/180; // transformer les degrés en radians
+    c2= transforme(c1);
+    if((c2.x)> (c2.y)){
+    cout<<"x="<<setprecision(2)<<(c2.x)<<endl;
+    }
+    else{
+    cout<<"y="<<setprecision(2)<<(c2.y)<<endl;
+    }
+    return 0;
+}
--- a/test~coding~readingCppPrograms.fr/data/struct_bof_fonction_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_bof_fonction_2.cpp
+#include<iostream>
+#include<math.h>
+#define M_PIl          3.141592653589793238462643383279502884L /* pi */
+#include <iomanip>
+#include <stdio.h>
+using namespace std;
+
+
+struct cordonnee_polaire{
+    float R, Teta;
+};
+
+struct cordonnee_cartesienne{
+    float x, y;
+};
+
+
+cordonnee_cartesienne transforme(cordonnee_polaire a) {
+    cordonnee_cartesienne c;
+    c.x=a.R*cos(a.Teta);
+    c.y=a.R*sin(a.Teta);
+    return (c);
+}
+
+
+
+int main() {
+    cordonnee_polaire c1;
+    cordonnee_cartesienne c2;
+    c1.R = 1;
+    c1.Teta = 30*M_PIl/180; // transformer les degrés en radians
+    c2= transforme(c1);
+    if((c2.x)> (c2.y)){
+    cout<<"x="<<setprecision(2)<<(c2.x)<<endl;
+    }
+    else{
+    cout<<"y="<<setprecision(2)<<(c2.y)<<endl;
+    }
+    return 0;
+}
--- a/test~coding~readingCppPrograms.fr/data/struct_bof_fonction_3.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_bof_fonction_3.cpp
+#include<iostream>
+#include<math.h>
+#define M_PIl          3.141592653589793238462643383279502884L /* pi */
+#include <iomanip>
+#include <stdio.h>
+using namespace std;
+
+
+struct cordonnee_polaire{
+    float R, Teta;
+};
+
+struct cordonnee_cartesienne{
+    float x, y;
+};
+
+
+cordonnee_cartesienne transforme(cordonnee_polaire a) {
+    cordonnee_cartesienne c;
+    c.x=a.R*cos(a.Teta);
+    c.y=a.R*sin(a.Teta);
+    return (c);
+}
+
+
+
+int main() {
+    cordonnee_polaire c1;
+    cordonnee_cartesienne c2;
+    c1.R = 1;
+    c1.Teta = 60*M_PIl/180; // transformer les degrés en radians
+    c2= transforme(c1);
+    if((c2.x)> (c2.y)){
+    cout<<"x="<<setprecision(2)<<(c2.x)<<endl;
+    }
+    else{
+    cout<<"y="<<setprecision(2)<<(c2.y)<<endl;
+    }
+    return 0;
+}
--- a/test~coding~readingCppPrograms.fr/data/struct_fonction_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_fonction_1.cpp
-#include<iostream>
-#include<math.h>
-#define M_PIl          3.141592653589793238462643383279502884L /* pi */
-#include <iomanip>
-#include <stdio.h>
-using namespace std;
-
+#include <iostream>
+#include <cmath>

-struct cordonnee_polaire{
-    float R, Teta;
-};
+using namespace std;

-struct cordonnee_cartesienne{
-    float x, y;
+struct Vect {
+    double x;
+    double y;
 };

-
-cordonnee_cartesienne transforme(cordonnee_polaire a) {
-    cordonnee_cartesienne c;
-    c.x=a.R*cos(a.Teta);
-    c.y=a.R*sin(a.Teta);
-    return (c);
+Vect f(Vect v1, Vect v2) {
+    Vect resultat;
+    resultat.x = v1.x + v2.x;
+    resultat.y = v1.y + v2.y;
+    return resultat;
 }

+int main() {
+    Vect a = {-2, -3};
+    Vect b = {-4,  4};
+    Vect c = f(a,b);

+    cout << c.x << " " << c.y << endl;

-int main() {
-    cordonnee_polaire c1;
-    cordonnee_cartesienne c2;
-    c1.R = 1;
-    c1.Teta = 0*M_PIl/180; // transformer les degrés en radians
-    c2= transforme(c1);
-    if((c2.x)> (c2.y)){
-    cout<<"x="<<setprecision(2)<<(c2.x)<<endl;
-    }
-    else{
-    cout<<"y="<<setprecision(2)<<(c2.y)<<endl;
-    }
    return 0;
 }
--- a/test~coding~readingCppPrograms.fr/data/struct_fonction_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_fonction_2.cpp
-#include<iostream>
-#include<math.h>
-#define M_PIl          3.141592653589793238462643383279502884L /* pi */
-#include <iomanip>
-#include <stdio.h>
-using namespace std;
-
+#include <iostream>
+#include <cmath>

-struct cordonnee_polaire{
-    float R, Teta;
-};
+using namespace std;

-struct cordonnee_cartesienne{
-    float x, y;
+struct Vect {
+    double x;
+    double y;
 };

-
-cordonnee_cartesienne transforme(cordonnee_polaire a) {
-    cordonnee_cartesienne c;
-    c.x=a.R*cos(a.Teta);
-    c.y=a.R*sin(a.Teta);
-    return (c);
+Vect f(Vect v1, Vect v2) {
+    Vect resultat;
+    resultat.x = v1.x + v2.x;
+    resultat.y = v1.y + v2.y;
+    return resultat;
 }

+int main() {
+    Vect a = { 5, -3};
+    Vect b = {-8, -5};
+    Vect c = f(a,b);

+    cout << c.x << " " << c.y << endl;

-int main() {
-    cordonnee_polaire c1;
-    cordonnee_cartesienne c2;
-    c1.R = 1;
-    c1.Teta = 30*M_PIl/180; // transformer les degrés en radians
-    c2= transforme(c1);
-    if((c2.x)> (c2.y)){
-    cout<<"x="<<setprecision(2)<<(c2.x)<<endl;
-    }
-    else{
-    cout<<"y="<<setprecision(2)<<(c2.y)<<endl;
-    }
    return 0;
 }
--- a/test~coding~readingCppPrograms.fr/data/struct_fonction_3.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_fonction_3.cpp
-#include<iostream>
-#include<math.h>
-#define M_PIl          3.141592653589793238462643383279502884L /* pi */
-#include <iomanip>
-#include <stdio.h>
-using namespace std;
-
+#include <iostream>
+#include <cmath>

-struct cordonnee_polaire{
-    float R, Teta;
-};
+using namespace std;

-struct cordonnee_cartesienne{
-    float x, y;
+struct Vect {
+    double x;
+    double y;
 };

-
-cordonnee_cartesienne transforme(cordonnee_polaire a) {
-    cordonnee_cartesienne c;
-    c.x=a.R*cos(a.Teta);
-    c.y=a.R*sin(a.Teta);
-    return (c);
+Vect f(Vect v1, Vect v2) {
+    Vect resultat;
+    resultat.x = v1.x + v2.x;
+    resultat.y = v1.y + v2.y;
+    return resultat;
 }

+int main() {
+    Vect a = {-7,  4};
+    Vect b = {-5, -7};
+    Vect c = f(a,b);

+    cout << c.x << " " << c.y << endl;

-int main() {
-    cordonnee_polaire c1;
-    cordonnee_cartesienne c2;
-    c1.R = 1;
-    c1.Teta = 60*M_PIl/180; // transformer les degrés en radians
-    c2= transforme(c1);
-    if((c2.x)> (c2.y)){
-    cout<<"x="<<setprecision(2)<<(c2.x)<<endl;
-    }
-    else{
-    cout<<"y="<<setprecision(2)<<(c2.y)<<endl;
-    }
    return 0;
 }
--- a/test~coding~readingCppPrograms.fr/data/struct_gros_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_gros_1.cpp
@@ -13,7 +13,7 @@ Point2D Myst(List2D liste)
 {
    Point2D candidat=liste.nuage[0];

-    for (unsigned int i = 1; i < 3; i++)
+    for (int i = 1; i < 3; i++)
    {
        if (liste.nuage[i].x > candidat.x)
            candidat = liste.nuage[i];

--- a/test~coding~readingCppPrograms.fr/data/struct_gros_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_gros_2.cpp
@@ -13,7 +13,7 @@ Point2D Myst(List2D liste)
 {
    Point2D candidat=liste.nuage[0];

-    for (unsigned int i = 1; i < 3; i++)
+    for (int i = 1; i < 3; i++)
    {
        if (liste.nuage[i].y < candidat.y)
            candidat = liste.nuage[i];

--- a/test~coding~readingCppPrograms.fr/data/struct_gros_3.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_gros_3.cpp
@@ -13,7 +13,7 @@ Point2D Myst(List2D liste)
 {
    Point2D candidat=liste.nuage[0];

-    for (unsigned int i = 1; i < 3; i++)
+    for (int i = 1; i < 3; i++)
    {
        if (liste.nuage[i].y <= candidat.y)
            candidat = liste.nuage[i];

--- a/test~coding~readingCppPrograms.fr/data/struct_procedure_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_procedure_1.cpp
@@ -15,7 +15,7 @@ void sum(cpx x, cpx y, cpx &z)

 void multiply(cpx x, cpx y, cpx &z)
 {
-	z.real = x.real * y.real - (x.img * y.img); 
+	z.real = x.real * y.real - (x.img * y.img);
 	z.img = x.real * y.img + x.img * y.real;
 }

@@ -26,8 +26,8 @@ int main()
 	cpx z = { 1, -2 };

 	sum(x, y, z);
-	
+
 	multiply(z, y, x);

-	cout << "x = (" << x.real << "," << x.img << ")" << endl;
+	cout << x.real << " " << x.img << endl;
 }
--- a/test~coding~readingCppPrograms.fr/data/struct_procedure_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_procedure_2.cpp
@@ -29,5 +29,5 @@ int main()

 	multiply(z, y, x);

-	cout << "x = (" << x.real << "," << x.img << ")" << endl;
+	cout << x.real << " " << x.img << endl;
 }
--- a/test~coding~readingCppPrograms.fr/data/struct_procedure_3.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_procedure_3.cpp
@@ -29,5 +29,5 @@ int main()

 	multiply(z, y, x);

-	cout << "x = (" << x.real << "," << x.img << ")" << endl;
+	cout << x.real << " " << x.img << endl;
 }
--- a/test~coding~readingCppPrograms.fr/data/struct_tableau_struct_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_tableau_struct_1.cpp
@@ -20,40 +20,40 @@ struct Classe{
 int main(int argc, const char * argv[]) {
    Eleve e1, e2, e3, e4, e5, var;
    Classe l1;
-    
+
    e1.name = "Pauline";
    e1.note_TP = 14;
    e1.note_Partiel = 13;
-    
+
    e2.name = "Richard";
    e2.note_TP = 18;
    e2.note_Partiel = 15;
-    
+
    e3.name = "Albert";
    e3.note_TP = 10;
    e3.note_Partiel = 7;
-    
+
    e4.name = "Pierre";
    e4.note_TP = 17;
    e4.note_Partiel = 5;
-    
+
    e5.name = "Adèle";
    e5.note_TP = 19;
    e5.note_Partiel = 14;

-    
+
    var.note_Globale = 0;
-    
+
    l1.name = "L1";
    l1.tableau_Eleves = {e1, e2, e3, e4, e5};
-    
-    for(unsigned int i; i < l1.tableau_Eleves.size(); i++){
+
+    for(int i=0; i < l1.tableau_Eleves.size(); i++){
        l1.tableau_Eleves[i].note_Globale = (l1.tableau_Eleves[i].note_TP + l1.tableau_Eleves[i].note_Partiel)/2.0;
        if(l1.tableau_Eleves[i].note_Globale > var.note_Globale){
            var = l1.tableau_Eleves[i];
        }
    }
-    
+
    cout<<var.name<<endl;
    return 0;
 }
--- a/test~coding~readingCppPrograms.fr/data/struct_tableau_struct_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_tableau_struct_2.cpp
@@ -17,42 +17,42 @@ struct Classe{



-int main(int argc, const char * argv[]) {
+int main() {
    Eleve e1, e2, e3, e4, e5, var;
    Classe l1;
-    
+
    e1.name = "Valentin";
    e1.note_TP = 15;
    e1.note_Partiel = 7;
-    
+
    e2.name = "Caroline";
    e2.note_TP = 13;
    e2.note_Partiel = 16;
-    
+
    e3.name = "Gabriel";
    e3.note_TP = 8;
    e3.note_Partiel = 11;
-    
+
    e4.name = "Alexandra";
    e4.note_TP = 17;
    e4.note_Partiel = 12;
-    
+
    e5.name = "Maria";
    e5.note_TP = 14;
    e5.note_Partiel = 7;

    var.note_Globale = 0.;
-    
+
    l1.name = "L1";
    l1.tableau_Eleves = {e1, e2, e3, e4, e5};
-    
-    for(unsigned int i; i < l1.tableau_Eleves.size(); i++){
+
+    for(int i=0; i < l1.tableau_Eleves.size(); i++){
        l1.tableau_Eleves[i].note_Globale = (l1.tableau_Eleves[i].note_TP + l1.tableau_Eleves[i].note_Partiel)/2.0;
        if(l1.tableau_Eleves[i].note_Globale > var.note_Globale){
            var = l1.tableau_Eleves[i];
        }
    }
-    
+
    cout<<var.name<<endl;
    return 0;
-}
\ No newline at end of file
+}
--- a/test~coding~readingCppPrograms.fr/data/struct_tableau_struct_3.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_tableau_struct_3.cpp
@@ -17,42 +17,42 @@ struct Classe{



-int main(int argc, const char * argv[]) {
+int main() {
    Eleve e1, e2, e3, e4, e5, var;
    Classe l1;
-    
+
    e1.name = "Julien";
    e1.note_TP = 13;
    e1.note_Partiel = 3;
-    
+
    e2.name = "Jeanne";
    e2.note_TP = 15;
    e2.note_Partiel = 13;
-    
+
    e3.name = "Romain";
    e3.note_TP = 16;
    e3.note_Partiel = 12;
-    
+
    e4.name = "Elise";
    e4.note_TP = 8;
    e4.note_Partiel = 13;
-    
+
    e5.name = "Thomas";
    e5.note_TP = 12;
    e5.note_Partiel = 15;

    var.note_Globale = 0.;
-    
+
    l1.name = "L1";
    l1.tableau_Eleves = {e1, e2, e3, e4, e5};
-    
-    for(unsigned int i; i < l1.tableau_Eleves.size(); i++){
+
+    for(int i=0; i < l1.tableau_Eleves.size(); i++){
        l1.tableau_Eleves[i].note_Globale = (l1.tableau_Eleves[i].note_TP + l1.tableau_Eleves[i].note_Partiel)/2.0;
        if(l1.tableau_Eleves[i].note_Globale > var.note_Globale){
            var = l1.tableau_Eleves[i];
        }
    }
-    
+
    cout<<var.name<<endl;
    return 0;
-}
\ No newline at end of file
+}
--- a/test~coding~readingCppPrograms.fr/data/struct_tableaux_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_tableaux_1.cpp
@@ -12,20 +12,20 @@ struct Mesure {

 int main() {
    Mesure m1, m2, m3, moyennes;
-    
+
    m1.id_mesure = "essai_1";
-    m1.valeurs = {4.3, 8.5, 3.7, 7.6};    
+    m1.valeurs = {4.3, 8.5, 3.7, 7.6};
    m2.id_mesure = "essai_2";
    m2.valeurs = {3.9, 8.4, 3.6, 7.7};
    m3.id_mesure = "essai_3";
    m3.valeurs = {4.1, 8.6, 3.8, 7.5};
-    
+
    moyennes.id_mesure = "valeurs_moyennes";
    moyennes.valeurs = vector<double>(m1.valeurs.size());
-    for (unsigned int i = 0; i < moyennes.valeurs.size(); i++)
+    for (int i = 0; i < moyennes.valeurs.size(); i++)
        moyennes.valeurs[i] = (m1.valeurs[i] + m2.valeurs[i] + m3.valeurs[i])/3.;
-    
+
    cout << moyennes.valeurs[1] << endl;
-    
+
    return 0;
-}
\ No newline at end of file
+}
--- a/test~coding~readingCppPrograms.fr/data/struct_tableaux_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_tableaux_2.cpp
@@ -12,20 +12,20 @@ struct Mesure {

 int main() {
    Mesure m1, m2, m3, moyennes;
-    
+
    m1.id_mesure = "essai_1";
-    m1.valeurs = {4.3, 8.5, 3.7, 7.6};    
+    m1.valeurs = {4.3, 8.5, 3.7, 7.6};
    m2.id_mesure = "essai_2";
    m2.valeurs = {3.9, 8.4, 3.6, 7.7};
    m3.id_mesure = "essai_3";
    m3.valeurs = {4.1, 8.6, 3.8, 7.5};
-    
+
    moyennes.id_mesure = "valeurs_moyennes";
    moyennes.valeurs = vector<double>(m1.valeurs.size());
-    for (unsigned int i = 0; i < moyennes.valeurs.size(); i++)
+    for (int i = 0; i < moyennes.valeurs.size(); i++)
        moyennes.valeurs[i] = (m1.valeurs[i] + m2.valeurs[i] + m3.valeurs[i])/3.;
-    
+
    cout << moyennes.valeurs[2] << endl;
-    
+
    return 0;
-}
\ No newline at end of file
+}
--- a/test~coding~readingCppPrograms.fr/data/struct_tableaux_3.cpp
+++ b/test~coding~readingCppPrograms.fr/data/struct_tableaux_3.cpp
@@ -12,20 +12,20 @@ struct Mesure {

 int main() {
    Mesure m1, m2, m3, moyennes;
-    
+
    m1.id_mesure = "essai_1";
-    m1.valeurs = {4.3, 8.5, 3.7, 7.6};    
+    m1.valeurs = {4.3, 8.5, 3.7, 7.6};
    m2.id_mesure = "essai_2";
    m2.valeurs = {3.9, 8.4, 3.6, 7.7};
    m3.id_mesure = "essai_3";
    m3.valeurs = {4.1, 8.6, 3.8, 7.5};
-    
+
    moyennes.id_mesure = "valeurs_moyennes";
    moyennes.valeurs = vector<double>(m1.valeurs.size());
-    for (unsigned int i = 0; i < moyennes.valeurs.size(); i++) 
+    for (int i = 0; i < moyennes.valeurs.size(); i++)
        moyennes.valeurs[i] = (m1.valeurs[i] + m2.valeurs[i] + m3.valeurs[i])/3.;
-     
+
    cout << moyennes.valeurs[3] << endl;
-    
+
    return 0;
-}
\ No newline at end of file
+}