Ignore:
Timestamp:
Dec 19, 2006 2:27:11 PM (13 years ago)
Author:
forrest
Message:

quadratic

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcLinked.cpp

    r502 r503  
    329329    }
    330330    if (isProvenOptimal()) {
    331       if (satisfied)
    332         printf("satisfied %d\n",satisfied);
     331      //if (satisfied==2)
     332      //printf("satisfied %d\n",satisfied);
    333333      if (satisfied&&(specialOptions2_&2)!=0) {
    334334        assert (quadraticModel_);
     
    568568                  int xColumn = obj->xColumn();
    569569                  int yColumn = obj->yColumn();
    570                   // We can do better if one fixed
    571                   assert (columnUpper[xColumn]>columnLower[xColumn]);
    572                   assert (columnUpper[yColumn]>columnLower[yColumn]);
    573570                  if (xColumn!=yColumn) {
    574571                    double coefficient = 2.0*obj->coefficient();
     
    648645                int xColumn = obj->xColumn();
    649646                int yColumn = obj->yColumn();
    650                 // We can do better if one fixed
    651                 assert (columnUpper[xColumn]>columnLower[xColumn]);
    652                 assert (columnUpper[yColumn]>columnLower[yColumn]);
    653647                if (xColumn!=yColumn) {
    654648                  double coefficient = 2.0*obj->coefficient();
     
    10921086      numberQuadratic=0;
    10931087    }
    1094     if (quadraticObjective||((specialOptions2_&8)!=0&&saveNBi)) {
     1088    //if (quadraticObjective||((specialOptions2_&8)!=0&&saveNBi)) {
     1089    if (saveNBi) {
    10951090      // add in objective as constraint
    10961091      objectiveVariable_= numberColumns;
     
    15581553      convex_[iNon]=0;
    15591554    }
    1560     printf("Convexity of row %d is %d\n",iRow,convex_[iNon]);
     1555    //printf("Convexity of row %d is %d\n",iRow,convex_[iNon]);
    15611556    delete [] iColumn;
    15621557    delete [] jColumn;
Note: See TracChangeset for help on using the changeset viewer.