Merge branch 'ignore-rowtoolong-for-certificaterow' into 'master'

ambros-gleixner · ambros-gleixner · commit 4ae437bdfced · 2025-05-27T08:47:06.000+02:00
Move comment on rowtoolong for certificaterow in cuts.c

See merge request integer/scip!3860
diff --git a/src/scip/cuts.c b/src/scip/cuts.c
@@ -3610,9 +3610,9 @@ SCIP_RETCODE SCIPaggrRowSumRows(
                }
                else
                {
+                  /* the certificate row may exceed the limit maxaggrlen */
                   SCIP_CALL( addOneRowSafely(scip, certificaterow, rows[rowinds[k]], weights[rowinds[k]], sidetypebasis,
                         allowlocal, 0, nvars, &rowtoolong, &rowusedcert, valid, &lhsused) );
-                  /* the certificate row may exceed the limit maxaggrlen */
                   assert(!rowtoolong);
                }
                if( rowusedcert )
@@ -3678,9 +3678,9 @@ SCIP_RETCODE SCIPaggrRowSumRows(
                   }
                   else
                   {
+                     /* the certificate row may exceed the limit maxaggrlen */
                      SCIP_CALL( addOneRowSafely(scip, certificaterow, rows[k], weights[k], sidetypebasis, allowlocal, 0,
                            nvars, &rowtoolong, &rowusedcert, valid, &lhsused) );
-                     /* the certificate row may exceed the limit maxaggrlen */
                      assert(!rowtoolong);
                   }
                   if( rowusedcert )

Original file line number	Diff line number	Diff line change
`@@ -3610,9 +3610,9 @@ SCIP_RETCODE SCIPaggrRowSumRows(`
`3610`	`3610`	`}`
`3611`	`3611`	`else`
`3612`	`3612`	`{`
	`3613`	`+ /* the certificate row may exceed the limit maxaggrlen */`
`3613`	`3614`	`SCIP_CALL( addOneRowSafely(scip, certificaterow, rows[rowinds[k]], weights[rowinds[k]], sidetypebasis,`
`3614`	`3615`	`allowlocal, 0, nvars, &rowtoolong, &rowusedcert, valid, &lhsused) );`
`3615`		`- /* the certificate row may exceed the limit maxaggrlen */`
`3616`	`3616`	`assert(!rowtoolong);`
`3617`	`3617`	`}`
`3618`	`3618`	`if( rowusedcert )`
`@@ -3678,9 +3678,9 @@ SCIP_RETCODE SCIPaggrRowSumRows(`
`3678`	`3678`	`}`
`3679`	`3679`	`else`
`3680`	`3680`	`{`
	`3681`	`+ /* the certificate row may exceed the limit maxaggrlen */`
`3681`	`3682`	`SCIP_CALL( addOneRowSafely(scip, certificaterow, rows[k], weights[k], sidetypebasis, allowlocal, 0,`
`3682`	`3683`	`nvars, &rowtoolong, &rowusedcert, valid, &lhsused) );`
`3683`		`- /* the certificate row may exceed the limit maxaggrlen */`
`3684`	`3684`	`assert(!rowtoolong);`
`3685`	`3685`	`}`
`3686`	`3686`	`if( rowusedcert )`