Skip to content

Commit 5a2f3d8

Browse files
committed
set release date to today; ran astyle
1 parent 5bd7fd4 commit 5a2f3d8

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ More detailed information about incremental changes can be found in the
77

88
## 3.14
99

10-
### 3.14.11 (20xx-yy-zz)
10+
### 3.14.11 (2023-02-07)
1111

1212
- Added `IpoptData::TimingStats() const` [#611]
1313
- Assume DLL library extension in linear solver library loader on Windows

src/Interfaces/IpTNLP.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,10 +930,14 @@ bool TNLP::get_curr_violations(
930930
{
931931
// orig_d_L is unscaled, but we need the scaled one below (because d is scaled)
932932
if( orignlp->NLP_scaling()->have_d_scaling() )
933+
{
933934
d_L = orignlp->NLP_scaling()->apply_vector_scaling_d_NonConst(d_L);
935+
}
934936
}
935937
else // if no relaxation, then orig_d_L() returns NULL, use d_L instead
938+
{
936939
d_L = orignlp->d_L();
940+
}
937941
if( d_L->Dim() > 0 )
938942
{
939943
SmartPtr<Vector> tmp = d_L->MakeNewCopy();
@@ -961,10 +965,14 @@ bool TNLP::get_curr_violations(
961965
{
962966
// orig_d_U is unscaled, but we need the scaled one below (because d is scaled)
963967
if( orignlp->NLP_scaling()->have_d_scaling() )
968+
{
964969
d_U = orignlp->NLP_scaling()->apply_vector_scaling_d_NonConst(d_U);
970+
}
965971
}
966972
else // if no relaxation, then orig_d_U() returns NULL, use d_U instead
973+
{
967974
d_U = orignlp->d_U();
975+
}
968976
if( d_U->Dim() > 0 )
969977
{
970978
SmartPtr<Vector> tmp = d_U->MakeNewCopy();

test/getcurr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ bool run(
581581
)
582582
{
583583
printf("\nRun with fixedvar_makeconstr = %d, start_resto = %d, scale = %d, maximize = %d\n",
584-
fixedvar_makeconstr, start_resto, scale, maximize);
584+
fixedvar_makeconstr, start_resto, scale, maximize);
585585

586586
// Create an instance of your nlp...
587587
SmartPtr<TNLP> nlp = new TestNLP(fixedvar_makeconstr, scale, maximize);

0 commit comments

Comments
 (0)