From 363de2ed28b5b314c579de86d7a7634d38bec3ce Mon Sep 17 00:00:00 2001
From: vasiloglou <nvasil@ismion.com>
Date: Sun, 24 Feb 2008 18:54:06 +0000
Subject: [PATCH] uo and running

---
 .../contrib/nvasil/non_convex_mvu/main.cc     | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/fastlib2/contrib/nvasil/non_convex_mvu/main.cc b/fastlib2/contrib/nvasil/non_convex_mvu/main.cc
index c2763ea135..ebc274ad07 100644
--- a/fastlib2/contrib/nvasil/non_convex_mvu/main.cc
+++ b/fastlib2/contrib/nvasil/non_convex_mvu/main.cc
@@ -36,22 +36,27 @@ int main(int argc, char *argv[]) {
                                     DeterministicGrad>();
 
     fx_timer_stop(NULL,  "optimization"); 
-  }
-  if (opt_method=="bfgs_max_furth") {
-    fx_timer_start(NULL, "optimization");
-    engine.ComputeLocalOptimumBFGS<MaxFurthestNeighbors, 
-                                    EqualityOnNearest,
-                                    DeterministicGrad>();
-    fx_timer_stop(NULL,  "optimization"); 
+  } else {
+    if (opt_method=="bfgs_max_furth") {
+      fx_timer_start(NULL, "optimization");
+      engine.ComputeLocalOptimumBFGS<MaxFurthestNeighbors, 
+                                      EqualityOnNearest,
+                                      DeterministicGrad>();
+      fx_timer_stop(NULL,  "optimization"); 
  
+    } else {
+      if (opt_method=="spe") {
+        fx_timer_start(NULL, "optimization");
+        engine.ComputeLocalOptimumBFGS<MaxFurthestNeighbors, 
+                                      EqualityOnNearest,
+                                      DeterministicGrad>();
+        fx_timer_stop(NULL,  "optimization"); 
+      } else {
+        FATAL("You didn't select a valid optimization method \n");
+      }
+    }
   }
-  if (opt_method=="spe") {
-    fx_timer_start(NULL, "optimization");
-    engine.ComputeLocalOptimumBFGS<MaxFurthestNeighbors, 
-                                    EqualityOnNearest,
-                                    DeterministicGrad>();
-    fx_timer_stop(NULL,  "optimization"); 
-  }
+      
   std::string out_file = fx_param_str(NULL, "out_file", "results.csv");
   data::Save(out_file.c_str(), engine.coordinates());
   fx_done();
@@ -100,7 +105,7 @@ void LoadData(std::string data_file,
     data::Load(data_file.c_str(), &temp);
     index_t num_of_points = temp.n_cols();
     index_t reduced_num_of_points = index_t(num_of_points *sample_factor);
-    index_t *permutations = new index_t[reduced_num_of_points];
+    index_t *permutations = new index_t[num_of_points];
     for(index_t i=0; i<num_of_points; i++) {
       permutations[i]=i;
     }