Changeset 1728


Ignore:
Timestamp:
Nov 4, 2010 6:27:08 PM (9 years ago)
Author:
pbonami
Message:

Fixes two small bugs

Location:
trunk/Bonmin/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicDiveMIP.cpp

    r1664 r1728  
    206206    double* new_g_sol = new double [numberRows];
    207207
    208     double* gradient_f = new double[numberColumns];
    209     minlp->eval_grad_f(numberColumns,newSolution,true,gradient_f);
    210208
    211209    // create a set with the indices of the fractional variables
     
    297295          numberIntegerLinearColumns++;
    298296      }
     297
     298      double* gradient_f = new double[numberColumns];
     299      minlp->eval_grad_f(numberColumns,newSolution,true,gradient_f);
    299300      // create row lower and upper bounds for MILP
    300301      minlp->eval_g(numberColumns, newSolution, true,
  • trunk/Bonmin/src/Interfaces/BonOsiTMINLPInterface.cpp

    r1726 r1728  
    24222422                rowLow[jRow_[i]],
    24232423                rowUp[jRow_[i]], tiny_, veryTiny_)) {     
     2424          if(rowLow[jRow_[i]] > - infty)
    24242425          rowLow[jRow_[i]] += jValues_[i] * x[jCol_ [i]];
     2426          if(rowUp[jRow_[i]] < infty)
    24252427          rowUp[jRow_[i]] += jValues_[i] *x[jCol_[i]];
    24262428       }
  • trunk/Bonmin/src/Interfaces/BonOsiTMINLPInterface.hpp

    r1727 r1728  
    847847  }
    848848 
     849  const std::list<Ipopt::SmartPtr<TNLPSolver> >& debug_apps() const{
     850    return debug_apps_;
     851  }
     852
    849853  TNLPSolver * solver()
    850854  {
Note: See TracChangeset for help on using the changeset viewer.