Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/examples/CbcBranchLink.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    106#include <cassert>
    117#include <cmath>
     
    139//#define CBC_DEBUG
    1410
     11#include "CoinPragma.hpp"
    1512#include "OsiSolverInterface.hpp"
    1613#include "CbcModel.hpp"
     
    5249    // weights must be increasing
    5350    int i;
    54     double last=-COIN_DBL_MAX;
    55     for (i=0;i<numberMembers_;i++) {
    56       assert (weights_[i]>last+1.0e-12);
    57       last=weights_[i];
    58     }
     51    for (i=0;i<numberMembers_;i++)
     52      assert (i == 0 || weights_[i]>weights_[i-1]+1.0e-12);
    5953    for (i=0;i<numberMembers_*numberLinks_;i++) {
    6054      which_[i]=first+i;
     
    8680    // weights must be increasing
    8781    int i;
    88     double last=-COIN_DBL_MAX;
    89     for (i=0;i<numberMembers_;i++) {
    90       assert (weights_[i]>last+1.0e-12);
    91       last=weights_[i];
    92     }
     82    for (i=0;i<numberMembers_;i++)
     83      assert (i == 0 || weights_[i]>weights_[i-1]+1.0e-12);
    9384    for (i=0;i<numberMembers_*numberLinks_;i++) {
    9485      which_[i]= which[i];
     
    467458// Creates a branching object
    468459CbcBranchingObject *
    469 CbcLink::createBranch(int way)
     460CbcLink::createCbcBranch(OsiSolverInterface * /*solver*/, const OsiBranchingInformation * /*info*/, int way)
    470461{
    471462  int j;
Note: See TracChangeset for help on using the changeset viewer.