set release date to today; ran astyle

coin-or · Feb 7, 2023 · 5a2f3d8 · 5a2f3d8
1 parent 5bd7fd4
commit 5a2f3d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,7 +7,7 @@ More detailed information about incremental changes can be found in the
 
 ## 3.14
 
-### 3.14.11 (20xx-yy-zz)
+### 3.14.11 (2023-02-07)
 
 - Added `IpoptData::TimingStats() const` [#611]
 - Assume DLL library extension in linear solver library loader on Windows

diff --git a/src/Interfaces/IpTNLP.cpp b/src/Interfaces/IpTNLP.cpp
@@ -930,10 +930,14 @@ bool TNLP::get_curr_violations(
       {
          // orig_d_L is unscaled, but we need the scaled one below (because d is scaled)
          if( orignlp->NLP_scaling()->have_d_scaling() )
+         {
             d_L = orignlp->NLP_scaling()->apply_vector_scaling_d_NonConst(d_L);
+         }
       }
       else // if no relaxation, then orig_d_L() returns NULL, use d_L instead
+      {
          d_L = orignlp->d_L();
+      }
       if( d_L->Dim() > 0 )
       {
          SmartPtr<Vector> tmp = d_L->MakeNewCopy();
@@ -961,10 +965,14 @@ bool TNLP::get_curr_violations(
       {
          // orig_d_U is unscaled, but we need the scaled one below (because d is scaled)
          if( orignlp->NLP_scaling()->have_d_scaling() )
+         {
             d_U = orignlp->NLP_scaling()->apply_vector_scaling_d_NonConst(d_U);
+         }
       }
       else // if no relaxation, then orig_d_U() returns NULL, use d_U instead
+      {
          d_U = orignlp->d_U();
+      }
       if( d_U->Dim() > 0 )
       {
          SmartPtr<Vector> tmp = d_U->MakeNewCopy();

diff --git a/test/getcurr.cpp b/test/getcurr.cpp
@@ -581,7 +581,7 @@ bool run(
 )
 {
    printf("\nRun with fixedvar_makeconstr = %d, start_resto = %d, scale = %d, maximize = %d\n",
-      fixedvar_makeconstr, start_resto, scale, maximize);
+          fixedvar_makeconstr, start_resto, scale, maximize);
 
    // Create an instance of your nlp...
    SmartPtr<TNLP> nlp = new TestNLP(fixedvar_makeconstr, scale, maximize);