lemon/glpk.h
changeset 1095 ad40f7d32846
parent 833 d2bc45e8f6f2
child 1063 1782aa72495a
     1.1 --- a/lemon/glpk.h	Fri Aug 09 11:07:27 2013 +0200
     1.2 +++ b/lemon/glpk.h	Sun Aug 11 15:28:12 2013 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4   *
     1.5   * This file is a part of LEMON, a generic C++ optimization library.
     1.6   *
     1.7 - * Copyright (C) 2003-2008
     1.8 + * Copyright (C) 2003-2010
     1.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    1.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    1.11   *
    1.12 @@ -30,7 +30,7 @@
    1.13    namespace _solver_bits {
    1.14      class VoidPtr {
    1.15      private:
    1.16 -      void *_ptr;      
    1.17 +      void *_ptr;
    1.18      public:
    1.19        VoidPtr() : _ptr(0) {}
    1.20  
    1.21 @@ -38,8 +38,8 @@
    1.22        VoidPtr(T* ptr) : _ptr(reinterpret_cast<void*>(ptr)) {}
    1.23  
    1.24        template <typename T>
    1.25 -      VoidPtr& operator=(T* ptr) { 
    1.26 -        _ptr = reinterpret_cast<void*>(ptr); 
    1.27 +      VoidPtr& operator=(T* ptr) {
    1.28 +        _ptr = reinterpret_cast<void*>(ptr);
    1.29          return *this;
    1.30        }
    1.31  
    1.32 @@ -65,6 +65,7 @@
    1.33  
    1.34      virtual int _addCol();
    1.35      virtual int _addRow();
    1.36 +    virtual int _addRow(Value l, ExprIterator b, ExprIterator e, Value u);
    1.37  
    1.38      virtual void _eraseCol(int i);
    1.39      virtual void _eraseRow(int i);
    1.40 @@ -123,13 +124,13 @@
    1.41          freeEnv();
    1.42        }
    1.43      };
    1.44 -    
    1.45 +
    1.46      static FreeEnvHelper freeEnvHelper;
    1.47  
    1.48    protected:
    1.49 -    
    1.50 +
    1.51      int _message_level;
    1.52 -    
    1.53 +
    1.54    public:
    1.55  
    1.56      ///Pointer to the underlying GLPK data structure.