Changeset - r584:0fec6a017ead
« 571:06e0fb
585:ba1243 »
gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Fix GLPK tests (#213)
0 4 0
default
4 files changed with 14 insertions and 0 deletions:
lemon/glpk.cc
4
lemon/glpk.h
8
test/lp_test.cc
1
test/mip_test.cc
1
↑ Collapse diff ↑
lemon/glpk.cc
Ignore white space 6 line context
... ... 
@@ -521,8 +521,12 @@
521 521 
    rows.clear();
522 522 
    cols.clear();
523 523 
  }
524 524 

			




	
	525
	
		
  void GlpkBase::freeEnv() {


			




	
	526
	
		
    glp_free_env();


			




	
	527
	
		
  }


			




	
	528
	
		

			




	525
	529
	
		
  // GlpkLp members


			




	526
	530
	
		

			




	527
	531
	
		
  GlpkLp::GlpkLp()


			




	528
	532
	
		
    : LpBase(), GlpkBase(), LpSolver() {

			




        

    

    

    

        

            

                

                    lemon/glpk.h
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -101,8 +101,16 @@


			




	101
	101
	
		
    virtual void _clear();


			




	102
	102
	
		

			




	103
	103
	
		
  public:


			




	104
	104
	
		

			




	
	105
	
		
    /// \brief Deallocates the globally allocated memory of GLPK.


			




	
	106
	
		

			




	
	107
	
		
    /// Deallocates the globally allocated memory of GLPK.  \note


			




	
	108
	
		
    /// Usually, it do not have to be called, because the GLPK use


			




	
	109
	
		
    /// only a small amount of global memory, and it is deallocated


			




	
	110
	
		
    /// automatically at the end of program.


			




	
	111
	
		
    static void freeEnv();


			




	
	112
	
		

			




	105
	113
	
		
    ///Pointer to the underlying GLPK data structure.


			




	106
	114
	
		
    LPX *lpx() {return lp;}


			




	107
	115
	
		
    ///Const pointer to the underlying GLPK data structure.


			




	108
	116
	
		
    const LPX *lpx() const {return lp;}

			




        

    

    

    

        

            

                

                    test/lp_test.cc
                

                

                  
                  
                  
                  Ignore white space
                  8 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -365,8 +365,9 @@


			




	365
	365
	
		
    GlpkLp lp_glpk1,lp_glpk2;


			




	366
	366
	
		
    lpTest(lp_glpk1);


			




	367
	367
	
		
    aTest(lp_glpk2);


			




	368
	368
	
		
  }


			




	
	369
	
		
  GlpkLp::freeEnv();


			




	369
	370
	
		
#endif


			




	370
	371
	
		

			




	371
	372
	
		
#ifdef HAVE_CPLEX


			




	372
	373
	
		
  try {

			




        

    

    

    

        

            

                

                    test/mip_test.cc
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -114,8 +114,9 @@


			




	114
	114
	
		
  {


			




	115
	115
	
		
    GlpkMip mip1;


			




	116
	116
	
		
    aTest(mip1);


			




	117
	117
	
		
  }


			




	
	118
	
		
  GlpkLp::freeEnv();


			




	118
	119
	
		
#endif


			




	119
	120
	
		

			




	120
	121
	
		
#ifdef HAVE_CPLEX


			




	121
	122
	
		
  try {


			




        

    






    
    



    


    

     
    
0 comments (0 inline)