Changeset 1265


Ignore:
Timestamp:
Aug 29, 2008 12:19:56 PM (11 years ago)
Author:
forrest
Message:

correct Makefile

Location:
trunk/Clp/examples
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/examples/Makefile.in

    r1171 r1265  
    1919# CHANGEME: Here is the name of all object files corresponding to the source
    2020#           code that you wrote in order to define the problem statement
    21 OBJS =  $(DRIVER).@OBJEXT@ \
    22         myPdco.@OBJEXT@
     21OBJS =  $(DRIVER).@OBJEXT@
    2322
    2423# CHANGEME: Additional libraries
  • trunk/Clp/examples/dualCuts.cpp

    r673 r1265  
    149149      small.initialSolve(solveOptions);
    150150    }
     151    bool dualInfeasible = (small.status()==2);
    151152    // move solution back
    152153    double * solution = model2->primalColumnSolution();
     
    180181        if (model2->getRowStatus(iRow)==ClpSimplex::basic) {
    181182          // Basic - we can get rid of if early on
    182           if (iPass<takeOutPass) {
     183          if (iPass<takeOutPass&&!dualInfeasible) {
    183184            // may have hit max iterations so check
    184185            double infeasibility = max(fullSolution[iRow]-rowUpper[iRow],
Note: See TracChangeset for help on using the changeset viewer.