Skip to content

Commit 1ca5b75

Browse files
DominikKampDominikKamp
committed
Reformulate string comparison
1 parent fda9808 commit 1ca5b75

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

‎src/soplex/spxlpbase_rational.hpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ static void MPSreadCols(MPSInput& mps, const LPRowSetBase<Rational>& rset, const
12661266
std::cerr << e.what() << '\n';
12671267
}
12681268

1269-
if(!strcmp(mps.field2(), mps.objName()))
1269+
if(strcmp(mps.field2(), mps.objName()) == 0)
12701270
col.setObj(val);
12711271
else
12721272
{
@@ -1290,7 +1290,7 @@ static void MPSreadCols(MPSInput& mps, const LPRowSetBase<Rational>& rset, const
12901290
std::cerr << e.what() << '\n';
12911291
}
12921292

1293-
if(!strcmp(mps.field4(), mps.objName()))
1293+
if(strcmp(mps.field4(), mps.objName()) == 0)
12941294
col.setObj(val);
12951295
else
12961296
{
@@ -1322,11 +1322,11 @@ static void MPSreadRhs(MPSInput& mps, LPRowSetBase<Rational>& rset, const NameSe
13221322
{
13231323
SPX_MSG_INFO2((*spxout), (*spxout) << "IMPSRD03 RHS name : " << rhsname << std::endl;);
13241324

1325-
if(!strcmp(mps.field0(), "RANGES"))
1325+
if(strcmp(mps.field0(), "RANGES") == 0)
13261326
mps.setSection(MPSInput::RANGES);
1327-
else if(!strcmp(mps.field0(), "BOUNDS"))
1327+
else if(strcmp(mps.field0(), "BOUNDS") == 0)
13281328
mps.setSection(MPSInput::BOUNDS);
1329-
else if(!strcmp(mps.field0(), "ENDATA"))
1329+
else if(strcmp(mps.field0(), "ENDATA") == 0)
13301330
mps.setSection(MPSInput::ENDATA);
13311331
else
13321332
break;
@@ -1355,7 +1355,7 @@ static void MPSreadRhs(MPSInput& mps, LPRowSetBase<Rational>& rset, const NameSe
13551355
}
13561356
else
13571357
{
1358-
if(!strcmp(mps.field2(), mps.objName()))
1358+
if(strcmp(mps.field2(), mps.objName()) == 0)
13591359
{
13601360
try
13611361
{
@@ -1392,7 +1392,7 @@ static void MPSreadRhs(MPSInput& mps, LPRowSetBase<Rational>& rset, const NameSe
13921392

13931393
if(mps.field5() != nullptr)
13941394
{
1395-
if(!strcmp(mps.field4(), mps.objName()))
1395+
if(strcmp(mps.field4(), mps.objName()) == 0)
13961396
{
13971397
try
13981398
{
@@ -1449,9 +1449,9 @@ static void MPSreadRanges(MPSInput& mps, LPRowSetBase<Rational>& rset, const Na
14491449
{
14501450
SPX_MSG_INFO2((*spxout), (*spxout) << "IMPSRD04 Range name : " << rngname << std::endl;);
14511451

1452-
if(!strcmp(mps.field0(), "BOUNDS"))
1452+
if(strcmp(mps.field0(), "BOUNDS") == 0)
14531453
mps.setSection(MPSInput::BOUNDS);
1454-
else if(!strcmp(mps.field0(), "ENDATA"))
1454+
else if(strcmp(mps.field0(), "ENDATA") == 0)
14551455
mps.setSection(MPSInput::ENDATA);
14561456
else
14571457
break;
@@ -1481,7 +1481,7 @@ static void MPSreadRanges(MPSInput& mps, LPRowSetBase<Rational>& rset, const Na
14811481
* E - rhs + range rhs
14821482
* ----------------------------------------
14831483
*/
1484-
if(!strcmp(rngname, mps.field1()))
1484+
if(strcmp(rngname, mps.field1()) == 0)
14851485
{
14861486
if((idx = rnames.number(mps.field2())) < 0)
14871487
mps.entryIgnored("Range", mps.field1(), "row", mps.field2());
@@ -1599,11 +1599,11 @@ static void MPSreadBounds(MPSInput& mps, LPColSetBase<Rational>& cset, const Nam
15991599
}
16001600

16011601
// Is the value field used ?
1602-
if((!strcmp(mps.field1(), "LO"))
1603-
|| (!strcmp(mps.field1(), "UP"))
1604-
|| (!strcmp(mps.field1(), "FX"))
1605-
|| (!strcmp(mps.field1(), "LI"))
1606-
|| (!strcmp(mps.field1(), "UI")))
1602+
if(strcmp(mps.field1(), "LO") == 0
1603+
|| strcmp(mps.field1(), "UP") == 0
1604+
|| strcmp(mps.field1(), "FX") == 0
1605+
|| strcmp(mps.field1(), "LI") == 0
1606+
|| strcmp(mps.field1(), "UI") == 0)
16071607
{
16081608
if((mps.field3() != nullptr) && (mps.field4() == nullptr))
16091609
mps.insertName("_BND_", true);
@@ -1624,18 +1624,18 @@ static void MPSreadBounds(MPSInput& mps, LPColSetBase<Rational>& cset, const Nam
16241624
}
16251625

16261626
// Only read the first Bound in section
1627-
if(!strcmp(bndname, mps.field2()))
1627+
if(strcmp(bndname, mps.field2()) == 0)
16281628
{
16291629
if((idx = cnames.number(mps.field3())) < 0)
16301630
mps.entryIgnored("column", mps.field3(), "bound", bndname);
16311631
else
16321632
{
16331633
if(mps.field4() == nullptr)
16341634
val = 0;
1635-
else if(!strcmp(mps.field4(), "-Inf") || !strcmp(mps.field4(), "-inf"))
1635+
else if(strcmp(mps.field4(), "-Inf") == 0 || strcmp(mps.field4(), "-inf") == 0)
16361636
val = -infinity;
1637-
else if(!strcmp(mps.field4(), "Inf") || !strcmp(mps.field4(), "inf")
1638-
|| !strcmp(mps.field4(), "+Inf") || !strcmp(mps.field4(), "+inf"))
1637+
else if(strcmp(mps.field4(), "Inf") == 0 || strcmp(mps.field4(), "inf") == 0
1638+
|| strcmp(mps.field4(), "+Inf") == 0 || strcmp(mps.field4(), "+inf") == 0)
16391639
val = infinity;
16401640
else
16411641
try

‎src/soplex/spxlpbase_real.hpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,11 +1694,11 @@ static inline void MPSreadName(MPSInput& mps, SPxOut* spxout)
16941694
if(!mps.readLine() || (mps.field0() == nullptr))
16951695
break;
16961696

1697-
if(!strcmp(mps.field0(), "ROWS"))
1697+
if(strcmp(mps.field0(), "ROWS") == 0)
16981698
mps.setSection(MPSInput::ROWS);
1699-
else if(!strncmp(mps.field0(), "OBJSEN", 6))
1699+
else if(strncmp(mps.field0(), "OBJSEN", 6) == 0)
17001700
mps.setSection(MPSInput::OBJSEN);
1701-
else if(!strcmp(mps.field0(), "OBJNAME"))
1701+
else if(strcmp(mps.field0(), "OBJNAME") == 0)
17021702
mps.setSection(MPSInput::OBJNAME);
17031703
else
17041704
break;
@@ -1721,9 +1721,9 @@ static inline void MPSreadObjsen(MPSInput& mps)
17211721
if(!mps.readLine() || (mps.field1() == nullptr))
17221722
break;
17231723

1724-
if(!strcmp(mps.field1(), "MIN"))
1724+
if(strcmp(mps.field1(), "MIN") == 0)
17251725
mps.setObjSense(MPSInput::MINIMIZE);
1726-
else if(!strcmp(mps.field1(), "MAX"))
1726+
else if(strcmp(mps.field1(), "MAX") == 0)
17271727
mps.setObjSense(MPSInput::MAXIMIZE);
17281728
else
17291729
break;
@@ -1732,9 +1732,9 @@ static inline void MPSreadObjsen(MPSInput& mps)
17321732
if(!mps.readLine() || (mps.field0() == nullptr))
17331733
break;
17341734

1735-
if(!strcmp(mps.field0(), "ROWS"))
1735+
if(strcmp(mps.field0(), "ROWS") == 0)
17361736
mps.setSection(MPSInput::ROWS);
1737-
else if(!strcmp(mps.field0(), "OBJNAME"))
1737+
else if(strcmp(mps.field0(), "OBJNAME") == 0)
17381738
mps.setSection(MPSInput::OBJNAME);
17391739
else
17401740
break;
@@ -1924,7 +1924,7 @@ static void MPSreadCols(MPSInput& mps, const LPRowSetBase<R>& rset, const NameSe
19241924

19251925
val = atof(mps.field3());
19261926

1927-
if(!strcmp(mps.field2(), mps.objName()))
1927+
if(strcmp(mps.field2(), mps.objName()) == 0)
19281928
col.setObj(val);
19291929
else
19301930
{
@@ -1940,7 +1940,7 @@ static void MPSreadCols(MPSInput& mps, const LPRowSetBase<R>& rset, const NameSe
19401940

19411941
val = atof(mps.field5());
19421942

1943-
if(!strcmp(mps.field4(), mps.objName()))
1943+
if(strcmp(mps.field4(), mps.objName()) == 0)
19441944
col.setObj(val);
19451945
else
19461946
{
@@ -1973,11 +1973,11 @@ static void MPSreadRhs(MPSInput& mps, LPRowSetBase<R>& rset, const NameSet& rnam
19731973
{
19741974
SPX_MSG_INFO2((*spxout), (*spxout) << "IMPSRD03 RHS name : " << rhsname << std::endl;);
19751975

1976-
if(!strcmp(mps.field0(), "RANGES"))
1976+
if(strcmp(mps.field0(), "RANGES") == 0)
19771977
mps.setSection(MPSInput::RANGES);
1978-
else if(!strcmp(mps.field0(), "BOUNDS"))
1978+
else if(strcmp(mps.field0(), "BOUNDS") == 0)
19791979
mps.setSection(MPSInput::BOUNDS);
1980-
else if(!strcmp(mps.field0(), "ENDATA"))
1980+
else if(strcmp(mps.field0(), "ENDATA") == 0)
19811981
mps.setSection(MPSInput::ENDATA);
19821982
else
19831983
break;
@@ -2006,7 +2006,7 @@ static void MPSreadRhs(MPSInput& mps, LPRowSetBase<R>& rset, const NameSet& rnam
20062006
}
20072007
else
20082008
{
2009-
if(!strcmp(mps.field2(), mps.objName()))
2009+
if(strcmp(mps.field2(), mps.objName()) == 0)
20102010
objoffset = -atof(mps.field3());
20112011
else if((idx = rnames.number(mps.field2())) < 0)
20122012
mps.entryIgnored("RHS", mps.field1(), "row", mps.field2());
@@ -2025,7 +2025,7 @@ static void MPSreadRhs(MPSInput& mps, LPRowSetBase<R>& rset, const NameSet& rnam
20252025

20262026
if(mps.field5() != nullptr)
20272027
{
2028-
if(!strcmp(mps.field4(), mps.objName()))
2028+
if(strcmp(mps.field4(), mps.objName()) == 0)
20292029
objoffset = -atof(mps.field5());
20302030
else if((idx = rnames.number(mps.field4())) < 0)
20312031
mps.entryIgnored("RHS", mps.field1(), "row", mps.field4());
@@ -2065,9 +2065,9 @@ static void MPSreadRanges(MPSInput& mps, LPRowSetBase<R>& rset, const NameSet&
20652065
{
20662066
SPX_MSG_INFO2((*spxout), (*spxout) << "IMPSRD04 Range name : " << rngname << std::endl;);
20672067

2068-
if(!strcmp(mps.field0(), "BOUNDS"))
2068+
if(strcmp(mps.field0(), "BOUNDS") == 0)
20692069
mps.setSection(MPSInput::BOUNDS);
2070-
else if(!strcmp(mps.field0(), "ENDATA"))
2070+
else if(strcmp(mps.field0(), "ENDATA") == 0)
20712071
mps.setSection(MPSInput::ENDATA);
20722072
else
20732073
break;
@@ -2097,7 +2097,7 @@ static void MPSreadRanges(MPSInput& mps, LPRowSetBase<R>& rset, const NameSet&
20972097
* E - rhs + range rhs
20982098
* ----------------------------------------
20992099
*/
2100-
if(!strcmp(rngname, mps.field1()))
2100+
if(strcmp(rngname, mps.field1()) == 0)
21012101
{
21022102
if((idx = rnames.number(mps.field2())) < 0)
21032103
mps.entryIgnored("Range", mps.field1(), "row", mps.field2());
@@ -2188,11 +2188,11 @@ static void MPSreadBounds(MPSInput& mps, LPColSetBase<R>& cset, const NameSet& c
21882188
}
21892189

21902190
// Is the value field used ?
2191-
if((!strcmp(mps.field1(), "LO"))
2192-
|| (!strcmp(mps.field1(), "UP"))
2193-
|| (!strcmp(mps.field1(), "FX"))
2194-
|| (!strcmp(mps.field1(), "LI"))
2195-
|| (!strcmp(mps.field1(), "UI")))
2191+
if(strcmp(mps.field1(), "LO") == 0
2192+
|| strcmp(mps.field1(), "UP") == 0
2193+
|| strcmp(mps.field1(), "FX") == 0
2194+
|| strcmp(mps.field1(), "LI") == 0
2195+
|| strcmp(mps.field1(), "UI") == 0)
21962196
{
21972197
if((mps.field3() != nullptr) && (mps.field4() == nullptr))
21982198
mps.insertName("_BND_", true);
@@ -2213,18 +2213,18 @@ static void MPSreadBounds(MPSInput& mps, LPColSetBase<R>& cset, const NameSet& c
22132213
}
22142214

22152215
// Only read the first Bound in section
2216-
if(!strcmp(bndname, mps.field2()))
2216+
if(strcmp(bndname, mps.field2()) == 0)
22172217
{
22182218
if((idx = cnames.number(mps.field3())) < 0)
22192219
mps.entryIgnored("column", mps.field3(), "bound", bndname);
22202220
else
22212221
{
22222222
if(mps.field4() == nullptr)
22232223
val = 0.0;
2224-
else if(!strcmp(mps.field4(), "-Inf") || !strcmp(mps.field4(), "-inf"))
2224+
else if(strcmp(mps.field4(), "-Inf") == 0 || strcmp(mps.field4(), "-inf") == 0)
22252225
val = R(-infinity);
2226-
else if(!strcmp(mps.field4(), "Inf") || !strcmp(mps.field4(), "inf")
2227-
|| !strcmp(mps.field4(), "+Inf") || !strcmp(mps.field4(), "+inf"))
2226+
else if(strcmp(mps.field4(), "Inf") == 0 || strcmp(mps.field4(), "inf") == 0
2227+
|| strcmp(mps.field4(), "+Inf") == 0 || strcmp(mps.field4(), "+inf") == 0)
22282228
val = R(infinity);
22292229
else
22302230
val = atof(mps.field4());

0 commit comments

Comments
 (0)