Skip to content

Commit 72ec2a0

Browse files
committed
Merge branch 'gh181-fix-create-soc' into 'master'
fix coefs and offset checks in SCIPcreateConsBasicSOCNonlinear See merge request integer/scip!4079
2 parents 394dba6 + 52a7635 commit 72ec2a0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Miscellaneous
6767
Fixed bugs
6868
----------
6969

70+
- fixed call of SCIPcreateConsBasicSOCNonlinear() with coefs being NULL, and fixed check for offsets being finite
71+
7072

7173
@section RN1000 SCIP 10.0.0
7274
***************************

src/scip/cons_nonlinear.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13006,12 +13006,12 @@ SCIP_RETCODE SCIPcreateConsBasicSOCNonlinear(
1300613006
/* check values for infinity or nan */
1300713007
for( i = 0; i < nvars; ++i )
1300813008
{
13009-
if( !SCIPisFinite(coefs[i]) || SCIPisInfinity(scip, coefs[i]) )
13009+
if( coefs != NULL && ( !SCIPisFinite(coefs[i]) || SCIPisInfinity(scip, coefs[i]) ) )
1301013010
{
1301113011
SCIPerrorMessage("Second-order cone term with infinite or nan coefficient of variable %s in nonlinear constraint %s\n", SCIPvarGetName(vars[i]), name);
1301213012
return SCIP_INVALIDDATA;
1301313013
}
13014-
if( offsets != NULL && (!SCIPisFinite(offsets[i]) || SCIPisInfinity(scip, coefs[i])) )
13014+
if( offsets != NULL && (!SCIPisFinite(offsets[i]) || SCIPisInfinity(scip, offsets[i])) )
1301513015
{
1301613016
SCIPerrorMessage("Second-order cone term with infinite or nan offset for variable %s in nonlinear constraint %s\n", SCIPvarGetName(vars[i]), name);
1301713017
return SCIP_INVALIDDATA;

0 commit comments

Comments
 (0)