Changeset 2166 for trunk


Ignore:
Timestamp:
Mar 17, 2015 5:00:15 AM (4 years ago)
Author:
forrest
Message:

try and fix thread exit segfault

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.cpp

    r2164 r2166  
    48474847            double dummyBest;
    48484848            tree_->cleanTree(this, -COIN_DBL_MAX, dummyBest) ;
    4849 #ifdef CBC_THREAD
     4849#if 0 // Does not seem to be needed def CBC_THREAD
    48504850            if (parallelMode() > 0 && master_) {
    48514851              // see if any dangling nodes
  • trunk/Cbc/src/CbcNode.cpp

    r2103 r2166  
    23672367                    }
    23682368                    delete [] rowActivity;
    2369                     delete [] solution;
    23702369                    if (!satisfied) {
    23712370#ifdef CLP_INVESTIGATE
     
    23942393                        }
    23952394                    }
     2395                    delete [] solution;
    23962396                }
    23972397            } else if (iPass == 1) {
     
    27132713                    if (20*numberInfeasible + 4*numberFixed < numberNodes) {
    27142714                        // Say never do
    2715                         if (numberBeforeTrust == 5)
     2715                        if (numberBeforeTrust == 10)
    27162716                          skipAll = -1;
    27172717                    }
Note: See TracChangeset for help on using the changeset viewer.