diff --git a/DEV1.1/TP11/progression.c b/DEV1.1/TP11/progression.c deleted file mode 100644 index 311a993..0000000 --- a/DEV1.1/TP11/progression.c +++ /dev/null @@ -1,37 +0,0 @@ -#include -#include -#include - -int main(void) { - int tour,tour2,val; - int t1[2][5]; - int t2[3][5]; - int t3[5][5]; - for (tour=0;tour<2;tour++){ - for (tour2=1;tour2<6;tour2++) - t1[tour][tour2]=tour; - } - for (tour=0;tour<3;tour++){ - for (tour2=1;tour2<6;tour2++) - val=tour+tour2; - t2[tour][tour2]=val; - } - for (tour=0;tour<5;tour++){ - for (tour2=1;tour2<6;tour2++) - val=tour+tour2; - t3[tour][tour2]=val; - } - printf("+"); - for (tour=0;tour<10;tour++) - printf("-----+"); - printf("\n"); - printf("|"); - for (tour=0;tour<10;tour++) - printf("%4d |",tab_val[tour]); - printf("\n"); - printf("+"); - for (tour=0;tour<10;tour++) - printf("-----+"); - printf("\n"); - return EXIT_SUCCESS; -} \ No newline at end of file diff --git a/DEV1.1/TP12/progression b/DEV1.1/TP12/progression new file mode 100755 index 0000000..addba28 Binary files /dev/null and b/DEV1.1/TP12/progression differ diff --git a/DEV1.1/TP12/progression.c b/DEV1.1/TP12/progression.c index 311a993..0d3a45e 100644 --- a/DEV1.1/TP12/progression.c +++ b/DEV1.1/TP12/progression.c @@ -3,35 +3,139 @@ #include int main(void) { - int tour,tour2,val; + int tour,tour2,val=0,val1=0,val2=0; int t1[2][5]; int t2[3][5]; int t3[5][5]; + int t1_inv[5][2]; + int t2_inv[5][3]; + int t3_inv[5][5]; for (tour=0;tour<2;tour++){ - for (tour2=1;tour2<6;tour2++) - t1[tour][tour2]=tour; + for (tour2=0;tour2<5;tour2++) + t1[tour][tour2]=tour2+1; } + printf("+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); + printf("\n"); + for (tour=0;tour<2;tour++){ + printf("|"); + for (tour2=0;tour2<5;tour2++) + printf("%2d |",t1[tour][tour2]); + printf("\n"); + printf("+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); + printf("\n"); + } + printf("\n"); for (tour=0;tour<3;tour++){ - for (tour2=1;tour2<6;tour2++) - val=tour+tour2; + for (tour2=0;tour2<5;tour2++){ + val++; t2[tour][tour2]=val; + } } + printf("+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); + printf("\n"); + for (tour=0;tour<3;tour++){ + printf("|"); + for (tour2=0;tour2<5;tour2++) + printf("%2d |",t2[tour][tour2]); + printf("\n"); + printf("+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); + printf("\n"); + } + printf("\n"); for (tour=0;tour<5;tour++){ - for (tour2=1;tour2<6;tour2++) - val=tour+tour2; - t3[tour][tour2]=val; + for (tour2=0;tour2<5;tour2++){ + if ((tour2+1)<=tour) + t3[tour][tour2]=tour2+1; + else + t3[tour][tour2]=0; + } } printf("+"); - for (tour=0;tour<10;tour++) - printf("-----+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); printf("\n"); - printf("|"); - for (tour=0;tour<10;tour++) - printf("%4d |",tab_val[tour]); + for (tour=0;tour<5;tour++){ + printf("|"); + for (tour2=0;tour2<5;tour2++) + printf("%2d |",t3[tour][tour2]); + printf("\n"); + printf("+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); + printf("\n"); + } printf("\n"); + for (tour=0;tour<5;tour++){ + for (tour2=0;tour2<2;tour2++) + t1_inv[tour][tour2]=tour+1; + } printf("+"); - for (tour=0;tour<10;tour++) - printf("-----+"); + for (tour2=0;tour2<2;tour2++) + printf("---+"); printf("\n"); - return EXIT_SUCCESS; + for (tour=0;tour<5;tour++){ + printf("|"); + for (tour2=0;tour2<2;tour2++) + printf("%2d |",t1_inv[tour][tour2]); + printf("\n"); + printf("+"); + for (tour2=0;tour2<2;tour2++) + printf("---+"); + printf("\n"); + } + printf("\n"); + for (tour=0;tour<5;tour++){ + val1++; + for (tour2=0;tour2<3;tour2++){ + t2_inv[tour][tour2]=val1+(5*tour2); + } + } + printf("+"); + for (tour2=0;tour2<3;tour2++) + printf("---+"); + printf("\n"); + for (tour=0;tour<5;tour++){ + printf("|"); + for (tour2=0;tour2<3;tour2++) + printf("%2d |",t2_inv[tour][tour2]); + printf("\n"); + printf("+"); + for (tour2=0;tour2<3;tour2++) + printf("---+"); + printf("\n"); + } + printf("\n"); + for (tour=0;tour<5;tour++){ + val2++; + for (tour2=0;tour2<5;tour2++){ + if ((tour2)>tour) + t3_inv[tour][tour2]=val2; + else + t3_inv[tour][tour2]=0; + } + } + printf("+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); + printf("\n"); + for (tour=0;tour<5;tour++){ + printf("|"); + for (tour2=0;tour2<5;tour2++) + printf("%2d |",t3_inv[tour][tour2]); + printf("\n"); + printf("+"); + for (tour2=0;tour2<5;tour2++) + printf("---+"); + printf("\n"); + } + printf("\n"); + return EXIT_SUCCESS; } \ No newline at end of file