Changeset 2208


Ignore:
Timestamp:
Jul 7, 2015 5:16:56 PM (3 years ago)
Author:
stefan
Message:

merge r2207 from trunk

Location:
stable/2.9/Cbc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc

  • stable/2.9/Cbc/src

  • stable/2.9/Cbc/src/CbcSymmetry.cpp

    r2206 r2208  
    5252static double nautyOtherBranches_ = 0.0;
    5353
    54 void Node::node(int i, double c , double l, double u, int cod, int s){
     54void CbcSymmetry::Node::node(int i, double c , double l, double u, int cod, int s){
    5555  index = i;
    5656  coeff = c;
  • stable/2.9/Cbc/src/CbcSymmetry.hpp

    r2092 r2208  
    5454class CbcNauty;
    5555
     56
     57
     58#define COUENNE_HACKED_EPS      1.e-07
     59#define COUENNE_HACKED_EPS_SYMM 1e-8
     60#define COUENNE_HACKED_EXPRGROUP 8
     61
     62
     63/** Class to deal with symmetry
     64 *
     65 *  Hacked from Couenne
     66 *  Thanks, but it had been nice to make sure that there are no symbol collisions when building Couenne with this Cbc.
     67 */
     68
     69class CbcSymmetry {
    5670  class Node{
    5771    int index;
     
    7589  };
    7690
    77 #define COUENNE_HACKED_EPS      1.e-07
    78 #define COUENNE_HACKED_EPS_SYMM 1e-8
    79 #define COUENNE_HACKED_EXPRGROUP 8
    80 
    8191  struct myclass0 {
    8292    inline bool operator() (register const Node &a, register const Node &b) {
     
    106116  {return strcmp (a, b) < 0;}
    107117};
    108 
    109 /** Class to deal with symmetry
    110  *
    111  *  Hacked from Couenne
    112  */
    113 
    114 class CbcSymmetry {
    115118
    116119 public:
Note: See TracChangeset for help on using the changeset viewer.