Changeset 1246 for trunk/Clp


Ignore:
Timestamp:
Jul 21, 2008 1:55:25 PM (12 years ago)
Author:
forrest
Message:

modify corner point code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSimplex.cpp

    r1244 r1246  
    16841684          int numberColumns;
    16851685          double ** solution;
     1686          int * numberUnsatisfied;
    16861687        } clpSolution;
    16871688        clpSolution * solution = (clpSolution *) userPointer_;
     
    16951696          delete [] solution->solution;
    16961697          solution->solution=temp;
     1698          int * tempN = new int [n2];
     1699          for (int i=0;i<n;i++)
     1700            tempN[i] = solution->numberUnsatisfied[i];
     1701          delete [] solution->numberUnsatisfied;
     1702          solution->numberUnsatisfied = tempN;
    16971703        }
    16981704        assert (numberColumns_==solution->numberColumns);
    16991705        double * sol = new double [numberColumns_];
    1700         solution->solution[solution->numberSolutions++]=sol;
     1706        solution->solution[solution->numberSolutions]=sol;
    17011707        int numberFixed=0;
    17021708        int numberUnsat=0;
     
    17361742          }
    17371743        }
     1744        solution->numberUnsatisfied[solution->numberSolutions++]=numberUnsat;
    17381745        printf("iteration %d, %d unsatisfied (%g,%g), %d fixed, %d satisfied\n",
    17391746               numberIterations_,numberUnsat,sumUnsat,mostAway,numberFixed,numberSat);
Note: See TracChangeset for help on using the changeset viewer.