Ignore:
Timestamp:
Jun 9, 2006 3:18:19 PM (13 years ago)
Author:
andreasw
Message:

undid last commit (patches incorrectly applied)

File:
1 edited

Legend:

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

    r354 r355  
    146146// Default Constructor
    147147CbcRounding::CbcRounding()
    148   seed_=1;
    149148  :CbcHeuristic()
    150149{
     
    171170CbcHeuristic *
    172171CbcRounding::clone() const
    173 // Create C++ lines to get to current state
    174 void
    175 CbcRounding::generateCpp( FILE * fp)
    176 {
    177   CbcRounding other;
    178   fprintf(fp,"0#include \"CbcHeuristic.hpp\"\n");
    179   fprintf(fp,"3  CbcRounding rounding(*cbcModel);\n");
    180   if (seed_!=other.seed_)
    181     fprintf(fp,"3  rounding.setSeed(%d);\n",seed_);
    182   else
    183     fprintf(fp,"4  rounding.setSeed(%d);\n",seed_);
    184   fprintf(fp,"3  cbcModel->addHeuristic(&rounding);\n");
    185 }
    186172{
    187173  return new CbcRounding(*this);
     
    898884CbcHeuristic *
    899885CbcSerendipity::clone() const
    900 // Create C++ lines to get to current state
    901 void
    902 CbcSerendipity::generateCpp( FILE * fp)
    903 {
    904   fprintf(fp,"0#include \"CbcHeuristic.hpp\"\n");
    905   fprintf(fp,"3  CbcSerendipity serendipity(*cbcModel);\n");
    906   fprintf(fp,"3  cbcModel->addHeuristic(&serendipity);\n");
    907 }
    908886{
    909887  return new CbcSerendipity(*this);
Note: See TracChangeset for help on using the changeset viewer.