diff -r cd72eae05bdf -r 3c00344f49c9 test/lp_test.cc --- a/test/lp_test.cc Mon Jul 16 16:21:40 2018 +0200 +++ b/test/lp_test.cc Wed Oct 17 19:14:07 2018 +0200 @@ -2,7 +2,7 @@ * * This file is a part of LEMON, a generic C++ optimization library. * - * Copyright (C) 2003-2009 + * Copyright (C) 2003-2013 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport * (Egervary Research Group on Combinatorial Optimization, EGRES). * @@ -39,6 +39,9 @@ #include #endif +#ifdef LEMON_HAVE_LP +#include +#endif using namespace lemon; int countCols(LpBase & lp) { @@ -198,7 +201,12 @@ LP::Constr c = v >= -3; c = c <= 4; LP::Constr c2; +#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 3 ) + c2 = ( -3 <= v ) <= 4; +#else c2 = -3 <= v <= 4; +#endif + } e[x[3]]=2; @@ -240,8 +248,7 @@ { LP::DualExpr e,f,g; - LP::Row p1 = INVALID, p2 = INVALID, p3 = INVALID, - p4 = INVALID, p5 = INVALID; + LP::Row p1 = INVALID, p2 = INVALID; e[p1]=2; e[p1]+=2; @@ -412,6 +419,15 @@ LpSkeleton lp_skel; lpTest(lp_skel); +#ifdef LEMON_HAVE_LP + { + Lp lp,lp2; + lpTest(lp); + aTest(lp2); + cloneTest(); + } +#endif + #ifdef LEMON_HAVE_GLPK { GlpkLp lp_glpk1,lp_glpk2;