issue #1959: nlpsol verbose output colouring information

casadi · Apr 3, 2018 · 99baddd · 99baddd · jgillis · Apr 3, 2018
1 parent d4a8eb0
commit 99baddd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/casadi/core/factory.hpp b/casadi/core/factory.hpp
@@ -84,7 +84,7 @@ namespace casadi {
     std::vector<HBlock> hess_;
 
     // Constructor
-    Factory(const Function::AuxOut& aux) : aux_(aux) {}
+    Factory(const Function::AuxOut& aux, bool verbose=false) : aux_(aux), verbose_(verbose) {}
 
     // Add an input expression
     void add_input(const std::string& s, const MatType& e);
@@ -130,6 +130,8 @@ namespace casadi {
     // Get output scheme
     std::vector<std::string> name_out() const;
 
+    // Verbose?
+    bool verbose_;
   };
 
   template<typename MatType>
@@ -246,6 +248,8 @@ namespace casadi {
   void Factory<MatType>::calculate() {
     using namespace std;
 
+    Dict all_opts = {{"verbose", verbose_}};
+
     // Dual variables
     for (auto&& e : out_) {
       in_["lam:" + e.first] = MatType::sym("lam_" + e.first, e.second.sparsity());
@@ -269,6 +273,7 @@ namespace casadi {
       }
       // Calculate directional derivatives
       Dict opts = {{"always_inline", true}};
+      opts["verbose"] = verbose_;
       try {
         sens = forward(res, arg, seed, opts);
       } catch (exception& e) {
@@ -298,6 +303,7 @@ namespace casadi {
       }
       // Calculate directional derivatives
       Dict opts = {{"always_inline", true}};
+      opts["verbose"] = verbose_;
       try {
         sens = reverse(res, arg, seed, opts);
       } catch (exception& e) {
@@ -324,7 +330,7 @@ namespace casadi {
       const MatType& ex = out_.at(b.ex);
       const MatType& arg = in_.at(b.arg);
       try {
-        out_["jac:" + b.ex + ":" + b.arg] = MatType::jacobian(ex, arg);
+        out_["jac:" + b.ex + ":" + b.arg] = MatType::jacobian(ex, arg, all_opts);
       } catch (exception& e) {
         casadi_error("Jacobian generation failed:\n" + str(e.what()));
       }

diff --git a/casadi/core/x_function.hpp b/casadi/core/x_function.hpp
@@ -1003,8 +1003,12 @@ namespace casadi {
           const Dict& opts) const {
     using namespace std;
 
+    auto it = opts.find("verbose");
+    bool verbose = false;
+    if (it!=opts.end()) verbose = it->second;
+
     // Create an expression factory
-    Factory<MatType> f(aux);
+    Factory<MatType> f(aux, verbose);
     for (casadi_int i=0; i<in_.size(); ++i) f.add_input(name_in_[i], in_[i]);
     for (casadi_int i=0; i<out_.size(); ++i) f.add_output(name_out_[i], out_[i]);