Changeset - r585:ba124394367a
« 584:0fec6a
589:fc6c7a »
gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Automatic GLPK env deallocation (#213)
0 4 0
default
4 files changed with 14 insertions and 10 deletions:
lemon/glpk.cc
2
lemon/glpk.h
12
8
test/lp_test.cc
1
test/mip_test.cc
1
↑ Collapse diff ↑
lemon/glpk.cc
Ignore white space 8 line context
... ... 
@@ -525,8 +525,10 @@
525 525 
  void GlpkBase::freeEnv() {
526 526 
    glp_free_env();
527 527 
  }
528 528 

			




	
	529
	
		
  GlpkBase::FreeEnvHelper GlpkBase::freeEnvHelper;


			




	
	530
	
		

			




	529
	531
	
		
  // GlpkLp members


			




	530
	532
	
		

			




	531
	533
	
		
  GlpkLp::GlpkLp()


			




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

			




        

    

    

    

        

            

                

                    lemon/glpk.h
                

                

                  
                  
                  
                  Ignore white space
                  8 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -99,18 +99,22 @@


			




	99
	99
	
		
    virtual Sense _getSense() const;


			




	100
	100
	
		

			




	101
	101
	
		
    virtual void _clear();


			




	102
	102
	
		

			




	
	103
	
		
  private:


			




	
	104
	
		

			




	
	105
	
		
    static void freeEnv();


			




	
	106
	
		

			




	
	107
	
		
    struct FreeEnvHelper {


			




	
	108
	
		
      ~FreeEnvHelper() {


			




	
	109
	
		
        freeEnv();


			




	
	110
	
		
      }


			




	
	111
	
		
    };


			




	
	112
	
		
    


			




	
	113
	
		
    static FreeEnvHelper freeEnvHelper;


			




	
	114
	
		
    


			




	103
	115
	
		
  public:


			




	104
	116
	
		

			




	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
	
	
		

			




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


			




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


			




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


			




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

			




        

    

    

    

        

            

                

                    test/lp_test.cc
                

                

                  
                  
                  
                  Ignore white space
                  8 line context
                

                
                  
                
            

        

        

            

            



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


			




	365
	365
	
		
    GlpkLp lp_glpk1,lp_glpk2;


			




	366
	366
	
		
    lpTest(lp_glpk1);


			




	367
	367
	
		
    aTest(lp_glpk2);


			




	368
	368
	
		
  }


			




	369
	
	
		
  GlpkLp::freeEnv();


			




	370
	369
	
		
#endif


			




	371
	370
	
		

			




	372
	371
	
		
#ifdef HAVE_CPLEX


			




	373
	372
	
		
  try {

			




        

    

    

    

        

            

                

                    test/mip_test.cc
                

                

                  
                  
                  
                  Ignore white space
                  8 line context
                

                
                  
                
            

        

        

            

            



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


			




	114
	114
	
		
  {


			




	115
	115
	
		
    GlpkMip mip1;


			




	116
	116
	
		
    aTest(mip1);


			




	117
	117
	
		
  }


			




	118
	
	
		
  GlpkLp::freeEnv();


			




	119
	118
	
		
#endif


			




	120
	119
	
		

			




	121
	120
	
		
#ifdef HAVE_CPLEX


			




	122
	121
	
		
  try {


			




        

    






    
    



    


    

     
    
0 comments (0 inline)