Resolve "fails to read valid free-form MPS file"

DominikKamp · DominikKamp · commit 953358d7de9f · 2025-10-21T11:05:07.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,7 @@ Release 7.1.6
 fixed bugs:
 - fixed that SoPlex_objValueRationalString did not calculate the required string length correctly
 - clear vector before modifying number of non-zeros in SSVectorBase<R>::assign2productShort() of basevectors.h to avoid uninitialized indexing
+- also check whitespace at fourth position and only rely on length in row section in MPSInput::readLine() to detect more free MPS formats
 
 code quality:
 - reorganize NameSet::number() to avoid one hash table lookup and remove false compiler warning
diff --git a/src/soplex/mpsinput.cpp b/src/soplex/mpsinput.cpp
@@ -137,13 +137,14 @@ bool MPSInput::readLine()
 
          /* Test for fixed format
           */
-         space = m_buf[12] | m_buf[13]
+         space = m_buf[3]
+                 | m_buf[12] | m_buf[13]
                  | m_buf[22] | m_buf[23]
                  | m_buf[36] | m_buf[37] | m_buf[38]
                  | m_buf[47] | m_buf[48]
                  | m_buf[61] | m_buf[62] | m_buf[63];
 
-         if(space == BLANK || len < 13)
+         if(space == BLANK)
          {
             /* Now we have space at the right positions.
              * But are there also the non space where they
@@ -159,7 +160,7 @@ bool MPSInput::readLine()
             /* len < 13 is handle ROW lines with embedded spaces
              * in the names correctly
              */
-            if(number || len < 13)
+            if((m_section != ROWS && number) || (m_section == ROWS && len < 13))
             {
                /* Now we assume fixed format, so we patch possible embedded spaces.
                 */
@@ -169,9 +170,7 @@ bool MPSInput::readLine()
             }
             else
             {
-               if(m_section == COLUMNS || m_section == RHS
-                     || m_section == RANGES  || m_section == BOUNDS)
-                  m_is_new_format = true;
+               m_is_new_format = true;
             }
          }
          else

Original file line number	Diff line number	Diff line change
`@@ -137,13 +137,14 @@ bool MPSInput::readLine()`
`137`	`137`
`138`	`138`	`/* Test for fixed format`
`139`	`139`	`*/`
`140`		`- space = m_buf[12] \| m_buf[13]`
	`140`	`+ space = m_buf[3]`
	`141`	`+ \| m_buf[12] \| m_buf[13]`
`141`	`142`	`\| m_buf[22] \| m_buf[23]`
`142`	`143`	`\| m_buf[36] \| m_buf[37] \| m_buf[38]`
`143`	`144`	`\| m_buf[47] \| m_buf[48]`
`144`	`145`	`\| m_buf[61] \| m_buf[62] \| m_buf[63];`
`145`	`146`
`146`		`- if(space == BLANK \|\| len < 13)`
	`147`	`+ if(space == BLANK)`
`147`	`148`	`{`
`148`	`149`	`/* Now we have space at the right positions.`
`149`	`150`	`* But are there also the non space where they`
`@@ -159,7 +160,7 @@ bool MPSInput::readLine()`
`159`	`160`	`/* len < 13 is handle ROW lines with embedded spaces`
`160`	`161`	`* in the names correctly`
`161`	`162`	`*/`
`162`		`- if(number \|\| len < 13)`
	`163`	`+ if((m_section != ROWS && number) \|\| (m_section == ROWS && len < 13))`
`163`	`164`	`{`
`164`	`165`	`/* Now we assume fixed format, so we patch possible embedded spaces.`
`165`	`166`	`*/`
`@@ -169,9 +170,7 @@ bool MPSInput::readLine()`
`169`	`170`	`}`
`170`	`171`	`else`
`171`	`172`	`{`
`172`		`- if(m_section == COLUMNS \|\| m_section == RHS`
`173`		`- \|\| m_section == RANGES \|\| m_section == BOUNDS)`
`174`		`- m_is_new_format = true;`
	`173`	`+ m_is_new_format = true;`
`175`	`174`	`}`
`176`	`175`	`}`
`177`	`176`	`else`