Changeset 555 for trunk


Ignore:
Timestamp:
Nov 29, 2013 4:13:33 AM (5 years ago)
Author:
bjarni
Message:

Automated getting correct version information from config_coinmp_default.h for trunk 1.7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CoinMP/src/CoinMP.cpp

    r515 r555  
    2828#include "CoinCbc.h"
    2929
    30 
    31 #ifndef COIN_DBL_MAX
    32 #define COIN_DBL_MAX DBL_MAX
    33 #endif
     30#include "config_coinmp_default.h"
    3431
    3532
     
    3936
    4037
    41 #define NEW_STYLE_CBCMAIN
    42 
    43 
    44 const double COINMP_VERSION    = 1.7;
    45 const char*  COINMP_VERSIONSTR = "1.7.1";
    46 const char*  COINMP_NAME       = "CoinMP";
     38#if COINMP_VERSION_MAJOR == 9999
     39const char*  COINMP_VERSIONSTR = "1.7";
     40const int    COINMP_VERSIONINT = 170;
     41const double COINMP_VERSIONDBL = 1.70;
     42#else
     43const char*  COINMP_VERSIONSTR = COINMP_VERSION;
     44const int    COINMP_VERSIONINT = (COINMP_VERSION_MAJOR * 100 + COINMP_VERSION_MINOR * 10 + COINMP_VERSION_RELEASE);
     45const double COINMP_VERSIONDBL = (COINMP_VERSION_MAJOR + COINMP_VERSION_MINOR / 10.0 + COINMP_VERSION_RELEASE / 100.0);
     46#endif
     47
     48const char* COINMP_NAME = "CoinMP";
    4749
    4850
     
    98100SOLVAPI double SOLVCALL CoinGetVersion(void)
    99101{
    100         return COINMP_VERSION;
     102        return COINMP_VERSIONDBL;
    101103}
    102104
     
    105107{
    106108        return SOLV_FEATURE_LP |
    107                         SOLV_FEATURE_MIP;
     109                   SOLV_FEATURE_MIP;
    108110}
    109111
Note: See TracChangeset for help on using the changeset viewer.