Changes from releases/5.6.7 at r2709 to releases/5.6.8 at r2709


Ignore:
Location:
releases/5.6.8
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • releases/5.6.8/SYMPHONY

  • releases/5.6.8/SYMPHONY/configure

    r2709 r2709  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.7.
     3# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.8.
    44#
    55# Report bugs to <symphony@list.coin-or.org>.
     
    440440PACKAGE_NAME='SYMPHONY'
    441441PACKAGE_TARNAME='symphony'
    442 PACKAGE_VERSION='5.6.7'
    443 PACKAGE_STRING='SYMPHONY 5.6.7'
     442PACKAGE_VERSION='5.6.8'
     443PACKAGE_STRING='SYMPHONY 5.6.8'
    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.7 to adapt to many kinds of systems.
     1018\`configure' configures SYMPHONY 5.6.8 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.7:";;
     1084     short | recursive ) echo "Configuration of SYMPHONY 5.6.8:";;
    10851085   esac
    10861086  cat <<\_ACEOF
     
    13361336if $ac_init_version; then
    13371337  cat <<\_ACEOF
    1338 SYMPHONY configure 5.6.7
     1338SYMPHONY configure 5.6.8
    13391339generated by GNU Autoconf 2.59
    13401340
     
    13661366running configure, to aid debugging if configure makes a mistake.
    13671367
    1368 It was created by SYMPHONY $as_me 5.6.7, which was
     1368It was created by SYMPHONY $as_me 5.6.8, 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:7:6
     1894 coin_libversion=9:8:6
    18951895
    18961896
     
    46214621# Define the identity of the package.
    46224622 PACKAGE='symphony'
    4623  VERSION='5.6.7'
     4623 VERSION='5.6.8'
    46244624
    46254625
     
    2996729967cat >&5 <<_CSEOF
    2996829968
    29969 This file was extended by SYMPHONY $as_me 5.6.7, which was
     29969This file was extended by SYMPHONY $as_me 5.6.8, 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.7
     30032SYMPHONY config.status 5.6.8
    3003330033configured by $0, generated by GNU Autoconf 2.59,
    3003430034  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.8/SYMPHONY/configure.ac

    r2709 r2709  
    2323AC_PREREQ(2.59)
    2424
    25 AC_INIT([SYMPHONY],[5.6.7],[symphony@list.coin-or.org])
     25AC_INIT([SYMPHONY],[5.6.8],[symphony@list.coin-or.org])
    2626
    2727AC_COPYRIGHT([
     
    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:7:6)
     64AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:8:6)
    6565
    6666# Check if user wants to produce debugging code
  • releases/5.6.8/SYMPHONY/include/config_sym_default.h

    r2709 r2709  
    66
    77/* Version number of project */
    8 #define SYMPHONY_VERSION "5.6.7"
     8#define SYMPHONY_VERSION "5.6.8"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define SYMPHONY_VERSION_RELEASE 7
     17#define SYMPHONY_VERSION_RELEASE 8
    1818
    1919
  • releases/5.6.8/SYMPHONY/src/Master/main.c

    r2709 r2709  
    376376                switch(env->termcode){
    377377                 case TM_NO_SOLUTION:
    378                     printf("Error in displaying solution! \n"
    379                            "The problem is either infeasible or "
    380                            "has not been solved yet!\n");
    381                     display = FALSE;
    382                     break;
     378                   printf("Problem was found infeasible!\n");
     379                   display = FALSE;
     380                   break;
     381                 case TM_UNBOUNDED:
     382                   printf("Problem was found to be unbounded!\n");
     383                   display = FALSE;
     384                   break;
    383385                 case TM_NODE_LIMIT_EXCEEDED:               
    384386                    printf("Node limit reached!\n");               
     
    454456                 env->comp_times.lb_heurtime;
    455457               
    456                print_statistics(&(env->warm_start->comp_times),
    457                                 &(env->warm_start->stat),
    458                                 NULL,
    459                                 env->warm_start->ub, env->warm_start->lb,
    460                                 initial_time, start_time, finish_time,
    461                                 env->mip->obj_offset, env->mip->obj_sense,
    462                                 env->warm_start->has_ub,NULL, 0);
    463                printf("\n");           
     458               if (env->warm_start){
     459                  print_statistics(&(env->warm_start->comp_times),
     460                                   &(env->warm_start->stat),
     461                                   NULL,
     462                                   env->warm_start->ub, env->warm_start->lb,
     463                                   initial_time, start_time, finish_time,
     464                                   env->mip->obj_offset, env->mip->obj_sense,
     465                                   env->warm_start->has_ub,NULL, 0);
     466                  printf("\n");
     467               }else{
     468                  printf("No statistics! Either the solution process"
     469                         "terminated in preprocessing or\n"
     470                         "the problem has not been solved yet!\n");
     471               }
    464472             }
    465473             strcpy(args[1], "");             
  • releases/5.6.8/SYMPHONY/src/Master/master.c

    r2709 r2709  
    849849     
    850850      if(termcode == PREP_INFEAS){
    851          return(env->termcode = PREP_NO_SOLUTION);
     851         if (env->par.verbosity >= -1 ){
     852            printf("\n****************************************************\n");
     853            printf(  "* Problem Found Infeasible in Preprocessing        *\n");
     854            printf(  "****************************************************\n");
     855         }
     856         return(env->termcode = TM_NO_SOLUTION);
    852857      }else if(termcode == PREP_UNBOUNDED){
    853          return(env->termcode = PREP_UNBOUNDED);
     858         if (env->par.verbosity >= -1 ){
     859            printf("\n****************************************************\n");
     860            printf(  "* Problem Found Unbounded in Preprocessing         *\n");
     861            printf(  "****************************************************\n");
     862         }
     863         return(env->termcode = TM_UNBOUNDED);
    854864      }else if(termcode == PREP_SOLVED){
    855865         /* now we initialize sol in preprocessor */
     
    865875         //env->prep_mip->fixed_n);
    866876         
    867          return(env->termcode = PREP_OPTIMAL_SOLUTION_FOUND);
     877         if (env->par.verbosity >= -1 ){
     878            printf("\n****************************************************\n");
     879            printf(  "* Optimal Solution Found in Preprocessing          *\n");
     880            printf(  "****************************************************\n");
     881         }
     882         if (env->par.verbosity >= 0){
     883            CALL_WRAPPER_FUNCTION( display_solution_u(env, 0) );
     884         }
     885         return(env->termcode = TM_OPTIMAL_SOLUTION_FOUND);
    868886      }else if(termcode == PREP_NUMERIC_ERROR){
    869          return(env->termcode = PREP_ERROR);
     887         if (env->par.verbosity >= -1 ){
     888            printf("\n****************************************************\n");
     889            printf(  "* Terminated abnormally with error message %i      *\n",
     890                  termcode);
     891            printf(  "****************************************************\n");
     892         }
     893         return(env->termcode = TM_ERROR__NUMERICAL_INSTABILITY);
    870894      }
    871895   }
  • releases/5.6.8/SYMPHONY/src/Master/master_io.c

    r2709 r2709  
    812812#endif
    813813
    814    initial_time += tim->communication;
    815    initial_time += tim->lp;
    816    initial_time += tim->lp_setup;
    817    initial_time += tim->separation;
    818    initial_time += tim->fixing;
    819    initial_time += tim->pricing;
    820    initial_time += tim->strong_branching;
    821    initial_time += tim->cut_pool;
    822    initial_time += tim->primal_heur;
     814   if (tim){
     815      initial_time += tim->communication;
     816      initial_time += tim->lp;
     817      initial_time += tim->lp_setup;
     818      initial_time += tim->separation;
     819      initial_time += tim->fixing;
     820      initial_time += tim->pricing;
     821      initial_time += tim->strong_branching;
     822      initial_time += tim->cut_pool;
     823      initial_time += tim->primal_heur;
    823824#if !defined(_MSC_VER)  /* FIXME: CPU timing doesn't work in Windows */
    824    printf("======================= CP Timing ===========================\n");
    825    printf("  Cut Pool                  %.3f\n", tim->cut_pool);
     825      printf("======================= CP Timing ===========================\n");
     826      printf("  Cut Pool                  %.3f\n", tim->cut_pool);
    826827#endif
    827    printf("====================== LP/CG Timing =========================\n");
     828      printf("====================== LP/CG Timing =========================\n");
    828829#if !defined(_MSC_VER)  /* FIXME: CPU timing doesn't work in Windows */
    829    printf("  LP Solution Time          %.3f\n", tim->lp);
    830    printf("  LP Setup Time             %.3f\n", tim->lp_setup);
    831    printf("  Variable Fixing           %.3f\n", tim->fixing);
    832    printf("  Pricing                   %.3f\n", tim->pricing);
    833    printf("  Strong Branching          %.3f\n", tim->strong_branching);
    834    printf("  Separation                %.3f\n", tim->separation);
    835    printf("  Primal Heuristics         %.3f\n", tim->primal_heur);
    836    printf("  Communication             %.3f\n", tim->communication);
     830      printf("  LP Solution Time          %.3f\n", tim->lp);
     831      printf("  LP Setup Time             %.3f\n", tim->lp_setup);
     832      printf("  Variable Fixing           %.3f\n", tim->fixing);
     833      printf("  Pricing                   %.3f\n", tim->pricing);
     834      printf("  Strong Branching          %.3f\n", tim->strong_branching);
     835      printf("  Separation                %.3f\n", tim->separation);
     836      printf("  Primal Heuristics         %.3f\n", tim->primal_heur);
     837      printf("  Communication             %.3f\n", tim->communication);
    837838#ifndef COMPILE_IN_LP
    838    printf("=================== Parallel Overhead ======================\n");
    839    printf("  Communication         %.3f\n", tim->communication);
    840    printf("  Ramp Up Time (TM)     %.3f\n", tim->ramp_up_tm);
    841    printf("  Ramp Up Time (LP)     %.3f\n", tim->ramp_up_lp);
    842    printf("  Ramp Down Time        %.3f\n", tim->ramp_down_time);
    843    printf("  Idle Time (Node Pack) %.3f\n", tim->start_node);
    844    printf("  Idle Time (Nodes)     %.3f\n", tim->idle_node);
    845    printf("  Idle Time (Names)     %.3f\n", tim->idle_names);
    846    printf("  Idle Time (Diving)    %.3f\n", tim->idle_diving);
    847    printf("  Idle Time (Cuts)      %.3f\n", tim->idle_cuts);
     839      printf("=================== Parallel Overhead ======================\n");
     840      printf("  Communication         %.3f\n", tim->communication);
     841      printf("  Ramp Up Time (TM)     %.3f\n", tim->ramp_up_tm);
     842      printf("  Ramp Up Time (LP)     %.3f\n", tim->ramp_up_lp);
     843      printf("  Ramp Down Time        %.3f\n", tim->ramp_down_time);
     844      printf("  Idle Time (Node Pack) %.3f\n", tim->start_node);
     845      printf("  Idle Time (Nodes)     %.3f\n", tim->idle_node);
     846      printf("  Idle Time (Names)     %.3f\n", tim->idle_names);
     847      printf("  Idle Time (Diving)    %.3f\n", tim->idle_diving);
     848      printf("  Idle Time (Cuts)      %.3f\n", tim->idle_cuts);
    848849#endif
     850   }
    849851   printf("  Total User Time              %.3f\n", initial_time);
    850852#endif
    851853   printf("  Total Wallclock Time         %.3f\n\n", finish_time -
    852854          start_time);
    853    printf("====================== Statistics =========================\n");
    854    printf("Number of created nodes :       %i\n", stat->created);
    855    printf("Number of analyzed nodes:       %i\n", stat->analyzed);
    856    printf("Depth of tree:                  %i\n", stat->max_depth);
    857    printf("Size of the tree:               %i\n", stat->tree_size);
    858    if (solpool) {
    859       printf("Number of solutions found:      %i\n", solpool->total_num_sols_found);
    860       printf("Number of solutions in pool:    %i\n", solpool->num_solutions);
    861    }
     855   if (stat){
     856      printf("====================== Statistics =========================\n");
     857      printf("Number of created nodes :       %i\n", stat->created);
     858      printf("Number of analyzed nodes:       %i\n", stat->analyzed);
     859      printf("Depth of tree:                  %i\n", stat->max_depth);
     860      printf("Size of the tree:               %i\n", stat->tree_size);
     861      if (solpool) {
     862         printf("Number of solutions found:      %i\n", solpool->total_num_sols_found);
     863         printf("Number of solutions in pool:    %i\n", solpool->num_solutions);
     864      }
    862865#ifdef SHOULD_SHOW_MEMORY_USAGE
    863    printf("Virtual memory used (MB):       %.2f\n", stat->max_vsize);
     866      printf("Virtual memory used (MB):       %.2f\n", stat->max_vsize);
    864867#endif
    865 
     868     
    866869#if 0
    867    printf("Leaves before trimming:         %i\n",
    868           stat->leaves_before_trimming);
    869    printf("Leaves after trimming:          %i\n", stat->leaves_after_trimming);
    870    printf("Repriced root's nf_status:      %s\n",
    871           nfstatus[(int)stat->nf_status].str);
    872    printf("Not fixed variable num:         %i\n", stat->vars_not_priced);
     870      printf("Leaves before trimming:         %i\n",
     871             stat->leaves_before_trimming);
     872      printf("Leaves after trimming:          %i\n", stat->leaves_after_trimming);
     873      printf("Repriced root's nf_status:      %s\n",
     874             nfstatus[(int)stat->nf_status].str);
     875      printf("Not fixed variable num:         %i\n", stat->vars_not_priced);
    873876#endif
    874    printf("Number of Chains:               %i\n", stat->chains);
    875    printf("Number of Diving Halts:         %i\n", stat->diving_halts);
    876    printf("Number of cuts in cut pool:     %i\n", stat->cuts_in_pool);
    877    if (stat->root_lb > -MAXDOUBLE){
    878       if (obj_sense == SYM_MAXIMIZE){
    879          printf("Upper Bound in Root:            %.3f\n",
    880                 -stat->root_lb + obj_offset);
    881       }else{
    882          printf("Lower Bound in Root:            %.3f\n",
    883                 stat->root_lb + obj_offset);
     877      printf("Number of Chains:               %i\n", stat->chains);
     878      printf("Number of Diving Halts:         %i\n", stat->diving_halts);
     879      printf("Number of cuts in cut pool:     %i\n", stat->cuts_in_pool);
     880      if (stat->root_lb > -MAXDOUBLE){
     881         if (obj_sense == SYM_MAXIMIZE){
     882            printf("Upper Bound in Root:            %.3f\n",
     883                   -stat->root_lb + obj_offset);
     884         }else{
     885            printf("Lower Bound in Root:            %.3f\n",
     886                   stat->root_lb + obj_offset);
     887         }
    884888      }
    885889   }
    886 
     890   
    887891   if (lp_stat) {
    888892      printf ("\n======================= LP Solver =========================");
     
    906910     
    907911      if (output_mode < 1) {
    908 
     912         
    909913         printf ("\n==================== Rounding =============================");
    910914         printf ("\n");
  • releases/5.6.8/configure

    r2709 r2709  
    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.7.
     4# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.8.
    55#
    66# Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>.
     
    441441PACKAGE_NAME='SYMPHONY'
    442442PACKAGE_TARNAME='symphony'
    443 PACKAGE_VERSION='5.6.7'
    444 PACKAGE_STRING='SYMPHONY 5.6.7'
     443PACKAGE_VERSION='5.6.8'
     444PACKAGE_STRING='SYMPHONY 5.6.8'
    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.7 to adapt to many kinds of systems.
     1047\`configure' configures SYMPHONY 5.6.8 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.7:";;
     1113     short | recursive ) echo "Configuration of SYMPHONY 5.6.8:";;
    11141114   esac
    11151115  cat <<\_ACEOF
     
    13261326if $ac_init_version; then
    13271327  cat <<\_ACEOF
    1328 SYMPHONY configure 5.6.7
     1328SYMPHONY configure 5.6.8
    13291329generated by GNU Autoconf 2.59
    13301330
     
    13561356running configure, to aid debugging if configure makes a mistake.
    13571357
    1358 It was created by SYMPHONY $as_me 5.6.7, which was
     1358It was created by SYMPHONY $as_me 5.6.8, which was
    13591359generated by GNU Autoconf 2.59.  Invocation command line was
    13601360
     
    51235123# Define the identity of the package.
    51245124 PACKAGE='symphony'
    5125  VERSION='5.6.7'
     5125 VERSION='5.6.8'
    51265126
    51275127
     
    2287122871cat >&5 <<_CSEOF
    2287222872
    22873 This file was extended by SYMPHONY $as_me 5.6.7, which was
     22873This file was extended by SYMPHONY $as_me 5.6.8, which was
    2287422874generated by GNU Autoconf 2.59.  Invocation command line was
    2287522875
     
    2292922929cat >>$CONFIG_STATUS <<_ACEOF
    2293022930ac_cs_version="\\
    22931 SYMPHONY config.status 5.6.7
     22931SYMPHONY config.status 5.6.8
    2293222932configured by $0, generated by GNU Autoconf 2.59,
    2293322933  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.8/configure.ac

    r2709 r2709  
    2323AC_PREREQ(2.59)
    2424
    25 AC_INIT([SYMPHONY],[5.6.7],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
     25AC_INIT([SYMPHONY],[5.6.8],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
    2626
    2727AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.