Changes from stable/2.9/Cbc/src/CbcSymmetry.cpp at r2208 to trunk/Cbc/src/CbcSymmetry.cpp at r2092

File:

• trunk/Cbc/src/CbcSymmetry.cpp (modified) (3 diffs)

trunk/Cbc/src/CbcSymmetry.cpp

@@ -10 +10 @@
  */
 //#define PRINT_MORE 1
-
-#include "CbcConfig.h"
+#include <stdio.h>
 
 #ifdef COIN_HAS_NTY
 
-extern "C" {
-#include "nauty.h"
-#include "nausparse.h"
-#ifdef NTY_TRACES
-#include "traces.h"
-#endif
-}
-
-#include <stdio.h>
 #include <cassert>
 #include <vector>
@@ -33 +23 @@
 #include "CbcBranchingObject.hpp"
 #include "CoinTime.hpp"
-#define NAUTY_MAX_LEVEL 0
+#define NAUTY_MAX_LEVEL 2000
 #if NAUTY_MAX_LEVEL
 extern int nauty_maxalllevel;
@@ -52 +42 @@
 static double nautyOtherBranches_ = 0.0;
 
-void CbcSymmetry::Node::node(int i, double c , double l, double u, int cod, int s){
+void Node::node(int i, double c , double l, double u, int cod, int s){
   index = i;
   coeff = c;