Changes from releases/5.6.11 at r2707 to releases/5.6.12 at r2707


Ignore:
Location:
releases/5.6.12
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • releases/5.6.12/README.md

    r2707 r2707  
    1 # SYMPHONY Version 5.6.11 README
     1# SYMPHONY Version 5.6.10 README
    22
    33Welcome to SYMPHONY. SYMPHONY is distributed under the Eclipse Public License
     
    229229## CHANGELOG
    230230
    231 ### Release 5.6.11
    232   * Updating dependencies
    233 
    234231### Release 5.6.10
    235232  * Fixed bug with using more the 1 process in PVM
  • releases/5.6.12/SYMPHONY

  • releases/5.6.12/SYMPHONY/Applications/Makefile.Applications.in

    r2707 r2707  
    5252XPRESS_LP_SOLVER = @XPRESS_LP_SOLVER_TRUE@TRUE
    5353SYM_PARALLEL = @SYM_PARALLEL_TRUE@TRUE
     54CHECK_CUT_VALIDITY = @CHECK_CUT_VALIDITY_TRUE@TRUE
    5455USE_GMPL = @USE_GMPL_TRUE@TRUE
    5556MASTEREXT = @MASTEREXT@
     
    145146endif
    146147
     148ifeq ($(CHECK_CUT_VALIDITY),TRUE)
     149CFLAGS += -DCHECK_CUT_VALIDITY
     150endif
     151
    147152# C++ Compiler command
    148153CXX = @CXX@
  • releases/5.6.12/SYMPHONY/Doc/man.tex

    r2707 r2707  
    9797\def\CP{{Cut Pool Parameters}}
    9898\def\CGP{{Cut Generator Parameters}}
    99 \def\VER{{5.6.11}}
     99\def\VER{{5.6.10}}
    100100\lstloadlanguages{C++}
    101101
  • releases/5.6.12/SYMPHONY/README

    r2707 r2707  
    1 SYMPHONY Version 5.6.11 README
     1SYMPHONY Version 5.6.10 README
    22=============================
    33
     
    246246==========
    247247
    248 # Release 5.6.11
    249   * Updating dependencies
    250 
    251248# Release 5.6.10
    252249  * Fixed bug with using more the 1 process in PVM
  • releases/5.6.12/SYMPHONY/configure

    r2707 r2707  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.11.
     3# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.12.
    44#
    55# Report bugs to <symphony@list.coin-or.org>.
     
    1717# /* Laci Ladanyi (ladanyi@us.ibm.com).                                        */
    1818# /*                                                                           */
    19 # /* (c) Copyright 2000-2014 Ted Ralphs. All Rights Reserved.                  */
     19# /* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved.                  */
    2020# /*                                                                           */
    2121# /* This software is licensed under the Eclipse Public License. Please see    */
     
    440440PACKAGE_NAME='SYMPHONY'
    441441PACKAGE_TARNAME='symphony'
    442 PACKAGE_VERSION='5.6.11'
    443 PACKAGE_STRING='SYMPHONY 5.6.11'
     442PACKAGE_VERSION='5.6.12'
     443PACKAGE_STRING='SYMPHONY 5.6.12'
    444444PACKAGE_BUGREPORT='symphony@list.coin-or.org'
    445445
     
    10161016  # This message is too long to be a string in the A/UX 3.1 sh.
    10171017  cat <<_ACEOF
    1018 \`configure' configures SYMPHONY 5.6.11 to adapt to many kinds of systems.
     1018\`configure' configures SYMPHONY 5.6.12 to adapt to many kinds of systems.
    10191019
    10201020Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10821082if test -n "$ac_init_help"; then
    10831083  case $ac_init_help in
    1084      short | recursive ) echo "Configuration of SYMPHONY 5.6.11:";;
     1084     short | recursive ) echo "Configuration of SYMPHONY 5.6.12:";;
    10851085   esac
    10861086  cat <<\_ACEOF
     
    13361336if $ac_init_version; then
    13371337  cat <<\_ACEOF
    1338 SYMPHONY configure 5.6.11
     1338SYMPHONY configure 5.6.12
    13391339generated by GNU Autoconf 2.59
    13401340
     
    13511351/* Laci Ladanyi (ladanyi@us.ibm.com).                                        */
    13521352/*                                                                           */
    1353 /* (c) Copyright 2000-2014 Ted Ralphs. All Rights Reserved.                  */
     1353/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved.                  */
    13541354/*                                                                           */
    13551355/* This software is licensed under the Eclipse Public License. Please see    */
     
    13661366running configure, to aid debugging if configure makes a mistake.
    13671367
    1368 It was created by SYMPHONY $as_me 5.6.11, which was
     1368It was created by SYMPHONY $as_me 5.6.12, which was
    13691369generated by GNU Autoconf 2.59.  Invocation command line was
    13701370
     
    18921892
    18931893# Capture libtool library version, if given.
    1894  coin_libversion=9:11:6
     1894 coin_libversion=9:12:6
    18951895
    18961896
     
    41274127fi
    41284128
    4129 # correct the LD variable in a build with MS or intel compiler
     4129# correct the LD variable in a build with MS or Intel-windows compiler
    41304130case "$CXX" in
    41314131  clang* ) ;;
     
    46214621# Define the identity of the package.
    46224622 PACKAGE='symphony'
    4623  VERSION='5.6.11'
     4623 VERSION='5.6.12'
    46244624
    46254625
     
    2996729967cat >&5 <<_CSEOF
    2996829968
    29969 This file was extended by SYMPHONY $as_me 5.6.11, which was
     29969This file was extended by SYMPHONY $as_me 5.6.12, which was
    2997029970generated by GNU Autoconf 2.59.  Invocation command line was
    2997129971
     
    3003030030cat >>$CONFIG_STATUS <<_ACEOF
    3003130031ac_cs_version="\\
    30032 SYMPHONY config.status 5.6.11
     30032SYMPHONY config.status 5.6.12
    3003330033configured by $0, generated by GNU Autoconf 2.59,
    3003430034  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.12/SYMPHONY/configure.ac

    r2707 r2707  
    2323AC_PREREQ(2.59)
    2424
    25 AC_INIT([SYMPHONY],[5.6.11],[symphony@list.coin-or.org])
     25AC_INIT([SYMPHONY],[5.6.12],[symphony@list.coin-or.org])
    2626
    2727AC_COPYRIGHT([
     
    3333/* Laci Ladanyi (ladanyi@us.ibm.com).                                        */
    3434/*                                                                           */
    35 /* (c) Copyright 2000-2014 Ted Ralphs. All Rights Reserved.                  */
     35/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved.                  */
    3636/*                                                                           */
    3737/* This software is licensed under the Eclipse Public License. Please see    */
     
    6262# externals.  The following macro ensures that those externals are
    6363# retrieved by svn if they are not there yet.
    64 AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:11:6)
     64AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:12:6)
    6565
    6666# Check if user wants to produce debugging code
  • releases/5.6.12/SYMPHONY/include/config_sym_default.h

    r2707 r2707  
    66
    77/* Version number of project */
    8 #define SYMPHONY_VERSION "5.6.11"
     8#define SYMPHONY_VERSION "5.6.12"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define SYMPHONY_VERSION_RELEASE 11
     17#define SYMPHONY_VERSION_RELEASE 12
    1818
    1919
  • releases/5.6.12/SYMPHONY/include/sym_lp_params.h

    r2707 r2707  
    101101   int               find_first_feasible;
    102102   double            time_limit;
     103   int               debug_lp;
    103104
    104105   int               lp_data_mip_is_copied;
  • releases/5.6.12/SYMPHONY/include/sym_lp_solver.h

    r2707 r2707  
    302302int read_lp PROTO((MIPdesc *mip, char *infile, char *probname, int verbosity));
    303303void write_mps PROTO((LPdata *lp_data, char *fname));
     304void write_lp  PROTO((LPdata *lp_data, char *fname));
    304305void write_mip_desc_mps PROTO((MIPdesc *mip, char *fname));
    305306void write_mip_desc_lp PROTO((MIPdesc *mip, char *fname));
  • releases/5.6.12/SYMPHONY/include/symphony.h

    r2707 r2707  
    194194void sym_version PROTO((void));
    195195sym_environment *sym_open_environment PROTO((void));
     196int sym_close_environment PROTO((sym_environment *env));
     197int sym_reset_environment PROTO((sym_environment *env));
    196198int sym_set_defaults PROTO((sym_environment *env));
    197199int sym_parse_command_line PROTO((sym_environment *env, int argc,
     
    214216
    215217int sym_create_permanent_cut_pools PROTO((sym_environment *env, int *cp_num));
    216 int sym_close_environment PROTO((sym_environment *env));
    217218int sym_explicit_load_problem PROTO((sym_environment *env, int numcols,
    218219                                     int numrows, int *start, int *index,
  • releases/5.6.12/SYMPHONY/src/CutGen/cg_wrapper.c

    r2707 r2707  
    131131
    132132    default:
     133       {
    133134#ifdef USE_SYM_APPLICATION
    134135      CALL_USER_FUNCTION( user_check_validity_of_cut(p->user, new_cut) );
    135136#endif
     137       }
    136138   }
    137139   return(FUNCTION_TERMINATED_NORMALLY);
  • releases/5.6.12/SYMPHONY/src/LP/lp_branch.c

    r2707 r2707  
    1 
    21/*===========================================================================*/
    32/*                                                                           */
     
    728727         }
    729728#endif
    730          //max_presolve_iter = MAX(max_presolve_iter, 25);
    731          max_presolve_iter = 40;
     729         max_presolve_iter = MAX(max_presolve_iter, 40);
     730         //max_presolve_iter = 40;
    732731         if(p->par.rs_mode_enabled) max_presolve_iter = 5;
    733732
     
    847846            }
    848847            if (down_status == LP_D_INFEASIBLE || down_status == LP_D_OBJLIM ||
    849                 down_status == LP_D_UNBOUNDED) {
     848                down_status == LP_D_UNBOUNDED ||
     849                (p->has_ub && down_obj > p->ub - p->par.granularity + p->lp_data->lpetol)) {
    850850               // update bounds
    851851               bnd_val[num_bnd_changes] = ceilx;
    852852               bnd_sense[num_bnd_changes] = 'G';
    853853               bnd_ind[num_bnd_changes] = branch_var;
     854               if (p->mip->colname){
     855                  PRINT(p->par.verbosity, 5,
     856                        ("Fixing variable index %i (%s) to 1 \n", branch_var,
     857                         p->mip->colname[p->lp_data->vars[branch_var]->userind]));
     858               }
    854859               num_bnd_changes++;
    855860               change_lbub(lp_data, branch_var, ceilx, ub);
     
    894899            up_is_est = FALSE;
    895900            if (up_status == LP_D_INFEASIBLE || up_status == LP_D_OBJLIM ||
    896                 up_status == LP_D_UNBOUNDED) {
     901                up_status == LP_D_UNBOUNDED ||
     902                (p->has_ub && up_obj > p->ub - p->par.granularity + p->lp_data->lpetol)) {
    897903               // update bounds
    898904               bnd_val[num_bnd_changes] = floorx;
    899905               bnd_sense[num_bnd_changes] = 'L';
    900906               bnd_ind[num_bnd_changes] = branch_var;
     907               if (p->mip->colname){
     908                  PRINT(p->par.verbosity, 5,
     909                        ("Fixing variable index %i (%s) to 1 \n", branch_var,
     910                         p->mip->colname[p->lp_data->vars[branch_var]->userind]));
     911               }
    901912               num_bnd_changes++;
    902913               change_lbub(lp_data, branch_var, lb, floorx);
     
    14521463      FREE(down_violation_cnt);
    14531464      FREE(violation_col_size);
    1454      
    1455       if (both_children_inf == TRUE) {
     1465
     1466      if (both_children_inf || num_bnd_changes > 0) {
    14561467         FREE(best_can);
    14571468         FREE(candidates);
    14581469         *candidate = NULL;
    1459          p->lp_stat.str_br_nodes_pruned++;
    14601470         if (should_use_hot_starts && unmark_hs){
    14611471            unmark_hotstart(lp_data);
     
    14651475         }
    14661476         set_itlim(lp_data, -1); //both limits should be set for hotstarts
    1467          return (DO_NOT_BRANCH__FATHOMED);
     1477         if (both_children_inf){
     1478            p->lp_stat.str_br_nodes_pruned++;
     1479            return (DO_NOT_BRANCH__FATHOMED);
     1480         }else{
     1481            return (DO_NOT_BRANCH);
     1482         }
    14681483      }
    14691484
     
    19982013   node_desc *desc;
    19992014   int termcode;
     2015   bc_node *node = p->tm->active_nodes[p->proc_index];
     2016   branch_obj *bobj = &node->bobj;
    20002017   
    20012018   termcode = select_branching_object(p, &cuts, &can);
     
    20462063
    20472064   desc = p->desc;
    2048    switch (can->type){
     2065   switch (bobj->type){
    20492066    case CANDIDATE_VARIABLE:
    2050       p->branch_var = can->position;
    2051       p->branch_dir = can->sense[keep];
    2052       var = lp_data->vars[branch_var = can->position];
    2053       switch (can->sense[keep]){
     2067      p->branch_var = bobj->position;
     2068      p->branch_dir = bobj->sense[keep];
     2069      var = lp_data->vars[branch_var = bobj->position];
     2070      switch (bobj->sense[keep]){
    20542071       case 'E':
    2055          var->new_lb = var->new_ub = can->rhs[keep];
    2056          var->lb = var->ub = can->rhs[keep];                             break;
     2072         var->new_lb = var->new_ub = bobj->rhs[keep];
     2073         var->lb = var->ub = bobj->rhs[keep];                             break;
    20572074       case 'R':
    2058          var->new_lb = can->rhs[keep];
    2059          var->new_ub = var->lb + can->range[keep];
    2060          var->lb = can->rhs[keep]; var->ub = var->lb + can->range[keep]; break;
     2075         var->new_lb = bobj->rhs[keep];
     2076         var->new_ub = var->lb + bobj->range[keep];
     2077         var->lb = bobj->rhs[keep]; var->ub = var->lb + bobj->range[keep]; break;
    20612078       case 'L':
    2062          var->new_ub = can->rhs[keep];
    2063          var->ub = can->rhs[keep];                                       break;
     2079         var->new_ub = bobj->rhs[keep];
     2080         var->ub = bobj->rhs[keep];                                       break;
    20642081       case 'G':
    2065          var->new_lb = can->rhs[keep];
    2066          var->lb = can->rhs[keep];                                       break;
    2067       }
    2068       //printf("branching on %i %c %f %f\n", branch_var, can->sense[keep], var->lb, var->ub);
    2069       change_col(lp_data, branch_var, can->sense[keep], var->lb, var->ub);
     2082         var->new_lb = bobj->rhs[keep];
     2083         var->lb = bobj->rhs[keep];                                       break;
     2084      }
     2085      //printf("branching on %i %c %f %f\n", branch_var, bobj->sense[keep], var->lb, var->ub);
     2086      change_col(lp_data, branch_var, bobj->sense[keep], var->lb, var->ub);
    20702087      lp_data->status[branch_var] |= VARIABLE_BRANCHED_ON;
    20712088      break;
    20722089    case SOS1_IMPLICIT:
    2073       for(int j = 0; j < can->sos_cnt[keep]; j++){
    2074          branch_var = can->sos_ind[keep][j];
     2090      for(int j = 0; j < bobj->sos_cnt[keep]; j++){
     2091         branch_var = bobj->sos_ind[keep][j];
    20752092         change_ub(lp_data, branch_var, 0.0);
    20762093         lp_data->vars[branch_var]->new_ub = 0.0;
     
    20822099      break;
    20832100    case CANDIDATE_CUT_IN_MATRIX:
    2084       branch_row = can->position;
     2101      branch_row = bobj->position;
    20852102      cut = lp_data->rows[branch_row].cut;
    20862103      /* To maintain consistency with TM we have to fix a few more things if
     
    21462163         }
    21472164      }
    2148       cut->rhs = can->rhs[keep];
    2149       if ((cut->sense = can->sense[keep]) == 'R')
    2150          cut->range = can->range[keep];
    2151       cut->branch = CUT_BRANCHED_ON | can->branch[keep];
     2165      cut->rhs = bobj->rhs[keep];
     2166      if ((cut->sense = bobj->sense[keep]) == 'R')
     2167         cut->range = bobj->range[keep];
     2168      cut->branch = CUT_BRANCHED_ON | bobj->branch[keep];
    21522169      constrain_row_set(lp_data, 1, &branch_row);
    21532170      lp_data->rows[branch_row].free = FALSE;
  • releases/5.6.12/SYMPHONY/src/LP/lp_genfunc.c

    r2707 r2707  
    321321      p->bound_changes_in_iter = 0;
    322322
     323      if (!rs_mode_enabled && p->par.debug_lp){
     324         char name[50] = "";
     325         sprintf(name, "matrix.%i.%i", p->bc_index, p->iter_num);
     326         write_lp(lp_data, name);
     327      }
    323328      if ((p->iter_num < 2 && (p->par.should_warmstart_chain == FALSE ||
    324329                               p->bc_level < 1))) {
  • releases/5.6.12/SYMPHONY/src/LP/lp_solver.c

    r2707 r2707  
    36253625
    36263626   si->writeMps(fname, extension, ObjSense);
     3627}
     3628
     3629/*===========================================================================*/
     3630
     3631void write_lp(LPdata *lp_data, char *fname)
     3632{
     3633   const char * extension = "LP";
     3634   OsiXSolverInterface  *si = lp_data->si;
     3635   double ObjSense = si->getObjSense();
     3636   int i;
     3637   
     3638   for (i = 0; i < lp_data->n; i++) {
     3639      si->setContinuous(i);
     3640   }
     3641
     3642   si->writeLp(fname, extension);
    36273643}
    36283644
  • releases/5.6.12/SYMPHONY/src/Master/master.c

    r2707 r2707  
    150150
    151151}   
     152
     153/*===========================================================================*/
     154/*===========================================================================*/
     155
     156int sym_close_environment(sym_environment *env)
     157{
     158   int termcode = 0;
     159   
     160   CALL_WRAPPER_FUNCTION( free_master_u(env) );
     161
     162   FREE(env);
     163
     164#if (!defined(COMPILE_IN_TM) || !defined(COMPILE_IN_LP) ||                   \
     165    !defined(COMPILE_IN_CG) || !defined(COMPILE_IN_CP)) && defined(__PVM__)
     166   pvm_catchout(0);
     167   comm_exit();
     168#endif
     169
     170   return(termcode);
     171}
     172
     173/*===========================================================================*/
     174/*===========================================================================*/
     175
     176int sym_reset_environment(sym_environment *env)
     177{
     178   int termcode = 0, my_tid = env->my_tid;
     179   //params par = env->par;
     180   
     181   int obj_sense = env->mip->obj_sense;
     182   
     183   CALL_WRAPPER_FUNCTION( free_master_u(env) );
     184
     185#if (!defined(COMPILE_IN_TM) || !defined(COMPILE_IN_LP) ||                   \
     186    !defined(COMPILE_IN_CG) || !defined(COMPILE_IN_CP)) && defined(__PVM__)
     187   pvm_catchout(0);
     188#endif
     189   
     190   //memset(env, 0, sizeof(sym_environment));
     191
     192   //env->my_tid = my_tid;
     193   //env->par = par;
     194   env->par.tm_par.granularity = env->par.lp_par.granularity = 1e-7;
     195
     196   env->mip = (MIPdesc *) calloc(1, sizeof(MIPdesc));
     197
     198   env->mip->obj_sense = obj_sense;
     199
     200   return(FUNCTION_TERMINATED_NORMALLY);
     201}
    152202
    153203/*===========================================================================*/
     
    260310   /************************** lp defaults ***********************************/
    261311   lp_par->verbosity = 0;
     312   lp_par->debug_lp = FALSE;
    262313   lp_par->granularity = tm_par->granularity;
    263314   lp_par->use_cg = tm_par->use_cg;
     
    705756   (void) used_time(&t);
    706757
     758   sym_reset_environment(env);
     759
    707760   /* Get the problem data */
    708761   CALL_WRAPPER_FUNCTION( io_u(env) );
     
    25862639/*===========================================================================*/
    25872640
    2588 int sym_close_environment(sym_environment *env)
    2589 {
    2590    int termcode = 0;
    2591    
    2592    CALL_WRAPPER_FUNCTION( free_master_u(env) );
    2593 
    2594    FREE(env);
    2595 
    2596 #if (!defined(COMPILE_IN_TM) || !defined(COMPILE_IN_LP) ||                   \
    2597     !defined(COMPILE_IN_CG) || !defined(COMPILE_IN_CP)) && defined(__PVM__)
    2598    pvm_catchout(0);
    2599    comm_exit();
    2600 #endif
    2601 
    2602    return(termcode);
    2603 }
    2604 
    2605 /*===========================================================================*/
    2606 /*===========================================================================*/
    2607 
    26082641int sym_explicit_load_problem(sym_environment *env, int numcols, int numrows,
    26092642                              int *start, int *index, double *value,         
     
    26242657   (void)used_time(&t);
    26252658   
     2659   sym_reset_environment(env);
     2660
    26262661   env->mip->m  = numrows;
    26272662   env->mip->n  = numcols;
     
    54605495      *value = lp_par->verbosity;
    54615496   }
     5497   else if (strcmp(key, "debug_lp") == 0 ||
     5498       strcmp(key, "LP_debug_lp") == 0){
     5499      *value = lp_par->debug_lp;
     5500   }
    54625501   else if (strcmp(key, "set_obj_upper_lim") == 0 ||
    54635502            strcmp(key, "LP_set_obj_upper_lim") == 0){
     
    65966635  for(i = 0; i<file_num; i++){
    65976636
    6598 #if 0
    6599     if(env->mip->n){
    6600        free_master_u(env);
    6601        strcpy(env->par.infile, "");
    6602        env->mip = (MIPdesc *) calloc(1, sizeof(MIPdesc));
    6603     }
    6604 #endif
    6605    
    6606     sym_close_environment(env);
    6607     env = sym_open_environment();
    6608     sym_parse_command_line(env, argc, argv);
    6609    
    66106637    strcpy(infile, "");
    66116638    if (dirsep == '/')
  • releases/5.6.12/SYMPHONY/src/Master/master_func.c

    r2707 r2707  
    989989   
    990990   if(env->mip->var_type_modified == TRUE) {
    991       for(i = root->sol_size; i >=0; i++){
     991      for(i = root->sol_size-1; i >=0; i--){
    992992         if(mip->is_int[root->sol_ind[i]]){
    993993            valuesi = root->sol[i];
     
    23242324      return(0);
    23252325   }
     2326   else if (strcmp(key, "debug_lp") == 0 ||
     2327            strcmp(key, "LP_debug_lp") == 0){
     2328      READ_INT_PAR(lp_par->debug_lp);
     2329      return(0);
     2330   }
    23262331   else if (strcmp(key, "set_obj_upper_lim") == 0 ||
    23272332            strcmp(key, "LP_set_obj_upper_lim") == 0){
  • releases/5.6.12/configure

    r2707 r2707  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.11.
     4# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.12.
    55#
    66# Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>.
     
    1818# /* Laci Ladanyi (ladanyi@us.ibm.com).                                        */
    1919# /*                                                                           */
    20 # /* (c) Copyright 2000-2014 Ted Ralphs. All Rights Reserved.                  */
     20# /* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved.                  */
    2121# /*                                                                           */
    2222# /* This software is licensed under the Common Public License. Please see     */
     
    441441PACKAGE_NAME='SYMPHONY'
    442442PACKAGE_TARNAME='symphony'
    443 PACKAGE_VERSION='5.6.11'
    444 PACKAGE_STRING='SYMPHONY 5.6.11'
     443PACKAGE_VERSION='5.6.12'
     444PACKAGE_STRING='SYMPHONY 5.6.12'
    445445PACKAGE_BUGREPORT='https://projects.coin-or.org/svn/SYMPHONY/newticket'
    446446
     
    10451045  # This message is too long to be a string in the A/UX 3.1 sh.
    10461046  cat <<_ACEOF
    1047 \`configure' configures SYMPHONY 5.6.11 to adapt to many kinds of systems.
     1047\`configure' configures SYMPHONY 5.6.12 to adapt to many kinds of systems.
    10481048
    10491049Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11111111if test -n "$ac_init_help"; then
    11121112  case $ac_init_help in
    1113      short | recursive ) echo "Configuration of SYMPHONY 5.6.11:";;
     1113     short | recursive ) echo "Configuration of SYMPHONY 5.6.12:";;
    11141114   esac
    11151115  cat <<\_ACEOF
     
    13261326if $ac_init_version; then
    13271327  cat <<\_ACEOF
    1328 SYMPHONY configure 5.6.11
     1328SYMPHONY configure 5.6.12
    13291329generated by GNU Autoconf 2.59
    13301330
     
    13411341/* Laci Ladanyi (ladanyi@us.ibm.com).                                        */
    13421342/*                                                                           */
    1343 /* (c) Copyright 2000-2014 Ted Ralphs. All Rights Reserved.                  */
     1343/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved.                  */
    13441344/*                                                                           */
    13451345/* This software is licensed under the Common Public License. Please see     */
     
    13561356running configure, to aid debugging if configure makes a mistake.
    13571357
    1358 It was created by SYMPHONY $as_me 5.6.11, which was
     1358It was created by SYMPHONY $as_me 5.6.12, which was
    13591359generated by GNU Autoconf 2.59.  Invocation command line was
    13601360
     
    39513951fi
    39523952
    3953 # correct the LD variable in a build with MS or intel compiler
     3953# correct the LD variable in a build with MS or Intel-windows compiler
    39543954case "$CXX" in
    39553955  clang* ) ;;
     
    46374637
    46384638# correct the LD variable if we use the intel fortran compiler in windows
    4639 case "$F77" in
    4640   ifort* | */ifort* | IFORT* | */IFORT*)
    4641     LD=link
    4642     ;;
     4639case $build in
     4640  *-cygwin* | *-mingw*)
     4641    case "$F77" in
     4642      ifort* | */ifort* | IFORT* | */IFORT*)
     4643        LD=link
     4644      ;;
     4645    esac
     4646  ;;
    46434647esac
    46444648
     
    51235127# Define the identity of the package.
    51245128 PACKAGE='symphony'
    5125  VERSION='5.6.11'
     5129 VERSION='5.6.12'
    51265130
    51275131
     
    64196423*-*-irix6*)
    64206424  # Find out which ABI we are using.
    6421   echo '#line 6421 "configure"' > conftest.$ac_ext
     6425  echo '#line 6425 "configure"' > conftest.$ac_ext
    64226426  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64236427  (eval $ac_compile) 2>&5
     
    83838387   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83848388   -e 's:$: $lt_compiler_flag:'`
    8385    (eval echo "\"\$as_me:8385: $lt_compile\"" >&5)
     8389   (eval echo "\"\$as_me:8389: $lt_compile\"" >&5)
    83868390   (eval "$lt_compile" 2>conftest.err)
    83878391   ac_status=$?
    83888392   cat conftest.err >&5
    8389    echo "$as_me:8389: \$? = $ac_status" >&5
     8393   echo "$as_me:8393: \$? = $ac_status" >&5
    83908394   if (exit $ac_status) && test -s "$ac_outfile"; then
    83918395     # The compiler can only warn and ignore the option if not recognized
     
    86518655   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86528656   -e 's:$: $lt_compiler_flag:'`
    8653    (eval echo "\"\$as_me:8653: $lt_compile\"" >&5)
     8657   (eval echo "\"\$as_me:8657: $lt_compile\"" >&5)
    86548658   (eval "$lt_compile" 2>conftest.err)
    86558659   ac_status=$?
    86568660   cat conftest.err >&5
    8657    echo "$as_me:8657: \$? = $ac_status" >&5
     8661   echo "$as_me:8661: \$? = $ac_status" >&5
    86588662   if (exit $ac_status) && test -s "$ac_outfile"; then
    86598663     # The compiler can only warn and ignore the option if not recognized
     
    87558759   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87568760   -e 's:$: $lt_compiler_flag:'`
    8757    (eval echo "\"\$as_me:8757: $lt_compile\"" >&5)
     8761   (eval echo "\"\$as_me:8761: $lt_compile\"" >&5)
    87588762   (eval "$lt_compile" 2>out/conftest.err)
    87598763   ac_status=$?
    87608764   cat out/conftest.err >&5
    8761    echo "$as_me:8761: \$? = $ac_status" >&5
     8765   echo "$as_me:8765: \$? = $ac_status" >&5
    87628766   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87638767   then
     
    1110011104  lt_status=$lt_dlunknown
    1110111105  cat > conftest.$ac_ext <<EOF
    11102 #line 11102 "configure"
     11106#line 11106 "configure"
    1110311107#include "confdefs.h"
    1110411108
     
    1120011204  lt_status=$lt_dlunknown
    1120111205  cat > conftest.$ac_ext <<EOF
    11202 #line 11202 "configure"
     11206#line 11206 "configure"
    1120311207#include "confdefs.h"
    1120411208
     
    1354413548   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1354513549   -e 's:$: $lt_compiler_flag:'`
    13546    (eval echo "\"\$as_me:13546: $lt_compile\"" >&5)
     13550   (eval echo "\"\$as_me:13550: $lt_compile\"" >&5)
    1354713551   (eval "$lt_compile" 2>conftest.err)
    1354813552   ac_status=$?
    1354913553   cat conftest.err >&5
    13550    echo "$as_me:13550: \$? = $ac_status" >&5
     13554   echo "$as_me:13554: \$? = $ac_status" >&5
    1355113555   if (exit $ac_status) && test -s "$ac_outfile"; then
    1355213556     # The compiler can only warn and ignore the option if not recognized
     
    1364813652   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1364913653   -e 's:$: $lt_compiler_flag:'`
    13650    (eval echo "\"\$as_me:13650: $lt_compile\"" >&5)
     13654   (eval echo "\"\$as_me:13654: $lt_compile\"" >&5)
    1365113655   (eval "$lt_compile" 2>out/conftest.err)
    1365213656   ac_status=$?
    1365313657   cat out/conftest.err >&5
    13654    echo "$as_me:13654: \$? = $ac_status" >&5
     13658   echo "$as_me:13658: \$? = $ac_status" >&5
    1365513659   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1365613660   then
     
    1521815222   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1521915223   -e 's:$: $lt_compiler_flag:'`
    15220    (eval echo "\"\$as_me:15220: $lt_compile\"" >&5)
     15224   (eval echo "\"\$as_me:15224: $lt_compile\"" >&5)
    1522115225   (eval "$lt_compile" 2>conftest.err)
    1522215226   ac_status=$?
    1522315227   cat conftest.err >&5
    15224    echo "$as_me:15224: \$? = $ac_status" >&5
     15228   echo "$as_me:15228: \$? = $ac_status" >&5
    1522515229   if (exit $ac_status) && test -s "$ac_outfile"; then
    1522615230     # The compiler can only warn and ignore the option if not recognized
     
    1532215326   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1532315327   -e 's:$: $lt_compiler_flag:'`
    15324    (eval echo "\"\$as_me:15324: $lt_compile\"" >&5)
     15328   (eval echo "\"\$as_me:15328: $lt_compile\"" >&5)
    1532515329   (eval "$lt_compile" 2>out/conftest.err)
    1532615330   ac_status=$?
    1532715331   cat out/conftest.err >&5
    15328    echo "$as_me:15328: \$? = $ac_status" >&5
     15332   echo "$as_me:15332: \$? = $ac_status" >&5
    1532915333   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1533015334   then
     
    1752917533   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1753017534   -e 's:$: $lt_compiler_flag:'`
    17531    (eval echo "\"\$as_me:17531: $lt_compile\"" >&5)
     17535   (eval echo "\"\$as_me:17535: $lt_compile\"" >&5)
    1753217536   (eval "$lt_compile" 2>conftest.err)
    1753317537   ac_status=$?
    1753417538   cat conftest.err >&5
    17535    echo "$as_me:17535: \$? = $ac_status" >&5
     17539   echo "$as_me:17539: \$? = $ac_status" >&5
    1753617540   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753717541     # The compiler can only warn and ignore the option if not recognized
     
    1779717801   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1779817802   -e 's:$: $lt_compiler_flag:'`
    17799    (eval echo "\"\$as_me:17799: $lt_compile\"" >&5)
     17803   (eval echo "\"\$as_me:17803: $lt_compile\"" >&5)
    1780017804   (eval "$lt_compile" 2>conftest.err)
    1780117805   ac_status=$?
    1780217806   cat conftest.err >&5
    17803    echo "$as_me:17803: \$? = $ac_status" >&5
     17807   echo "$as_me:17807: \$? = $ac_status" >&5
    1780417808   if (exit $ac_status) && test -s "$ac_outfile"; then
    1780517809     # The compiler can only warn and ignore the option if not recognized
     
    1790117905   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1790217906   -e 's:$: $lt_compiler_flag:'`
    17903    (eval echo "\"\$as_me:17903: $lt_compile\"" >&5)
     17907   (eval echo "\"\$as_me:17907: $lt_compile\"" >&5)
    1790417908   (eval "$lt_compile" 2>out/conftest.err)
    1790517909   ac_status=$?
    1790617910   cat out/conftest.err >&5
    17907    echo "$as_me:17907: \$? = $ac_status" >&5
     17911   echo "$as_me:17911: \$? = $ac_status" >&5
    1790817912   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1790917913   then
     
    2287122875cat >&5 <<_CSEOF
    2287222876
    22873 This file was extended by SYMPHONY $as_me 5.6.11, which was
     22877This file was extended by SYMPHONY $as_me 5.6.12, which was
    2287422878generated by GNU Autoconf 2.59.  Invocation command line was
    2287522879
     
    2292922933cat >>$CONFIG_STATUS <<_ACEOF
    2293022934ac_cs_version="\\
    22931 SYMPHONY config.status 5.6.11
     22935SYMPHONY config.status 5.6.12
    2293222936configured by $0, generated by GNU Autoconf 2.59,
    2293322937  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.12/configure.ac

    r2707 r2707  
    2323AC_PREREQ(2.59)
    2424
    25 AC_INIT([SYMPHONY],[5.6.11],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
     25AC_INIT([SYMPHONY],[5.6.12],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
    2626
    2727AC_COPYRIGHT([
     
    3333/* Laci Ladanyi (ladanyi@us.ibm.com).                                        */
    3434/*                                                                           */
    35 /* (c) Copyright 2000-2014 Ted Ralphs. All Rights Reserved.                  */
     35/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved.                  */
    3636/*                                                                           */
    3737/* This software is licensed under the Common Public License. Please see     */
Note: See TracChangeset for help on using the changeset viewer.