Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

doc/xternal.c

@@ -51,8 +51,7 @@
  * - is a framework for branch-cut-and-price.
  *
  * Since version 10, \SCIP can optionally be configured to solve mixed-integer linear programs in a numerically exact
- * solving mode and produce certificates that can be independently verified, see \ref EXACT "How to use the numerically
- * exact solving mode" for details.
+ * solving mode and produce certificates that can be independently verified, see \ref EXACT "How to use the numerically exact solving mode" for details.
  *
  * See the web site of <a href="http://scipopt.org">\SCIP</a> for more information about licensing and how to download \SCIP.
  *

src/scip/nlpi_conopt.c

@@ -723,11 +723,11 @@ static int COI_CALLCONV FDEval(
 
 /** CONOPT callback to pass some of the options (not supported via COIDEF_* functions) to CONOPT */
 static int COI_CALLCONV Option(
-   int                   NCALL,              /** number of callback call (provided by CONOPT) */
-   double*               RVAL,               /** pointer to set the value of a real option */
-   int*                  IVAL,               /** pointer to set the value of an integer option */
-   int*                  LVAL,               /** pointer to set the value of a binary option */
-   char*                 NAME,               /** pointer to set the name of the option */
+   int                   NCALL,              /**< number of callback call (provided by CONOPT) */
+   double*               RVAL,               /**< pointer to set the value of a real option */
+   int*                  IVAL,               /**< pointer to set the value of an integer option */
+   int*                  LVAL,               /**< pointer to set the value of a binary option */
+   char*                 NAME,               /**< pointer to set the name of the option */
    void*                 USRMEM              /**< user memory pointer (i.e. pointer to SCIP_NLPIPROBLEM) */
    )
 {

src/scip/rational.cpp

@@ -2253,10 +2253,10 @@ void chooseSemiconv(
    scip::Integer*        p,                 /**< the last 3 numerators of convergents */
    scip::Integer*        q,                 /**< the last 3 denominators of convergents */
    const scip::Integer&  ai,                /**< the coefficient in the continuous fraction */
-   SCIP_Longint          maxdenom           /**< the maximal denominator */
+   const scip::Integer&  maxdenom           /**< the maximal denominator */
    )
 {
-   scip::Integer j = (scip::Integer(maxdenom) - q[0]) / q[1];
+   scip::Integer j = (maxdenom - q[0]) / q[1];
 
    if( j >= ai / 2 )
    {
@@ -2635,7 +2635,7 @@ void SCIPrationalComputeApproximation(
             else
             {
                SCIPdebug(std::cout << " picking semiconvergent " << std::endl);
-               chooseSemiconv(resnum, resden, p, q, 1, maxdenom);
+               chooseSemiconv(resnum, resden, p, q, 1, scip::Integer(maxdenom));
                SCIPdebug(std::cout << " use " << resnum << "/" << resden << std::endl);
                res->val = scip::Rational(resnum,resden) * sign;
             }
@@ -2644,9 +2644,9 @@ void SCIPrationalComputeApproximation(
          else
          {
             if( forcegreater != 0 )
-               chooseSemiconv(resnum, resden, p, q, 1, maxdenom);
+               chooseSemiconv(resnum, resden, p, q, 1, scip::Integer(maxdenom));
             else
-               chooseSemiconv(resnum, resden, p, q, ai, maxdenom);
+               chooseSemiconv(resnum, resden, p, q, ai, scip::Integer(maxdenom));
             SCIPdebug(std::cout << " picking semiconvergent " << std::endl);
             SCIPdebug(std::cout << " use " << resnum << "/" << resden << std::endl);
             res->val = scip::Rational(resnum,resden) * sign;