X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda%2Fsrc%2Fcpp%2Fcore%2FmainCore.cpp;h=12ba6fad96b3fb612f267e935cf495ceb856044c;hb=6664817ed89b0b616044da35a3eb8f715e0813d9;hp=05a7e996480170e035c5003f474979e657b5ddff;hpb=8cb42977ea2d8904795381957474b65f15f46526;p=GPU.git

diff --git a/WCudaMSE/Student_Cuda/src/cpp/core/mainCore.cpp b/WCudaMSE/Student_Cuda/src/cpp/core/mainCore.cpp
index 05a7e99..12ba6fa 100755
--- a/WCudaMSE/Student_Cuda/src/cpp/core/mainCore.cpp
+++ b/WCudaMSE/Student_Cuda/src/cpp/core/mainCore.cpp
@@ -1,19 +1,35 @@
 #include <iostream>
 #include <stdlib.h>
+#include <algorithm>
 using namespace std;
 
+#include "01c_Saucisson/Saucisson.h"
+#include "02_ProduitScalaire/ProduitScalaire.h"
+#include "03_Histogramme/Histogramme.h"
+#include "04_MonteCarlo/MonteCarlo.h"
+
 extern bool useHello();
 extern bool addVectors();
-extern bool produitScalaire();
-
-int mainCore();
 
-int mainCore()
+int mainCore(const vector<string>& args)
     {
     bool isOk = true;
-    /*isOk &= useHello();
-    isOk &= addVectors();*/
-    isOk &= produitScalaire();
+
+    // Exemples simples.
+    //isOk &= useHello();
+    //isOk &= addVectors();
+
+    if (find(args.begin(), args.end(), "saucisson") != args.end())
+        isOk &= saucisson();
+
+    if (find(args.begin(), args.end(), "produit-scalaire") != args.end())
+        isOk &= produitScalaire();
+
+    if (find(args.begin(), args.end(), "histogramme") != args.end())
+        isOk &= histogramme();
+
+    if (find(args.begin(), args.end(), "monte-carlo") != args.end())
+        isOk &= monteCarlo();
 
     cout << "\nisOK = " << isOk << endl;
     cout << "\nEnd : mainCore" << endl;