Changeset 1404 for branches


Ignore:
Timestamp:
Dec 16, 2009 6:04:18 AM (9 years ago)
Author:
forrest
Message:

preliminary changes for cleaning up threads and smaller CbcModel? methods

Location:
branches/sandbox/Cbc/src
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/CbcSolver.cpp

    r1398 r1404  
    74607460                                        // unbounded
    74617461                                        fprintf(fp, "Unbounded" );
    7462                                     } else if (iStat == 3) {
    7463                                         fprintf(fp, "Stopped on iterations or time" );
    7464                                     } else if (iStat == 4) {
    7465                                         fprintf(fp, "Stopped on difficulties" );
    7466                                     } else if (iStat == 5) {
    7467                                         fprintf(fp, "Stopped on ctrl-c" );
     7462                                    } else if (iStat >= 3&&iStat <= 5) {
     7463                                        if (iStat==3)
     7464                                            fprintf(fp, "Stopped on iterations or time" );
     7465                                      else if (iStat == 4)
     7466                                        fprintf(fp, "Stopped on difficulties" );
     7467                                      else 
     7468                                        fprintf(fp, "Stopped on ctrl-c" );
     7469                                      if (babModel_&&!babModel_->bestSolution())
     7470                                        fprintf(fp," (no integer solution - continuous used)");
    74687471                                    } else if (iStat == 6) {
    74697472                                        // bab infeasible
  • branches/sandbox/Cbc/src/Makefile.am

    r1399 r1404  
    8989        CbcStrategy.cpp CbcStrategy.hpp \
    9090        CbcSubProblem.cpp CbcSubProblem.hpp \
     91        CbcThread.cpp CbcThread.hpp \
    9192        CbcTree.cpp CbcTree.hpp \
    9293        CbcTreeLocal.cpp CbcTreeLocal.hpp
  • branches/sandbox/Cbc/src/Makefile.in

    r1399 r1404  
    184184        CbcSimpleInteger.lo CbcSimpleIntegerDynamicPseudoCost.lo \
    185185        CbcSimpleIntegerPseudoCost.lo CbcSOS.lo CbcStatistics.lo \
    186         CbcStrategy.lo CbcSubProblem.lo CbcTree.lo CbcTreeLocal.lo
     186        CbcStrategy.lo CbcSubProblem.lo CbcThread.lo CbcTree.lo \
     187        CbcTreeLocal.lo
    187188libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    188189libCbcSolver_la_LIBADD =
     
    588589        CbcStrategy.cpp CbcStrategy.hpp \
    589590        CbcSubProblem.cpp CbcSubProblem.hpp \
     591        CbcThread.cpp CbcThread.hpp \
    590592        CbcTree.cpp CbcTree.hpp \
    591593        CbcTreeLocal.cpp CbcTreeLocal.hpp
     
    966968@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStrategy.Plo@am__quote@
    967969@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSubProblem.Plo@am__quote@
     970@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcThread.Plo@am__quote@
    968971@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcTree.Plo@am__quote@
    969972@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcTreeLocal.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.