Changeset 1734 for stable/2.7/Cbc

Timestamp:

Sep 25, 2011 11:56:05 AM (9 years ago)

Author:

stefan

Message:

allow to keep setting signal handler if CBC_QUIET is defined; now define to >= 2 to not get signal handler

File:

• stable/2.7/Cbc/src/CbcSolver.cpp (modified) (6 diffs)

stable/2.7/Cbc/src/CbcSolver.cpp

@@ -61 +61 @@
 #define GLP_NOFEAS 4
 #define GLP_OPT 5
+#endif
+
+#ifndef CBC_QUIET
+#define CBC_QUIET 0
 #endif
 
@@ -1212 +1216 @@
         // register signal handler
         //CoinSighandler_t saveSignal=signal(SIGINT,signal_handler);
-#ifndef CBC_QUIET
+#if CBC_QUIET < 2
         signal(SIGINT, signal_handler);
 #endif
@@ -1649 +1653 @@
         }
         std::string field;
-#ifndef CBC_QUIET 
+#if CBC_QUIET == 0
         if (!noPrinting_) {
            sprintf(generalPrint,
@@ -2725 +2729 @@
                                    sprintf(generalPrint + strlen(generalPrint), 
                                            "Total iterations:           0\n");
-#ifndef CBC_QUIET 
+#if CBC_QUIET == 0
                                    sprintf(generalPrint + strlen(generalPrint),
                                            "Time (CPU seconds):         %.2f\n", 
@@ -6185 +6189 @@
                                             "Total iterations:               %d\n", 
                                             babModel_->getIterationCount());
-#ifndef CBC_QUIET 
+#if CBC_QUIET == 0
                                     sprintf(generalPrint + strlen(generalPrint), 
                                             "Time (CPU seconds):             %.2f\n",
@@ -8374 +8378 @@
         }
     }
-#ifndef CBC_QUIET 
+#if CBC_QUIET == 0
     sprintf(generalPrint ,
             "Total time (CPU seconds):       %.2f   (Wallclock seconds):       %.2f\n",