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

Author: scip-ci

src/scip/iisfinder_greedy.c

@@ -517,7 +517,7 @@ SCIP_RETCODE deletionFilterBatch(
    int nconss;
    int nvars;
    int batchindex;
-   int batchsize;
+   int batchsize = initbatchsize;
    int iteration;
    int i;
    int k;

src/scip/matrix.c

@@ -548,7 +548,7 @@ SCIP_RETCODE setColumnMajorFormat(
    int* rowpnt;
    int* rowend;
    SCIP_Real* valpnt;
-   SCIP_RATIONAL* valpntrational;
+   SCIP_RATIONAL* valpntrational = NULL;
    int* fillidx;
 
    assert(scip != NULL);

src/scip/multiprecision.hpp

@@ -112,11 +112,11 @@ namespace scip
    };
    using Integer = Rational;
    using sparsevec = std::vector<SCIP_RATIONAL>;
-   Rational& abs(Rational& r){return r;}
-   Rational& max(Rational& r1, Rational& r2){return r1;}
-   Rational& min(Rational& r1, Rational& r2){return r1;}
-   SCIP_Longint denominator(Rational& r){return 0L;}
-   SCIP_Longint numerator(Rational& r){return 0L;}
+   INLINE Rational& abs(Rational& r){return r;}
+   INLINE Rational& max(Rational& r1, Rational& r2){return r1;}
+   INLINE Rational& min(Rational& r1, Rational& r2){return r1;}
+   INLINE SCIP_Longint denominator(Rational& r){return 0L;}
+   INLINE SCIP_Longint numerator(Rational& r){return 0L;}
 }
 #endif
 

src/scip/rational.cpp

@@ -65,6 +65,7 @@ using namespace scip;
 #endif
 
 /** print SCIP_RATIONAL to output stream */
+static
 std::ostream& operator<<(
    std::ostream&         os,                 /**< output stream */
    SCIP_RATIONAL const & r                   /**< rational to print */
@@ -1834,10 +1835,8 @@ void SCIPrationalPrint(
 {
    if( rational == NULL )
       std::cout << "unknown" << std::flush;
-   else if( rational->isinf )
-      std::cout << (rational->val.sign() > 0 ? "+" : "-") << "infinity" << std::flush;
    else
-      std::cout << rational->val << std::flush;
+      std::cout << *rational << std::flush;
 }
 
 /** printf extension for rationals (not supporting all format options) */
@@ -2358,7 +2357,7 @@ void SCIPrationalComputeApproximationLong(
          res->isinf = FALSE;
          res->isfprepresentable = SCIP_ISFPREPRESENTABLE_UNKNOWN;
 
-         SCIPdebug(std::cout << "approximating " << src->val << " by " << res->val << std::endl);
+         SCIPdebug(std::cout << "approximating " << *src << " by " << *res << std::endl);
 
          return;
       }
@@ -2382,7 +2381,7 @@ void SCIPrationalComputeApproximationLong(
 
       done = 0;
 
-      SCIPdebug(std::cout << "approximating " << src->val << " by continued fractions with maxdenom " << maxdenom << std::endl);
+      SCIPdebug(std::cout << "approximating " << *src << " by continued fractions with maxdenom " << maxdenom << std::endl);
       SCIPdebug(std::cout << "confrac initial values: p0 " << p[1] << " q0 " << q[1] << " p1 " << p[2] << " q1 " << q[2] << std::endl);
 
       /* if q is already big, skip loop */
@@ -2563,7 +2562,7 @@ void SCIPrationalComputeApproximation(
          res->isinf = FALSE;
          res->isfprepresentable = SCIP_ISFPREPRESENTABLE_UNKNOWN;
 
-         SCIPdebug(std::cout << "approximating " << src->val << " by " << res->val << std::endl);
+         SCIPdebug(std::cout << "approximating " << *src << " by " << *res << std::endl);
 
          return;
       }
@@ -2584,7 +2583,7 @@ void SCIPrationalComputeApproximation(
 
       done = 0;
 
-      SCIPdebug(std::cout << "approximating " << src->val << " by continued fractions with maxdenom " << maxdenom << std::endl);
+      SCIPdebug(std::cout << "approximating " << *src << " by continued fractions with maxdenom " << maxdenom << std::endl);
       SCIPdebug(std::cout << "confrac initial values: p0 " << p[1] << " q0 " << q[1] << " p1 " << p[2] << " q1 " << q[2] << std::endl);
 
       /* if q is already big, skip loop */