From 3ab6c63e935cb0ccb5dc30e0ccb9caad3fb9712f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20CAZENAVE?= <clement.cazenave@ensiie.fr> Date: Thu, 9 Jan 2020 11:59:15 +0100 Subject: [PATCH] Update main.cpp --- src/main.cpp | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8effd52..12f6f24 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,23 +1,21 @@ -#include <iostream> -#include <limits> -#include <iomanip> -#include "../includes/tab.h" - -using namespace std; - -int main(){ - -Materiaux cuivre = Materiaux(389, 8940,380); -Materiaux fer= Materiaux (80.2,7874,440); -Materiaux verre= Materiaux(1.2,2530,840); -Materiaux polystyrene= Materiaux(0.1,1040,1200); - -int ** u_cuivre = settab(cuivre, 100,100,253,1,600); -int ** u_fer = settab(fer, 100,100,253,1,600); -int ** u_verre = settab(verre, 100,100,253,1,600); -int ** u_polystyrene = settab(polystyrene, 100,100,253,1,600); -cout<<u_cuivre<<u_fer<<u_polystyrene<<u_verre<<endl; - -return 0; -} - +#include <iostream> +#include <limits> +#include <iomanip> +#include "../includes/tab.h" + +using namespace std; + +int main(){ + +Materiaux cuivre = Materiaux("cuivre",389, 8940,380); +Materiaux fer= Materiaux ("fer",80.2,7874,440); +Materiaux verre= Materiaux("verre",1.2,2530,840); +Materiaux polystyrene= Materiaux("polystyrene",0.1,1040,1200); + +settab(cuivre, 273.5+13,273.5+6000); +settab(fer,273.5+13,273.5+80); +settab(verre,273.5+13,273.5+80); +settab(polystyrene,273.5+13,273.5+80); + +return 0; +} -- GitLab