LEMON/LEMON-main Changeset - r560:49a39bae067c

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r560:49a39bae067c

« 558:f53d64
« 559:c5fd2d

561:6e0525 »

r560:49a39bae067c

Sun, 29 Mar 2009 23:19:14

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge

0 18 0

merge default

0 files changed with 123 insertions and 75 deletions:

CMakeLists.txt

LICENSE

NEWS

demo/CMakeLists.txt

doc/CMakeLists.txt

lemon/CMakeLists.txt

lemon/Makefile.am

lemon/cplex.cc

lemon/cplex.h

lemon/glpk.cc

scripts/unify-sources.sh

test/CMakeLists.txt

test/counter_test.cc

test/lp_test.cc

test/mip_test.cc

test/time_measure_test.cc

tools/CMakeLists.txt

tools/lemon-0.x-to-1.x.sh

↑ Collapse diff ↑

0 comments (0 inline)

@@ -8,9 +8,9 @@
 		ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 		PROJECT(${PROJECT_NAME})
-		SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+		SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 		INCLUDE(FindDoxygen)
 		INCLUDE(FindGhostscript)
 		FIND_PACKAGE(GLPK 4.33)
@@ -37,19 +37,22 @@
 		ENABLE_TESTING()
 		ADD_SUBDIRECTORY(lemon)
 		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		ADD_SUBDIRECTORY(demo)
 		ADD_SUBDIRECTORY(tools)
 		ADD_SUBDIRECTORY(doc)
 		ADD_SUBDIRECTORY(test)
 		ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		IF(WIN32)
 		  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 		  SET(CPACK_PACKAGE_VENDOR "EGRES")
 		  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
 		    "LEMON - Library of Efficient Models and Optimization in Networks")
-		  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+		    SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 		  SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 		  SET(CPACK_PACKAGE_INSTALL_DIRECTORY
@@ -90,11 +93,11 @@
 		  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
 		  SET(CPACK_GENERATOR "NSIS")
 		  SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		  SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")
-		  #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
+		    SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		    SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
 		    #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
 		  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
 		  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
 		  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
 		  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
@@ -108,4 +111,5 @@
 		    ")
 		  INCLUDE(CPack)
 		ENDIF(WIN32)
 		ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})

 		LEMON code without an explicit copyright is covered by the following
+		LEMON code without an explicit copyright notice is covered by the following
 		copyright/license.
 		Copyright (C) 2003-2009 Egervary Jeno Kombinatorikus Optimalizalasi
 		Kutatocsoport (Egervary Combinatorial Optimization Research Group,
 		EGRES).
 		===========================================================================
 		Boost Software License, Version 1.0
 		===========================================================================
 		Permission is hereby granted, free of charge, to any person or organization
 		obtaining a copy of the software and accompanying documentation covered by
 		this license (the "Software") to use, reproduce, display, distribute,
 		execute, and transmit the Software, and to prepare derivative works of the
@@ -25,9 +29,4 @@
 		SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 		FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 		ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 		DEALINGS IN THE SOFTWARE.
 		===========================================================================
 		This license is a verbatim copy of the Boost Software License, Version 1.0.

 -03-27 LEMON joins to the COIN-OR initiative
 		        COIN-OR (Computational Infrastructure for Operations Research,
 		        http://www.coin-or.org) project is an initiative to spur the
 		        development of open-source software for the operations research
 		        community.
 -10-13 Version 1.0 released
 			This is the first stable release of LEMON. Compared to the 0.x
 			release series, it features a considerably smaller but more

 		INCLUDE_DIRECTORIES(
 		  ${CMAKE_SOURCE_DIR}
 		  ${CMAKE_BINARY_DIR}
 		  ${PROJECT_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
-		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
+		LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
 		SET(DEMOS
 		  arg_parser_demo
 		  graph_to_eps_demo

 		SET(PACKAGE_NAME ${PROJECT_NAME})
 		SET(PACKAGE_VERSION ${PROJECT_VERSION})
 		SET(abs_top_srcdir ${CMAKE_SOURCE_DIR})
 		SET(abs_top_builddir ${CMAKE_BINARY_DIR})
 		SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
 		SET(abs_top_builddir ${PROJECT_BINARY_DIR})
 		CONFIGURE_FILE(
 		  ${CMAKE_SOURCE_DIR}/doc/Doxyfile.in
 		  ${CMAKE_BINARY_DIR}/doc/Doxyfile
 		  ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
 		  ${PROJECT_BINARY_DIR}/doc/Doxyfile
 		  @ONLY)
 		IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
 		  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)

RhodeCode

Login to your account

@@ -16,8 +16,9 @@
 			lemon/bits/windows.cc
 		lemon_libemon_la_CXXFLAGS = \
 			$(AM_CXXFLAGS) \
 			$(GLPK_CFLAGS) \
 			$(CPLEX_CFLAGS) \
 			$(SOPLEX_CXXFLAGS) \
 			$(CLP_CXXFLAGS)

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -440,15 +440,15 @@
 		  // CplexLp members
 		  CplexLp::CplexLp()
-		    : LpBase(), CplexBase(), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase() {}
 		  CplexLp::CplexLp(const CplexEnv& env)
-		    : LpBase(), CplexBase(env), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase(env) {}
 		  CplexLp::CplexLp(const CplexLp& other)
-		    : LpBase(), CplexBase(other), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase(other) {}
 		  CplexLp::~CplexLp() {}
 		  CplexLp* CplexLp::newSolver() const { return new CplexLp; }
@@ -797,9 +797,9 @@
 		  // CplexMip members
 		  CplexMip::CplexMip()
-		    : LpBase(), CplexBase(), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase() {
 		#if CPX_VERSION < 800
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MIP);
 		#else
@@ -807,9 +807,9 @@
 		#endif
+		  }
 		  CplexMip::CplexMip(const CplexEnv& env)
-		    : LpBase(), CplexBase(env), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase(env) {
 		#if CPX_VERSION < 800
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MIP);
 		#else
@@ -818,9 +818,9 @@
+		  }
 		  CplexMip::CplexMip(const CplexMip& other)
-		    : LpBase(), CplexBase(other), MipSolver() {}
+		    : LpBase(), MipSolver(), CplexBase(other) {}
 		  CplexMip::~CplexMip() {}
 		  CplexMip* CplexMip::newSolver() const { return new CplexMip; }

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -234,12 +234,15 @@
 		    CplexMip(const CplexMip&);
 		    /// \e
 		    virtual ~CplexMip();
 		    /// \e
 		    virtual CplexMip* cloneSolver() const;
 		    /// \e
 		    virtual CplexMip* newSolver() const;
 		  protected:
 		    virtual CplexMip* _cloneSolver() const;
 		    virtual CplexMip* _newSolver() const;
 		    virtual const char* _solverName() const;
 		    virtual ColTypes _getColType(int col) const;

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -530,14 +530,14 @@
 		  // GlpkLp members
 		  GlpkLp::GlpkLp()
-		    : LpBase(), GlpkBase(), LpSolver() {
+		    : LpBase(), LpSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
 		  GlpkLp::GlpkLp(const GlpkLp& other)
-		    : LpBase(other), GlpkBase(other), LpSolver(other) {
+		    : LpBase(other), LpSolver(other), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
 		  GlpkLp* GlpkLp::newSolver() const { return new GlpkLp; }
@@ -829,14 +829,14 @@
 		  // GlpkMip members
 		  GlpkMip::GlpkMip()
-		    : LpBase(), GlpkBase(), MipSolver() {
+		    : LpBase(), MipSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
 		  GlpkMip::GlpkMip(const GlpkMip& other)
-		    : LpBase(), GlpkBase(other), MipSolver() {
+		    : LpBase(), MipSolver(), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
 		  void GlpkMip::_setColType(int i, GlpkMip::ColTypes col_type) {

@@ -87,9 +87,14 @@
 		function check_action() {
 		    if [ "$3" == 'tabs' ]
 		    then
 		        if echo $2 | grep -q -v -E 'Makefile\.am$'
 		        then
 		        PATTERN=$(echo -e '\t')
 		        else
 		            PATTERN='        '
 		        fi
 		    elif [ "$3" == 'trailing spaces' ]
 		    then
 		        PATTERN='\ +$'
 		    else

@@ -17,16 +17,21 @@
 		 */
 		#include <lemon/counter.h>
 		#include <vector>
 		#include <sstream>
 		#include "test/test_tools.h"
 		using namespace lemon;
 		template <typename T>
 		void bubbleSort(std::vector<T>& v) {
 		  Counter op("Bubble Sort - Operations: ");
 		  Counter::NoSubCounter as(op, "Assignments: ");
-		  Counter::NoSubCounter co(op, "Comparisons: ");
+		  std::stringstream s1, s2, s3;
+		  {
 		    Counter op("Bubble Sort - Operations: ", s1);
 		    Counter::SubCounter as(op, "Assignments: ", s2);
 		    Counter::SubCounter co(op, "Comparisons: ", s3);
 		  for (int i = v.size()-1; i > 0; --i) {
 		    for (int j = 0; j < i; ++j) {
 		      if (v[j] > v[j+1]) {
 		        T tmp = v[j];
@@ -37,14 +42,20 @@
 		      ++co;
+		    }
+		  }
+		}
 		  check(s1.str() == "Bubble Sort - Operations: 102\n", "Wrong counter");
 		  check(s2.str() == "Assignments: 57\n", "Wrong subcounter");
 		  check(s3.str() == "Comparisons: 45\n", "Wrong subcounter");
+		}
 		template <typename T>
 		void insertionSort(std::vector<T>& v) {
 		  Counter op("Insertion Sort - Operations: ");
 		  Counter::NoSubCounter as(op, "Assignments: ");
-		  Counter::NoSubCounter co(op, "Comparisons: ");
+		  std::stringstream s1, s2, s3;
+		  {
 		    Counter op("Insertion Sort - Operations: ", s1);
 		    Counter::SubCounter as(op, "Assignments: ", s2);
 		    Counter::SubCounter co(op, "Comparisons: ", s3);
 		  for (int i = 1; i < int(v.size()); ++i) {
 		    T value = v[i];
 		    ++as;
 		    int j = i;
@@ -56,33 +67,49 @@
 		    v[j] = value;
 		    ++as;
+		  }
+		}
 		  check(s1.str() == "Insertion Sort - Operations: 56\n", "Wrong counter");
 		  check(s2.str() == "Assignments: 37\n", "Wrong subcounter");
 		  check(s3.str() == "Comparisons: 19\n", "Wrong subcounter");
+		}
 		template <typename MyCounter>
 		void counterTest() {
 		  MyCounter c("Main Counter: ");
 		void counterTest(bool output) {
 		  std::stringstream s1, s2, s3;
+		  {
 		    MyCounter c("Main Counter: ", s1);
 		  c++;
 		  typename MyCounter::SubCounter d(c, "SubCounter: ");
+		    typename MyCounter::SubCounter d(c, "SubCounter: ", s2);
 		  d++;
 		  typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ");
+		    typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ", s3);
 		  e++;
 		  d+=3;
 		  c-=4;
 		  e-=2;
 		  c.reset(2);
 		  c.reset();
+		}
 		  if (output) {
 		    check(s1.str() == "Main Counter: 3\n", "Wrong Counter");
 		    check(s2.str() == "SubCounter: 3\n", "Wrong SubCounter");
 		    check(s3.str() == "", "Wrong NoSubCounter");
 		  } else {
 		    check(s1.str() == "", "Wrong NoCounter");
 		    check(s2.str() == "", "Wrong SubCounter");
 		    check(s3.str() == "", "Wrong NoSubCounter");
+		  }
+		}
 		void init(std::vector<int>& v) {
 		  v[0] = 10; v[1] = 60; v[2] = 20; v[3] = 90; v[4] = 100;
 		  v[5] = 80; v[6] = 40; v[7] = 30; v[8] = 50; v[9] = 70;
+		}
 		int main()
+		{
 		  counterTest<Counter>();
 		  counterTest<NoCounter>();
 		  counterTest<Counter>(true);
 		  counterTest<NoCounter>(false);
 		  std::vector<int> x(10);
 		  init(x); bubbleSort(x);
 		  init(x); insertionSort(x);

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -392,17 +392,17 @@
 		  try {
 		    CplexLp lp_cplex1,lp_cplex2;
 		    lpTest(lp_cplex1);
 		    aTest(lp_cplex2);
 		    cloneTest<CplexLp>();
 		  } catch (CplexEnv::LicenseError& error) {
 		#ifdef LEMON_FORCE_CPLEX_CHECK
 		    check(false, error.what());
 		#else
 		    std::cerr << error.what() << std::endl;
 		    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
 		#endif
+		  }
 		    cloneTest<CplexLp>();
 		#endif
 		#ifdef HAVE_SOPLEX
+		  {

@@ -38,20 +38,18 @@
 		int main()
+		{
 		  Timer T;
 		  unsigned int n;
-		  for(n=0;T.realTime()<1.0;n++) ;
+		  for(n=0;T.realTime()<0.1;n++) ;
 		  std::cout << T << " (" << n << " time queries)\n";
 		  T.restart();
 		  while(T.realTime()<2.0) ;
-		  std::cout << T << '\n';
 		  TimeStamp full;
 		  TimeStamp t;
 		  t=runningTimeTest(f,1,&n,&full);
+		  t=runningTimeTest(f,0.1,&n,&full);
 		  std::cout << t << " (" << n << " tests)\n";
 		  std::cout << "Total: " << full << "\n";
 		  t=runningTimeTest(g,1,&n,&full);
+		  t=runningTimeTest(g,0.1,&n,&full);
 		  std::cout << t << " (" << n << " tests)\n";
 		  std::cout << "Total: " << full << "\n";
 		  return 0;

 		INCLUDE_DIRECTORIES(
 		  ${CMAKE_SOURCE_DIR}
 		  ${CMAKE_BINARY_DIR}
 		  ${PROJECT_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
-		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
+		LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
 		ADD_EXECUTABLE(lgf-gen lgf-gen.cc)
 		TARGET_LINK_LIBRARIES(lgf-gen lemon)
@@ -21,8 +21,8 @@
+		)
 		IF(NOT WIN32)
 		  INSTALL(
 		    FILES ${CMAKE_CURRENT_SOURCE_DIR}/lemon-0.x-to-1.x.sh
 		    RUNTIME DESTINATION bin
 		    PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/lemon-0.x-to-1.x.sh
 		    DESTINATION bin
 		    COMPONENT bin)
 		ENDIF(NOT WIN32)

@@ -21,28 +21,27 @@
 		        -e "s/\<directed edge\>/_ar_c_label_/g"\
 		        -e "s/\<directed edges\>/_ar_c_label_s/g"\
 		        -e "s/UGraph/_Gr_aph_label_/g"\
 		        -e "s/u[Gg]raph/_gr_aph_label_/g"\
-		        -e "s/\<Graph\>/_Digr_aph_label_/g"\
 		        -e "s/Graph\>/_Digr_aph_label_/g"\
 		        -e "s/\<graph\>/_digr_aph_label_/g"\
-		        -e "s/\<Graphs\>/_Digr_aph_label_s/g"\
 		        -e "s/Graphs\>/_Digr_aph_label_s/g"\
 		        -e "s/\<graphs\>/_digr_aph_label_s/g"\
 		        -e "s/_Graph/__Gr_aph_label_/g"\
 		        -e "s/\([Gg]\)raph\([a-z_]\)/_\1r_aph_label_\2/g"\
 		        -e "s/\([Gg]\)raph\([a-z]\)/_\1r_aph_label_\2/g"\
 		        -e "s/\([a-z_]\)graph/\1_gr_aph_label_/g"\
 		        -e "s/Graph/_Digr_aph_label_/g"\
 		        -e "s/graph/_digr_aph_label_/g"\
 		        -e "s/UEdge/_Ed_ge_label_/g"\
 		        -e "s/u[Ee]dge/_ed_ge_label_/g"\
 		        -e "s/IncEdgeIt/_In_cEd_geIt_label_/g"\
-		        -e "s/\<Edge\>/_Ar_c_label_/g"\
 		        -e "s/Edge\>/_Ar_c_label_/g"\
 		        -e "s/\<edge\>/_ar_c_label_/g"\
-		        -e "s/\<Edges\>/_Ar_c_label_s/g"\
+		        -e "s/_edge\>/_ar_c_label_/g"\
 		        -e "s/Edges\>/_Ar_c_label_s/g"\
 		        -e "s/\<edges\>/_ar_c_label_s/g"\
 		        -e "s/_Edge/__Ed_ge_label_/g"\
 		        -e "s/Edge\([a-z_]\)/_Ed_ge_label_\1/g"\
 		        -e "s/edge\([a-z_]\)/_ed_ge_label_\1/g"\
 		        -e "s/\([a-z_]\)edge/\1_ed_ge_label_/g"\
 		        -e "s/_edges\>/_ar_c_label_s/g"\
 		        -e "s/\([Ee]\)dge\([a-z]\)/_\1d_ge_label_\2/g"\
 		        -e "s/\([a-z]\)edge/\1_ed_ge_label_/g"\
 		        -e "s/Edge/_Ar_c_label_/g"\
 		        -e "s/edge/_ar_c_label_/g"\
 		        -e "s/A[Nn]ode/_Re_d_label_/g"\
 		        -e "s/B[Nn]ode/_Blu_e_label_/g"\
@@ -115,7 +114,12 @@
 		        -e "s/\<ArcSubGraphAdaptor\>/FilterEdges/g"\
 		        -e "s/\<arcSubGraphAdaptor\>/filterEdges/g"\
 		        -e "s/\<DirGraphAdaptor\>/Orienter/g"\
 		        -e "s/\<dirGraphAdaptor\>/orienter/g"\
 		        -e "s/\<LpCplex\>/CplexLp/g"\
 		        -e "s/\<MipCplex\>/CplexMip/g"\
 		        -e "s/\<LpGlpk\>/GlpkLp/g"\
 		        -e "s/\<MipGlpk\>/GlpkMip/g"\
 		        -e "s/\<LpSoplex\>/SoplexLp/g"\
 		    <$i > $TMP
 		    mv $TMP $i
 		done