1.1 --- a/src/work/athos/lp/lp_base.h	Fri Apr 01 13:42:31 2005 +0000
     1.2 +++ b/src/work/athos/lp/lp_base.h	Fri Apr 01 13:42:58 2005 +0000
     1.3 @@ -105,7 +105,7 @@
     1.4    public:
     1.5  
     1.6      ///\e
     1.7 -    enum SolutionType {
     1.8 +    enum SolutionXXXType {
     1.9        ///\e
    1.10        INFEASIBLE = 0,
    1.11        ///\e
    1.12 @@ -113,7 +113,19 @@
    1.13        ///\e
    1.14        OPTIMAL = 2,
    1.15        ///\e
    1.16 -      FEASIBLE = 3,
    1.17 +      FEASIBLE = 3
    1.18 +    };
    1.19 +      
    1.20 +    ///\e
    1.21 +    enum SolutionType {
    1.22 +      ///\e
    1.23 +      INFEASIBLE = 0,
    1.24 +      ///\e
    1.25 +      UNDEFINED = 1,
    1.26 +      ///\e
    1.27 +      OPTIMAL = 2,
    1.28 +      ///\e
    1.29 +      FEASIBLE = 3
    1.30      };
    1.31        
    1.32      ///The floating point type used by the solver
    1.33 @@ -406,7 +418,7 @@
    1.34      
    1.35      ///\bug Wrong interface
    1.36      ///
    1.37 -    virtual SolutionType _solve() = 0;
    1.38 +    virtual SolutionXXXType _solve() = 0;
    1.39  
    1.40      ///\e
    1.41  
    1.42 @@ -566,7 +578,7 @@
    1.43      /// The upper bound of a variable (column) have to be given by an 
    1.44      /// extended number of type Value, i.e. a finite number of type 
    1.45      /// Value or -\ref INF.
    1.46 -    virtual void setColLowerBound(Col c, Value value) {
    1.47 +    void setColLowerBound(Col c, Value value) {
    1.48        _setColLowerBound(cols.floatingId(c.id),value);
    1.49      }
    1.50      /// Set the upper bound of a column (i.e a variable)
    1.51 @@ -574,7 +586,7 @@
    1.52      /// The upper bound of a variable (column) have to be given by an 
    1.53      /// extended number of type Value, i.e. a finite number of type 
    1.54      /// Value or \ref INF.
    1.55 -    virtual void setColUpperBound(Col c, Value value) {
    1.56 +    void setColUpperBound(Col c, Value value) {
    1.57        _setColUpperBound(cols.floatingId(c.id),value);
    1.58      };
    1.59      /// Set the lower bound of a row (i.e a constraint)
    1.60 @@ -582,7 +594,7 @@
    1.61      /// The lower bound of a linear expression (row) have to be given by an 
    1.62      /// extended number of type Value, i.e. a finite number of type 
    1.63      /// Value or -\ref INF.
    1.64 -    virtual void setRowLowerBound(Row r, Value value) {
    1.65 +    void setRowLowerBound(Row r, Value value) {
    1.66        _setRowLowerBound(rows.floatingId(r.id),value);
    1.67      };
    1.68      /// Set the upper bound of a row (i.e a constraint)
    1.69 @@ -590,7 +602,7 @@
    1.70      /// The upper bound of a linear expression (row) have to be given by an 
    1.71      /// extended number of type Value, i.e. a finite number of type 
    1.72      /// Value or \ref INF.
    1.73 -    virtual void setRowUpperBound(Row r, Value value) {
    1.74 +    void setRowUpperBound(Row r, Value value) {
    1.75        _setRowUpperBound(rows.floatingId(r.id),value);
    1.76      };
    1.77      ///Set an element of the objective function