Changeset 674


Ignore:
Timestamp:
Feb 23, 2019 1:35:11 PM (3 months ago)
Author:
stefan
Message:

sync with trunk

Location:
stable/1.8
Files:
5 edited
3 copied

Legend:

Unmodified
Added
Removed
  • stable/1.8

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.1/
        2 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.10.0/CoinUtils
        3 Clp  https://projects.coin-or.org/svn/Clp/releases/1.16.0/Clp
        4 Osi  https://projects.coin-or.org/svn/Osi/releases/0.107.0/Osi
        5 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.59.0/Cgl
        6 Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.9.0/Cbc
        7 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.10/
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.8
         2CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
         3Clp  https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
         4Osi  https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
         5Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.59/Cgl
         6Cbc  https://projects.coin-or.org/svn/Cbc/stable/2.9/Cbc
         7Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        88
        9 
        10 
        11 
    • Property svn:mergeinfo changed
      /trunk (added)merged: 637,​641-642,​654-673
  • stable/1.8/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.rc

    r628 r674  
    5454
    5555VS_VERSION_INFO VERSIONINFO
    56  FILEVERSION 1,7,6,0
    57  PRODUCTVERSION 1,7,6,0
     56 FILEVERSION 1,8,4,0
     57 PRODUCTVERSION 1,8,4,0
    5858 FILEFLAGSMASK 0x17L
    5959#ifdef _DEBUG
     
    7272            VALUE "CompanyName", "Maximal Software, Inc."
    7373            VALUE "FileDescription", "CoinMP Dynamic Link Library"
    74             VALUE "FileVersion", "1, 7, 6, 0"
     74            VALUE "FileVersion", "1, 8, 4, 0"
    7575            VALUE "InternalName", "CoinMP"
    76             VALUE "LegalCopyright", "Copyright (C) 2002-2013"
     76            VALUE "LegalCopyright", "Copyright (C) 2002-2015"
    7777            VALUE "OriginalFilename", "CoinMP.dll"
    7878            VALUE "ProductName", "CoinMP Dynamic Link Library"
    79             VALUE "ProductVersion", "1, 7, 6, 0"
     79            VALUE "ProductVersion", "1, 8, 4, 0"
    8080        END
    8181    END
  • stable/1.8/CoinMP/src/CoinMP.cpp

    r627 r674  
    55/*  File         :  'coinmp.cpp'                                        */
    66/*                                                                      */
    7 /*  Version      :  1.7                                                 */
     7/*  Version      :  1.8                                                 */
    88/*                                                                      */
    99/*  Author       :  Bjarni Kristjansson, Maximal Software               */
    1010/*                                                                      */
    11 /*  Copyright (c) 2002-2013                     Bjarni Kristjansson     */
     11/*  Copyright (c) 2002-2015                     Bjarni Kristjansson     */
    1212/*                                                                      */
    1313/************************************************************************/
     
    3636
    3737
    38 const char*  COINMP_VERSIONSTR = "1.7.6";
    39 const int    COINMP_VERSIONINT = 176;
    40 const double COINMP_VERSIONDBL = 1.76;
     38const char*  COINMP_VERSIONSTR = "1.8.4";
     39const int    COINMP_VERSIONINT = 184;
     40const double COINMP_VERSIONDBL = 1.84;
    4141
    4242const char* COINMP_NAME = "CoinMP";
  • stable/1.8/CoinMP/src/CoinMP.h

    r524 r674  
    55/*  File         :  'coinmp.h'                                          */
    66/*                                                                      */
    7 /*  Version      :  1.7                                                 */
     7/*  Version      :  1.8                                                 */
    88/*                                                                      */
    99/*  Author       :  Bjarni Kristjansson, Maximal Software               */
    1010/*                                                                      */
    11 /*  Copyright (c) 2002-2013                     Bjarni Kristjansson     */
     11/*  Copyright (c) 2002-2015                     Bjarni Kristjansson     */
    1212/*                                                                      */
    1313/************************************************************************/
     
    4343#ifndef SOLV_LINK_LIB
    4444#ifndef SOLV_LINK_DLL
     45#ifndef SOLV_LINK_DYN
    4546#define SOLV_LINK_LIB
     47#endif
    4648#endif
    4749#endif
     
    319321
    320322
    321 #ifdef SOLV_LINK_DLL
     323#if defined(SOLV_LINK_DLL) || defined(SOLV_LINK_DYN)
    322324
    323325int    (SOLVCALL *CoinInitSolver)(const char* LicenseStr);
     
    402404int    (SOLVCALL *CoinGetRowNameBuf)(HPROB hProb, int row, char* RowName, int buflen);
    403405
    404 void   (SOLVCALL *CoinRegisterMsgLogCallback)(HPROB hProb, COIN_MSGLOG_CB MsgLogCB, void* UserParam);
    405 void   (SOLVCALL *CoinRegisterLPIterCallback)(HPROB hProb, COIN_LPITER_CB LPIterCB, void* UserParam);
    406 void   (SOLVCALL *CoinRegisterMipNodeCallback)(HPROB hProb, COIN_MIPNODE_CB MipNodeCB, void* UserParam);
     406int    (SOLVCALL *CoinRegisterMsgLogCallback)(HPROB hProb, COIN_MSGLOG_CB MsgLogCB, void* UserParam);
     407int    (SOLVCALL *CoinRegisterLPIterCallback)(HPROB hProb, COIN_LPITER_CB LPIterCB, void* UserParam);
     408int    (SOLVCALL *CoinRegisterMipNodeCallback)(HPROB hProb, COIN_MIPNODE_CB MipNodeCB, void* UserParam);
    407409
    408410/* Depreciated, use CoinRegisterXxxCallback instead */
    409 void   (SOLVCALL *CoinSetMsgLogCallback)(HPROB hProb, MSGLOGCALLBACK MsgLogCallback);
    410 void   (SOLVCALL *CoinSetIterCallback)(HPROB hProb, ITERCALLBACK IterCallback);
    411 void   (SOLVCALL *CoinSetMipNodeCallback)(HPROB hProb, MIPNODECALLBACK MipNodeCallback);
     411int    (SOLVCALL *CoinSetMsgLogCallback)(HPROB hProb, MSGLOGCALLBACK MsgLogCallback);
     412int    (SOLVCALL *CoinSetIterCallback)(HPROB hProb, ITERCALLBACK IterCallback);
     413int    (SOLVCALL *CoinSetMipNodeCallback)(HPROB hProb, MIPNODECALLBACK MipNodeCallback);
    412414
    413415int    (SOLVCALL *CoinOptimizeProblem)(HPROB hProb, int Method);
     
    430432
    431433
    432 void   (SOLVCALL *CoinReadFile)(HPROB hProb, int FileType, const char* ReadFilename);
    433 void   (SOLVCALL *CoinWriteFile)(HPROB hProb, int FileType, const char* WriteFilename);
    434 
    435 void   (SOLVCALL *CoinOpenLogFile)(HPROB hProb, const char* LogFilename);
    436 void   (SOLVCALL *CoinCloseLogFile)(HPROB hProb);
     434int    (SOLVCALL *CoinReadFile)(HPROB hProb, int FileType, const char* ReadFilename);
     435int    (SOLVCALL *CoinWriteFile)(HPROB hProb, int FileType, const char* WriteFilename);
     436
     437int    (SOLVCALL *CoinOpenLogFile)(HPROB hProb, const char* LogFilename);
     438int    (SOLVCALL *CoinCloseLogFile)(HPROB hProb);
    437439
    438440
Note: See TracChangeset for help on using the changeset viewer.