Changeset - r750:b7e3662faf02
« 749:368570
« 747:a42f46
785:9ae88e »
754:2de0fc »
751:f5f260 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #317
0 2 0
merge default
0 files changed with 3 insertions and 2 deletions:
m4/lx_check_coin.m4
1
1
test/mip_test.cc
2
1
↑ Collapse diff ↑
m4/lx_check_coin.m4
Ignore white space 6 line context
... ... 
@@ -85,13 +85,13 @@
85 85 

			




	86
	86
	
		
      if test x"$with_coin_libdir" != x"no"; then


			




	87
	87
	
		
        CBC_LDFLAGS="-L$with_coin_libdir"


			




	88
	88
	
		
      elif test x"$with_coin" != x"yes"; then


			




	89
	89
	
		
        CBC_LDFLAGS="-L$with_coin/lib"


			




	90
	90
	
		
      fi


			




	91
	
	
		
      CBC_LIBS="-lOsi -lCbc -lOsiCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"


			




	
	91
	
		
      CBC_LIBS="-lOsi -lCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"


			




	92
	92
	
		

			




	93
	93
	
		
      lx_save_cxxflags="$CXXFLAGS"


			




	94
	94
	
		
      lx_save_ldflags="$LDFLAGS"


			




	95
	95
	
		
      lx_save_libs="$LIBS"


			




	96
	96
	
		
      CXXFLAGS="$CBC_CXXFLAGS"


			




	97
	97
	
		
      LDFLAGS="$CBC_LDFLAGS"

			




        

    

    

    

        

            

                

                    test/mip_test.cc
                

                

                  
                  
                  
                  Ignore white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -47,13 +47,14 @@


			




	47
	47
	
		

			




	48
	48
	
		
  //  itoa(stat,buf1, 10);


			




	49
	49
	
		
  check(mip.type()==stat, buf.str());


			




	50
	50
	
		

			




	51
	51
	
		
  if (stat ==  MipSolver::OPTIMAL) {


			




	52
	52
	
		
    std::ostringstream sbuf;


			




	53
	
	
		
    buf << "Wrong optimal value: the right optimum is " << exp_opt;


			




	
	53
	
		
    sbuf << "Wrong optimal value ("<< mip.solValue()


			




	
	54
	
		
         <<" instead of " << exp_opt << ")";


			




	54
	55
	
		
    check(std::abs(mip.solValue()-exp_opt) < 1e-3, sbuf.str());


			




	55
	56
	
		
    //+ecvt(exp_opt,2)


			




	56
	57
	
		
  }


			




	57
	58
	
		
}


			




	58
	59
	
		

			




	59
	60
	
		
void aTest(MipSolver& mip)


			




        

    






    
    



    


    

     
    
0 comments (0 inline)