Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice-with-cmake/nice-optimization into cmake

GradientDescentOptimizer.cpp

@@ -9,7 +9,8 @@
 
 #include "GradientDescentOptimizer.h"
 
-using namespace OPTIMIZATION;
+namespace OPTIMIZATION
+{
 
 GradientDescentOptimizer::GradientDescentOptimizer(OptLogBase *loger)
   : SuperClass(loger)
@@ -427,4 +428,4 @@ int GradientDescentOptimizer::optimize()
 
 }
 
-//}
+}