# HG changeset patch
# User Balazs Dezso <deba@inf.elte.hu>
# Date 1235426065 -3600
# Node ID 0fec6a017eaddac797518d40c102144176c47fad
# Parent 06e0fb20a97c9f9acbbd88cba806271b7c97ef08
Fix GLPK tests (#213)
diff -r 06e0fb20a97c -r 0fec6a017ead lemon/glpk.cc
|
a
|
b
|
|
| 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() |
diff -r 06e0fb20a97c -r 0fec6a017ead lemon/glpk.h
|
a
|
b
|
|
| 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. |
diff -r 06e0fb20a97c -r 0fec6a017ead test/lp_test.cc
|
a
|
b
|
|
| 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 |
diff -r 06e0fb20a97c -r 0fec6a017ead test/mip_test.cc
|
a
|
b
|
|
| 115 | 115 | GlpkMip mip1; |
| 116 | 116 | aTest(mip1); |
| 117 | 117 | } |
| | 118 | GlpkLp::freeEnv(); |
| 118 | 119 | #endif |
| 119 | 120 | |
| 120 | 121 | #ifdef HAVE_CPLEX |
