fixup! issue #1959: nlpsol verbose output colouring information

casadi · Apr 3, 2018 · f99ddfe · f99ddfe
1 parent d006cf8
commit f99ddfe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/casadi/core/matrix.cpp b/casadi/core/matrix.cpp
@@ -3292,8 +3292,10 @@ namespace casadi {
         always_inline = op.second;
       } else if (op.first=="never_inline") {
         never_inline = op.second;
-      } else {
-        casadi_error("No such option: " + string(op.second));
+      } else if (op.first=="verbose") {
+        continue;
+      }  else {
+        casadi_error("No such option: " + string(op.first));
       }
     }
     // Call internal function on a temporary object
@@ -3315,8 +3317,10 @@ namespace casadi {
         always_inline = op.second;
       } else if (op.first=="never_inline") {
         never_inline = op.second;
+      } else if (op.first=="verbose") {
+        continue;
       } else {
-        casadi_error("No such option: " + string(op.second));
+        casadi_error("No such option: " + string(op.first));
       }
     }
     // Call internal function on a temporary object

diff --git a/casadi/core/mx.cpp b/casadi/core/mx.cpp
@@ -1632,8 +1632,10 @@ namespace casadi {
           always_inline = op.second;
         } else if (op.first=="never_inline") {
           never_inline = op.second;
+        } else if (op.first=="verbose") {
+          continue;
         } else {
-          casadi_error("No such option: " + string(op.second));
+          casadi_error("No such option: " + string(op.first));
         }
       }
       // Call internal function on a temporary object
@@ -1659,8 +1661,10 @@ namespace casadi {
           always_inline = op.second;
         } else if (op.first=="never_inline") {
           never_inline = op.second;
+        } else if (op.first=="verbose") {
+          continue;
         } else {
-          casadi_error("No such option: " + string(op.second));
+          casadi_error("No such option: " + string(op.first));
         }
       }
       // Call internal function on a temporary object

diff --git a/casadi/core/x_function.hpp b/casadi/core/x_function.hpp
@@ -312,7 +312,7 @@ namespace casadi {
         } else if (op.first=="verbose") {
           continue;
         } else {
-          casadi_error("No such Jacobian option: " + string(op.second));
+          casadi_error("No such Jacobian option: " + string(op.first));
         }
       }