Changeset 718 for trunk

Timestamp:

Aug 2, 2007 4:54:05 AM (14 years ago)

Author:

forrest

Message:

fix so will link on Windows

File:

• trunk/Cbc/src/CoinSolve.cpp (modified) (13 diffs)

trunk/Cbc/src/CoinSolve.cpp

@@ -13 +13 @@
 #include <cstring>
 #include <iostream>
+  // define TEST_MESSAGE_HANDLER to check works on all messages
+  //#define TEST_MESSAGE_HANDLER
+#ifdef TEST_MESSAGE_HANDLER
 // This driver shows how to trap messages - this is just as in unitTest.cpp
 // ****** THis code is similar to MyMessageHandler.hpp and MyMessagehandler.cpp
@@ -26 +29 @@
 class CbcModel;
 
-class MyMessageHandler : public CoinMessageHandler {
+class MyMessageHandler2 : public CoinMessageHandler {
   
 public:
@@ -43 +46 @@
   //@{
   /** Default constructor. */
-  MyMessageHandler();
+  MyMessageHandler2();
   /// Constructor with pointer to model
-  MyMessageHandler(CbcModel * model,
+  MyMessageHandler2(CbcModel * model,
                            FILE * userPointer=NULL);
   /** Destructor */
-  virtual ~MyMessageHandler();
+  virtual ~MyMessageHandler2();
   //@}
 
@@ -54 +57 @@
   //@{
   /** The copy constructor. */
-  MyMessageHandler(const MyMessageHandler&);
+  MyMessageHandler2(const MyMessageHandler2&);
   /** The copy constructor from an CoinSimplexMessageHandler. */
-  MyMessageHandler(const CoinMessageHandler&);
+  MyMessageHandler2(const CoinMessageHandler&);
   
-  MyMessageHandler& operator=(const MyMessageHandler&);
+  MyMessageHandler2& operator=(const MyMessageHandler2&);
   /// Clone
   virtual CoinMessageHandler * clone() const ;
@@ -81 +84 @@
 // Default Constructor 
 //-------------------------------------------------------------------
-MyMessageHandler::MyMessageHandler () 
+MyMessageHandler2::MyMessageHandler2 () 
   : CoinMessageHandler(),
     model_(NULL)
@@ -90 +93 @@
 // Copy constructor 
 //-------------------------------------------------------------------
-MyMessageHandler::MyMessageHandler (const MyMessageHandler & rhs) 
+MyMessageHandler2::MyMessageHandler2 (const MyMessageHandler2 & rhs) 
 : CoinMessageHandler(rhs),
     model_(rhs.model_)
@@ -96 +99 @@
 }
 
-MyMessageHandler::MyMessageHandler (const CoinMessageHandler & rhs) 
+MyMessageHandler2::MyMessageHandler2 (const CoinMessageHandler & rhs) 
   : CoinMessageHandler(),
     model_(NULL)
@@ -103 +106 @@
 
 // Constructor with pointer to model
-MyMessageHandler::MyMessageHandler(CbcModel * model,
+MyMessageHandler2::MyMessageHandler2(CbcModel * model,
                FILE * userPointer)
   : CoinMessageHandler(),
@@ -113 +116 @@
 // Destructor 
 //-------------------------------------------------------------------
-MyMessageHandler::~MyMessageHandler ()
+MyMessageHandler2::~MyMessageHandler2 ()
 {
 }
@@ -120 +123 @@
 // Assignment operator 
 //-------------------------------------------------------------------
-MyMessageHandler &
-MyMessageHandler::operator=(const MyMessageHandler& rhs)
+MyMessageHandler2 &
+MyMessageHandler2::operator=(const MyMessageHandler2& rhs)
 {
   if (this != &rhs) {
@@ -132 +135 @@
 // Clone
 //-------------------------------------------------------------------
-CoinMessageHandler * MyMessageHandler::clone() const
-{
-  return new MyMessageHandler(*this);
+CoinMessageHandler * MyMessageHandler2::clone() const
+{
+  return new MyMessageHandler2(*this);
 }
 int 
-MyMessageHandler::print()
+MyMessageHandler2::print()
 {
   // Just add ==
@@ -145 +148 @@
 }
 const CbcModel *
-MyMessageHandler::model() const
+MyMessageHandler2::model() const
 {
   return model_;
 }
 void 
-MyMessageHandler::setModel(CbcModel * model)
+MyMessageHandler2::setModel(CbcModel * model)
 {
   model_ = model;
 }
+#endif
 //#############################################################################
 // To use USERCBC or USERCLP change 0 to 1 in defines and add in your fake main program(s) and any other code
@@ -191 +195 @@
   OsiClpSolverInterface solver1;
   CbcModel model(solver1);
-  // define TEST_MESSAGE_HANDLER to check works on all messages
-  //#define TEST_MESSAGE_HANDLER
+  // define TEST_MESSAGE_HANDLER at top of file to check works on all messages
 #ifdef TEST_MESSAGE_HANDLER
-  MyMessageHandler messageHandler(&model);
+  MyMessageHandler2 messageHandler(&model);
   std::cout<<"Testing derived message handler"<<std::endl;
   model.passInMessageHandler(&messageHandler);