1 files changed, 24 insertions, 7 deletions

diff --git a/btl/libs/FFTW/main.cpp b/btl/libs/FFTW/main.cpp
index 3f2f0c4..034a279 100644
--- a/btl/libs/FFTW/main.cpp
+++ b/btl/libs/FFTW/main.cpp
@@ -7,37 +7,54 @@
 
 BTL_MAIN;
 
-int main(int argv, char **argc)
+int main(int argc, char **argv)
 {
   bool
   fftw_1d_forward_measure = false,
   fftw_1d_forward_estimate = false,
   fftw_1d_backward_measure = false,
-  fftw_1d_backward_estimate = false
+  fftw_1d_backward_estimate = false,
+
+  fftw_2d_forward_measure = false,
+  fftw_2d_forward_estimate = false,
+  fftw_2d_backward_measure = false,
+  fftw_2d_backward_estimate = false
   ;
 
 
-  for (int i = 1; i < argv; ++i) {
-    std::string arg = argc[i];
+  for (int i = 1; i < argc; ++i) {
+    std::string arg = argv[i];
+
     if (arg == "FFTW_1D_Forward_Measure" || arg == "all") fftw_1d_forward_measure = true;
     if (arg == "FFTW_1D_Forward_Estimate" || arg == "all") fftw_1d_forward_estimate = true;
     if (arg == "FFTW_1D_Backward_Measure" || arg == "all") fftw_1d_backward_measure = true;
     if (arg == "FFTW_1D_Backward_Estimate" || arg == "all") fftw_1d_backward_estimate = true;
+
+    if (arg == "FFTW_2D_Forward_Measure" || arg == "all") fftw_2d_forward_measure = true;
+    if (arg == "FFTW_2D_Forward_Estimate" || arg == "all") fftw_2d_forward_estimate = true;
+    if (arg == "FFTW_2D_Backward_Measure" || arg == "all") fftw_2d_backward_measure = true;
+    if (arg == "FFTW_2D_Backward_Estimate" || arg == "all") fftw_2d_backward_estimate = true;
   }
 
 
   if (fftw_1d_forward_measure)
   bench<Action_FFTW_1D_Forward_Measure<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
-
   if (fftw_1d_forward_estimate)
   bench<Action_FFTW_1D_Forward_Estimate<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
-
   if (fftw_1d_backward_measure)
   bench<Action_FFTW_1D_Backward_Measure<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
-
   if (fftw_1d_backward_estimate)
   bench<Action_FFTW_1D_Backward_Estimate<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
 
+  if (fftw_2d_forward_measure)
+  bench<Action_FFTW_2D_Forward_Measure<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+//  if (fftw_1d_forward_estimate)
+//  bench<Action_FFTW_1D_Forward_Estimate<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+//  if (fftw_1d_backward_measure)
+//  bench<Action_FFTW_1D_Backward_Measure<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+//  if (fftw_1d_backward_estimate)
+//  bench<Action_FFTW_1D_Backward_Estimate<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+
 
   return 0;
 }