Changeset 1024 for stable/2.2


Ignore:
Timestamp:
Jul 26, 2008 10:12:47 PM (10 years ago)
Author:
ladanyi
Message:

fixed externals and removed references to the DINS heur as the source of that is not yet checked in

Location:
stable/2.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.2

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
        2 ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        44ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
        6 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
        7 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        8 Cgl           https://projects.coin-or.org/svn/Cgl/trunk/Cgl
        9 Clp           https://projects.coin-or.org/svn/Clp/trunk/Clp
        10 Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi
        11 Vol           https://projects.coin-or.org/svn/Vol/trunk/Vol
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.3
         6Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
         7CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.3/CoinUtils
         8Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.53/Cgl
         9Clp               https://projects.coin-or.org/svn/Clp/stable/1.8/Clp
         10Osi               https://projects.coin-or.org/svn/Osi/stable/0.99/Osi
         11Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • stable/2.2/Cbc/src/CbcSolver.cpp

    r1020 r1024  
    509509  parameters_[whichParam(COMBINE,numberParameters_,parameters_)].setCurrentOption("on");
    510510  parameters_[whichParam(RINS,numberParameters_,parameters_)].setCurrentOption("off");
    511   parameters_[whichParam(DINS,numberParameters_,parameters_)].setCurrentOption("off");
    512511  parameters_[whichParam(RENS,numberParameters_,parameters_)].setCurrentOption("off");
    513512  parameters_[whichParam(LOCALTREE,numberParameters_,parameters_)].setCurrentOption("off");
     
    32073206  parameters[whichParam(COMBINE,numberParameters,parameters)].setCurrentOption("on");
    32083207  parameters[whichParam(RINS,numberParameters,parameters)].setCurrentOption("off");
    3209   parameters[whichParam(DINS,numberParameters,parameters)].setCurrentOption("off");
    32103208  parameters[whichParam(RENS,numberParameters,parameters)].setCurrentOption("off");
    32113209  parameters[whichParam(LOCALTREE,numberParameters,parameters)].setCurrentOption("off");
     
    32363234  int useRINS = parameters_[whichParam(RINS,numberParameters_,parameters_)].currentOptionAsInteger();
    32373235  int useRENS = parameters_[whichParam(RENS,numberParameters_,parameters_)].currentOptionAsInteger();
    3238   int useDINS = parameters_[whichParam(DINS,numberParameters_,parameters_)].currentOptionAsInteger();
    32393236  int useDIVING2 = parameters_[whichParam(DIVINGS,numberParameters_,parameters_)].currentOptionAsInteger();
    32403237  // FPump done first as it only works if no solution
     
    33813378      heuristic5.setDecayFactor(1.5);
    33823379    model->addHeuristic(&heuristic5) ;
    3383     anyToDo=true;
    3384   }
    3385   if (useDINS>=kType) {
    3386     CbcHeuristicDINS heuristic5a(*model);
    3387     heuristic5a.setHeuristicName("DINS");
    3388     heuristic5a.setFractionSmall(0.6);
    3389     if (useDINS==1)
    3390       heuristic5a.setDecayFactor(5.0);
    3391     else
    3392       heuristic5a.setDecayFactor(1.5);
    3393     heuristic5a.setNumberNodes(1000);
    3394     model->addHeuristic(&heuristic5a) ;
    33953380    anyToDo=true;
    33963381  }
     
    46954680              break;
    46964681            case RINS:
    4697               break;
    4698             case DINS:
    46994682              break;
    47004683            case RENS:
  • stable/2.2/Externals

    r772 r1024  
    1 BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
    2 ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
    3 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
     2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
     3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    44ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
    5 ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
    6 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
    7 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    8 Cgl           https://projects.coin-or.org/svn/Cgl/trunk/Cgl
    9 Clp           https://projects.coin-or.org/svn/Clp/trunk/Clp
    10 Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi
    11 Vol           https://projects.coin-or.org/svn/Vol/trunk/Vol
     5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.3
     6Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
     7CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.3/CoinUtils
     8Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.53/Cgl
     9Clp               https://projects.coin-or.org/svn/Clp/stable/1.8/Clp
     10Osi               https://projects.coin-or.org/svn/Osi/stable/0.99/Osi
     11Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
Note: See TracChangeset for help on using the changeset viewer.