Changeset 605


Ignore:
Timestamp:
Jun 29, 2007 1:50:22 PM (13 years ago)
Author:
pbonami
Message:

Fix makefiles

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/configure

    r589 r605  
    26932693          cl* | */cl* | CL* | */CL*)
    26942694            coin_opt_cflags='-MT -O2'
    2695             coin_add_cflags='-nologo -wd4996'
     2695            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    26962696            coin_dbg_cflags='-MTd'
    26972697            ;;
     
    34263426fi
    34273427
     3428# It seems that we need to cleanup something here for the Windows
     3429case "$CXX" in
     3430  cl* | */cl* | CL* | */CL* )
     3431    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     3432    mv confdefs.hh confdefs.h
     3433    ;;
     3434esac
     3435
    34283436# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    34293437case "$CXX" in
     
    35263534            # The MT and MTd options are mutually exclusive
    35273535            coin_opt_cxxflags='-MT -O2'
    3528             coin_add_cxxflags='-nologo -EHsc -GR -wd4996'
     3536            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    35293537            coin_dbg_cxxflags='-MTd'
    35303538            ;;
     
    40514059
    40524060# Provide some information about the compiler.
    4053 echo "$as_me:4053:" \
     4061echo "$as_me:4061:" \
    40544062     "checking for Fortran 77 compiler version" >&5
    40554063ac_compiler=`set X $ac_compile; echo $2`
     
    46194627ac_save_FFLAGS=$FFLAGS
    46204628FFLAGS="$FFLAGS $ac_verb"
    4621 (eval echo $as_me:4621: \"$ac_link\") >&5
     4629(eval echo $as_me:4629: \"$ac_link\") >&5
    46224630ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    46234631echo "$ac_f77_v_output" >&5
     
    46974705ac_save_FFLAGS=$FFLAGS
    46984706FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4699 (eval echo $as_me:4699: \"$ac_link\") >&5
     4707(eval echo $as_me:4707: \"$ac_link\") >&5
    47004708ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    47014709echo "$ac_f77_v_output" >&5
     
    71977205*-*-irix6*)
    71987206  # Find out which ABI we are using.
    7199   echo '#line 7199 "configure"' > conftest.$ac_ext
     7207  echo '#line 7207 "configure"' > conftest.$ac_ext
    72007208  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    72017209  (eval $ac_compile) 2>&5
     
    91779185   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    91789186   -e 's:$: $lt_compiler_flag:'`
    9179    (eval echo "\"\$as_me:9179: $lt_compile\"" >&5)
     9187   (eval echo "\"\$as_me:9187: $lt_compile\"" >&5)
    91809188   (eval "$lt_compile" 2>conftest.err)
    91819189   ac_status=$?
    91829190   cat conftest.err >&5
    9183    echo "$as_me:9183: \$? = $ac_status" >&5
     9191   echo "$as_me:9191: \$? = $ac_status" >&5
    91849192   if (exit $ac_status) && test -s "$ac_outfile"; then
    91859193     # The compiler can only warn and ignore the option if not recognized
     
    94459453   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94469454   -e 's:$: $lt_compiler_flag:'`
    9447    (eval echo "\"\$as_me:9447: $lt_compile\"" >&5)
     9455   (eval echo "\"\$as_me:9455: $lt_compile\"" >&5)
    94489456   (eval "$lt_compile" 2>conftest.err)
    94499457   ac_status=$?
    94509458   cat conftest.err >&5
    9451    echo "$as_me:9451: \$? = $ac_status" >&5
     9459   echo "$as_me:9459: \$? = $ac_status" >&5
    94529460   if (exit $ac_status) && test -s "$ac_outfile"; then
    94539461     # The compiler can only warn and ignore the option if not recognized
     
    95499557   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    95509558   -e 's:$: $lt_compiler_flag:'`
    9551    (eval echo "\"\$as_me:9551: $lt_compile\"" >&5)
     9559   (eval echo "\"\$as_me:9559: $lt_compile\"" >&5)
    95529560   (eval "$lt_compile" 2>out/conftest.err)
    95539561   ac_status=$?
    95549562   cat out/conftest.err >&5
    9555    echo "$as_me:9555: \$? = $ac_status" >&5
     9563   echo "$as_me:9563: \$? = $ac_status" >&5
    95569564   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    95579565   then
     
    1196611974  lt_status=$lt_dlunknown
    1196711975  cat > conftest.$ac_ext <<EOF
    11968 #line 11968 "configure"
     11976#line 11976 "configure"
    1196911977#include "confdefs.h"
    1197011978
     
    1206612074  lt_status=$lt_dlunknown
    1206712075  cat > conftest.$ac_ext <<EOF
    12068 #line 12068 "configure"
     12076#line 12076 "configure"
    1206912077#include "confdefs.h"
    1207012078
     
    1442614434   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1442714435   -e 's:$: $lt_compiler_flag:'`
    14428    (eval echo "\"\$as_me:14428: $lt_compile\"" >&5)
     14436   (eval echo "\"\$as_me:14436: $lt_compile\"" >&5)
    1442914437   (eval "$lt_compile" 2>conftest.err)
    1443014438   ac_status=$?
    1443114439   cat conftest.err >&5
    14432    echo "$as_me:14432: \$? = $ac_status" >&5
     14440   echo "$as_me:14440: \$? = $ac_status" >&5
    1443314441   if (exit $ac_status) && test -s "$ac_outfile"; then
    1443414442     # The compiler can only warn and ignore the option if not recognized
     
    1453014538   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1453114539   -e 's:$: $lt_compiler_flag:'`
    14532    (eval echo "\"\$as_me:14532: $lt_compile\"" >&5)
     14540   (eval echo "\"\$as_me:14540: $lt_compile\"" >&5)
    1453314541   (eval "$lt_compile" 2>out/conftest.err)
    1453414542   ac_status=$?
    1453514543   cat out/conftest.err >&5
    14536    echo "$as_me:14536: \$? = $ac_status" >&5
     14544   echo "$as_me:14544: \$? = $ac_status" >&5
    1453714545   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1453814546   then
     
    1610016108   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1610116109   -e 's:$: $lt_compiler_flag:'`
    16102    (eval echo "\"\$as_me:16102: $lt_compile\"" >&5)
     16110   (eval echo "\"\$as_me:16110: $lt_compile\"" >&5)
    1610316111   (eval "$lt_compile" 2>conftest.err)
    1610416112   ac_status=$?
    1610516113   cat conftest.err >&5
    16106    echo "$as_me:16106: \$? = $ac_status" >&5
     16114   echo "$as_me:16114: \$? = $ac_status" >&5
    1610716115   if (exit $ac_status) && test -s "$ac_outfile"; then
    1610816116     # The compiler can only warn and ignore the option if not recognized
     
    1620416212   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1620516213   -e 's:$: $lt_compiler_flag:'`
    16206    (eval echo "\"\$as_me:16206: $lt_compile\"" >&5)
     16214   (eval echo "\"\$as_me:16214: $lt_compile\"" >&5)
    1620716215   (eval "$lt_compile" 2>out/conftest.err)
    1620816216   ac_status=$?
    1620916217   cat out/conftest.err >&5
    16210    echo "$as_me:16210: \$? = $ac_status" >&5
     16218   echo "$as_me:16218: \$? = $ac_status" >&5
    1621116219   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1621216220   then
     
    1841118419   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1841218420   -e 's:$: $lt_compiler_flag:'`
    18413    (eval echo "\"\$as_me:18413: $lt_compile\"" >&5)
     18421   (eval echo "\"\$as_me:18421: $lt_compile\"" >&5)
    1841418422   (eval "$lt_compile" 2>conftest.err)
    1841518423   ac_status=$?
    1841618424   cat conftest.err >&5
    18417    echo "$as_me:18417: \$? = $ac_status" >&5
     18425   echo "$as_me:18425: \$? = $ac_status" >&5
    1841818426   if (exit $ac_status) && test -s "$ac_outfile"; then
    1841918427     # The compiler can only warn and ignore the option if not recognized
     
    1867918687   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1868018688   -e 's:$: $lt_compiler_flag:'`
    18681    (eval echo "\"\$as_me:18681: $lt_compile\"" >&5)
     18689   (eval echo "\"\$as_me:18689: $lt_compile\"" >&5)
    1868218690   (eval "$lt_compile" 2>conftest.err)
    1868318691   ac_status=$?
    1868418692   cat conftest.err >&5
    18685    echo "$as_me:18685: \$? = $ac_status" >&5
     18693   echo "$as_me:18693: \$? = $ac_status" >&5
    1868618694   if (exit $ac_status) && test -s "$ac_outfile"; then
    1868718695     # The compiler can only warn and ignore the option if not recognized
     
    1878318791   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1878418792   -e 's:$: $lt_compiler_flag:'`
    18785    (eval echo "\"\$as_me:18785: $lt_compile\"" >&5)
     18793   (eval echo "\"\$as_me:18793: $lt_compile\"" >&5)
    1878618794   (eval "$lt_compile" 2>out/conftest.err)
    1878718795   ac_status=$?
    1878818796   cat out/conftest.err >&5
    18789    echo "$as_me:18789: \$? = $ac_status" >&5
     18797   echo "$as_me:18797: \$? = $ac_status" >&5
    1879018798   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1879118799   then
  • trunk/Bonmin/experimental/Bcp/Makefile.am

    r587 r605  
    125125        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    126126        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     127        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    127128        -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    128129        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
  • trunk/Bonmin/experimental/Bcp/Makefile.in

    r587 r605  
    387387        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
    388388        $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    389         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` -I`$(CYGPATH_W) \
    390         $(CLPOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    391         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
    392         $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglProbing` \
    393         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding` \
    394         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglKnapsackCover` \
    395         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
     389        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` -I`$(CYGPATH_W) \
     390        $(CLPSRCDIR)/src` -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
     391        -I`$(CYGPATH_W) $(OSISRCDIR)/src` -I`$(CYGPATH_W) \
     392        $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
     393        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglProbing` -I`$(CYGPATH_W) \
     394        $(CGLSRCDIR)/src/CglMixedIntegerRounding` -I`$(CYGPATH_W) \
     395        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
     396        $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    396397        $(BCPSRCDIR)/src/include` -I`$(CYGPATH_W) $(BCPOBJDIR)/inc` \
    397398        $(am__append_2)
  • trunk/Bonmin/experimental/NotConvex/Makefile.am

    r533 r605  
    5555        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    5656        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     57        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    5758        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` \
    5859        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
  • trunk/Bonmin/experimental/NotConvex/Makefile.in

    r533 r605  
    367367        $(IPOPTSRCDIR)/src/Apps/AmplSolver` -I`$(CYGPATH_W) \
    368368        $(OSISRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    369         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` -I`$(CYGPATH_W) \
    370         $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
    371         $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    372         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` -I`$(CYGPATH_W) \
    373         $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
     369        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` -I`$(CYGPATH_W) \
     370        $(CBCSRCDIR)/examples` -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
     371        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) \
     372        $(CLPOBJDIR)/inc` -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     373        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
    374374        $(OSISRCDIR)/src/OsiCbc` -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    375375        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
  • trunk/Bonmin/src/Algorithms/BonBonminSetup.cpp

    r590 r605  
    332332    int lpLogLevel;
    333333    options_->GetIntegerValue("lp_log_level",lpLogLevel,"bonmin.");
     334    continuousSolver_->passInMessageHandler(nonlinearSolver_->messageHandler());
    334335    continuousSolver_->messageHandler()->setLogLevel(lpLogLevel);
    335336    nonlinearSolver_->extractLinearRelaxation(*continuousSolver_);
  • trunk/Bonmin/src/Algorithms/Branching/Makefile.am

    r563 r605  
    5959        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    6060        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     61        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    6162        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples`
    6263
  • trunk/Bonmin/src/Algorithms/Branching/Makefile.in

    r563 r605  
    365365        $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    366366        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    367         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` $(am__append_1)
     367        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` -I`$(CYGPATH_W) \
     368        $(CBCSRCDIR)/examples` $(am__append_1)
    368369
    369370# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Bonmin/src/Algorithms/Makefile.am

    r563 r605  
    7575        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    7676        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     77        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    7778        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples`
    7879
  • trunk/Bonmin/src/Algorithms/Makefile.in

    r563 r605  
    377377        $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    378378        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    379         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` $(am__append_2)
     379        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` -I`$(CYGPATH_W) \
     380        $(CBCSRCDIR)/examples` $(am__append_2)
    380381
    381382# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Bonmin/src/Algorithms/OaGenerators/Makefile.am

    r563 r605  
    6161        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglPreProcess` \
    6262        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     63        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    6364        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples`
    6465
  • trunk/Bonmin/src/Algorithms/OaGenerators/Makefile.in

    r563 r605  
    368368        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    369369        $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    370         $(CBCSRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` \
    371         $(am__append_1)
     370        $(CBCSRCDIR)/src` -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
     371        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` $(am__append_1)
    372372
    373373# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Bonmin/src/Apps/Makefile.am

    r563 r605  
    7777        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    7878        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     79        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    7980        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples`
    8081
  • trunk/Bonmin/src/Apps/Makefile.in

    r563 r605  
    372372        $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    373373        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` -I`$(CYGPATH_W) \
    374         $(CBCSRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` \
    375         $(am__append_2)
     374        $(CBCSRCDIR)/src` -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
     375        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` $(am__append_2)
    376376
    377377# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Bonmin/src/CbcBonmin/Makefile.am

    r563 r605  
    9090        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    9191        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     92        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    9293        -I`$(CYGPATH_W) $(CBCSRCDIR)/examples`
    9394
  • trunk/Bonmin/src/CbcBonmin/Makefile.in

    r563 r605  
    397397        $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    398398        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    399         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` $(am__append_2)
     399        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` -I`$(CYGPATH_W) \
     400        $(CBCSRCDIR)/examples` $(am__append_2)
    400401
    401402# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Bonmin/src/Interfaces/BonOsiTMINLPInterface.cpp

    r590 r605  
    200200  strcpy(source_ ,"NLP");
    201201  addMessage(SOLUTION_FOUND, CoinOneMessage
    202       (1,2,"After %d tries found a solution of %g "
     202      (SOLUTION_FOUND + 1,2,"After %d tries found a solution of %g "
    203203       "(previous best %g)."));
    204204
    205205  addMessage(INFEASIBLE_SOLUTION_FOUND, CoinOneMessage
    206       (2,2,"After %d tries found an solution of %g "
     206      (INFEASIBLE_SOLUTION_FOUND + 1 ,2,"After %d tries found an solution of %g "
    207207       "infeasible problem."));
    208208
    209209  addMessage(UNSOLVED_PROBLEM_FOUND, CoinOneMessage
    210       (3,2,"After %d tries found an solution of %g "
     210      (UNSOLVED_PROBLEM_FOUND + 1,2,"After %d tries found an solution of %g "
    211211       "unsolved problem."));
    212212  addMessage(WARN_SUCCESS_WS,CoinOneMessage
    213       (3009,2,
     213      (WARN_SUCCESS_WS + 3001,2,
    214214       "Problem not solved with warm start but "
    215215       "solved without"));
    216216
    217217  addMessage(WARNING_RESOLVING,CoinOneMessage
    218       (3010,2,
     218      (WARNING_RESOLVING + 3001,2,
    219219       "Trying to resolve NLP with different starting "
    220220       "point (%d attempts)."));
    221221  addMessage(WARN_SUCCESS_RANDOM, CoinOneMessage
    222       (3011,1,
     222      (WARN_SUCCESS_RANDOM + 3001,1,
    223223       "Problem initially not solved but solved with "
    224224       "a random starting point (success on %d attempt)"));
    225225  addMessage(WARN_CONTINUING_ON_FAILURE, CoinOneMessage
    226       (3017,1,
     226      (WARN_CONTINUING_ON_FAILURE + 3001, 1,
    227227       "Warning : continuing branching, while there are "
    228228       "unrecovered failures at nodes"));
    229229
    230230  addMessage(SUSPECT_PROBLEM, CoinOneMessage
    231       (4,2,"NLP number %d is suspect (see bounds and start file)"));
     231      (SUSPECT_PROBLEM + 1,2,"NLP number %d is suspect (see bounds and start file)"));
    232232  addMessage(IPOPT_SUMMARY, CoinOneMessage
    233       (6,2,"Ipopt return (for %s): status %2d, iter count %4d, time %g"));
     233      (IPOPT_SUMMARY + 1,2,"Ipopt return (for %s): status %2d, iter count %4d, time %g"));
    234234  addMessage(BETTER_SOL, CoinOneMessage
    235       (7,2,"Solution of value %g found on %d'th attempt"));
     235      (BETTER_SOL + 1,2,"Solution of value %g found on %d'th attempt"));
    236236
    237237  addMessage(LOG_HEAD, CoinOneMessage
    238       (8,1,"\n          "
     238      (LOG_HEAD + 1,1,"\n          "
    239239       "    Num      Status      Obj             It       time"));
    240240  addMessage(LOG_FIRST_LINE, CoinOneMessage
    241       (9,1,
     241      (LOG_FIRST_LINE + 1,1,
    242242       "    %-8d %-11s %-14g %-8d %-3g"));
    243243  addMessage(LOG_LINE, CoinOneMessage
    244       (10,1,
     244      (LOG_LINE + 1,1,
    245245       " %c  r%-7d %-11s %-14g %-8d %-3g"));
    246246
    247247  addMessage(ALTERNATE_OBJECTIVE, CoinOneMessage
    248              (18,1,"Objective value recomputed with alternate objective: %g."));
     248             (ALTERNATE_OBJECTIVE + 1,1,"Objective value recomputed with alternate objective: %g."));
    249249 
    250250  addMessage(WARN_RESOLVE_BEFORE_INITIAL_SOLVE, CoinOneMessage
    251       (3012,1,"resolve called before any call to initialSolve"
     251      (WARN_RESOLVE_BEFORE_INITIAL_SOLVE + 3001,1,"resolve called before any call to initialSolve"
    252252       " can not use warm starts."));
    253253  addMessage(ERROR_NO_TNLPSOLVER, CoinOneMessage
    254              (3013,1,"Can not parse options when no IpApplication has been created"));
    255                                                
     254             (ERROR_NO_TNLPSOLVER + 6001,1,"Can not parse options when no IpApplication has been created"));
     255  addMessage(WARNING_NON_CONVEX_OA, CoinOneMessage
     256             (WARNING_NON_CONVEX_OA + 3001, 1,
     257              "OA on non-convex constraint is very experimental, don't know how to remove"));                                         
    256258
    257259}
     
    429431{
    430432      messageHandler()->setLogLevel(source.messageHandler()->logLevel());
     433  //Pass in message handler
     434  if(source.messageHandler())
     435    passInMessageHandler(source.messageHandler());
    431436  // Copy options from old application
    432437  if(IsValid(source.tminlp_)) {
     
    15641569  if(!rowNotLoBounded && ! rowNotUpBounded)//would have to either choose side or duplicate cut
    15651570  {
    1566     std::cerr<<"OA on non-convex constraint is very experimental, don't know how to remove"
     1571    std::cerr<<""
    15671572    <<std::endl;
    15681573  }
     
    16101615  TNLP::IndexStyleEnum index_style;
    16111616  tminlp_->get_nlp_info( n, m, nnz_jac_g, nnz_h_lag, index_style);
    1612   int offset = (index_style = TNLP::FORTRAN_STYLE);
     1617  int offset = (index_style == TNLP::FORTRAN_STYLE);
    16131618  if(jRow_ == NULL || jCol_ == NULL || jValues_ == NULL)
    16141619    initializeJacobianArrays();
     
    16221627  double * lb = new double[nNonLinear_ + 1];
    16231628  double * ub = new double[nNonLinear_ + 1];
    1624   int * binding = new int[nNonLinear_ + 1];//store binding constraints at current opt (which are added to OA) -1 if constraint is not binding, otherwise index in subset of binding constraints
     1629  int * binding = new int[m + 1];//store binding constraints at current opt (which are added to OA) -1 if constraint is not binding, otherwise index in subset of binding constraints
    16251630  int numBindings = 0;
    16261631
     
    16631668
    16641669  for(int i = 0 ; i < nnz_jac_g ; i++) {
    1665     if(constTypes_[jRow_[i] - 1] == TNLP::NON_LINEAR) {
     1670    if(constTypes_[jRow_[i] - offset] == TNLP::NON_LINEAR) {
    16661671      //"clean" coefficient
    16671672      if(cleanNnz(jValues_[i],colLower[jCol_[i] - offset], colUpper[jCol_[i]-offset],
     
    19941999      }
    19952000      else
    1996         if(rowLower[i] > - nlp_infty)
     2001        if(rowLower[i] > - nlp_infty){
    19972002          rowLow[i] = (rowLower[i] - g[i]) - 1e-07;
     2003          if(rowUpper[i] < nlp_infty){
     2004             messageHandler()->message(ERROR_NO_TNLPSOLVER, messages_)<<CoinMessageEol;
     2005          }
     2006        }
    19982007      else
    19992008        rowLow[i] = - infty;
  • trunk/Bonmin/src/Interfaces/BonOsiTMINLPInterface.hpp

    r585 r605  
    103103                                         */,
    104104    ERROR_NO_TNLPSOLVER /** Trying to access non-existent TNLPSolver*/,
     105    WARNING_NON_CONVEX_OA /** Warn that there are equality or ranged constraints and OA may works bad.*/,
    105106    OSITMINLPINTERFACE_DUMMY_END
    106107  };
  • trunk/Bonmin/test/Makefile.am

    r536 r605  
    9595        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    9696        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     97        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    9798        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    9899        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
  • trunk/Bonmin/test/Makefile.in

    r536 r605  
    387387        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    388388        -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     389        -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    389390        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    390391        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
  • trunk/config.guess

    r1 r605  
    55#   Inc.
    66
    7 timestamp='2006-05-13'
     7timestamp='2007-05-17'
    88
    99# This file is free software; you can redistribute it and/or modify it
     
    162162            sh3el) machine=shl-unknown ;;
    163163            sh3eb) machine=sh-unknown ;;
     164            sh5el) machine=sh5le-unknown ;;
    164165            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
    165166        esac
     
    212213        exit ;;
    213214    macppc:MirBSD:*:*)
    214         echo powerppc-unknown-mirbsd${UNAME_RELEASE}
     215        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
    215216        exit ;;
    216217    *:MirBSD:*:*)
     
    330331        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    331332        exit ;;
    332     i86pc:SunOS:5.*:*)
     333    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
    333334        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    334335        exit ;;
     
    781782        echo ${UNAME_MACHINE}-pc-cygwin
    782783        exit ;;
    783     i*:MINGW*:*)
     784    *:MINGW*:*)
    784785        echo ${UNAME_MACHINE}-pc-mingw32
    785786        exit ;;
     
    791792        echo ${UNAME_MACHINE}-pc-pw32
    792793        exit ;;
    793     x86:Interix*:[345]*)
    794         echo i586-pc-interix${UNAME_RELEASE}
    795         exit ;;
    796     EM64T:Interix*:[345]*)
    797         echo x86_64-unknown-interix${UNAME_RELEASE}
    798         exit ;;
     794    *:Interix*:[3456]*)
     795        case ${UNAME_MACHINE} in
     796            x86)
     797                echo i586-pc-interix${UNAME_RELEASE}
     798                exit ;;
     799            EM64T | authenticamd)
     800                echo x86_64-unknown-interix${UNAME_RELEASE}
     801                exit ;;
     802        esac ;;
    799803    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    800804        echo i${UNAME_MACHINE}-pc-mks
     
    830834        exit ;;
    831835    arm*:Linux:*:*)
     836        echo ${UNAME_MACHINE}-unknown-linux-gnu
     837        exit ;;
     838    avr32*:Linux:*:*)
    832839        echo ${UNAME_MACHINE}-unknown-linux-gnu
    833840        exit ;;
     
    947954    x86_64:Linux:*:*)
    948955        echo x86_64-unknown-linux-gnu
     956        exit ;;
     957    xtensa:Linux:*:*)
     958        echo xtensa-unknown-linux-gnu
    949959        exit ;;
    950960    i*86:Linux:*:*)
     
    12061216        echo sx6-nec-superux${UNAME_RELEASE}
    12071217        exit ;;
     1218    SX-7:SUPER-UX:*:*)
     1219        echo sx7-nec-superux${UNAME_RELEASE}
     1220        exit ;;
     1221    SX-8:SUPER-UX:*:*)
     1222        echo sx8-nec-superux${UNAME_RELEASE}
     1223        exit ;;
     1224    SX-8R:SUPER-UX:*:*)
     1225        echo sx8r-nec-superux${UNAME_RELEASE}
     1226        exit ;;
    12081227    Power*:Rhapsody:*:*)
    12091228        echo powerpc-apple-rhapsody${UNAME_RELEASE}
  • trunk/config.sub

    r1 r605  
    55#   Inc.
    66
    7 timestamp='2006-05-13'
     7timestamp='2007-04-29'
    88
    99# This file is (in principle) common to ALL GNU software.
     
    242242        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
    243243        | am33_2.0 \
    244         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
     244        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
    245245        | bfin \
    246246        | c4x | clipper \
    247247        | d10v | d30v | dlx | dsp16xx \
    248         | fr30 | frv \
     248        | fido | fr30 | frv \
    249249        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    250250        | i370 | i860 | i960 | ia64 \
    251251        | ip2k | iq2000 \
    252252        | m32c | m32r | m32rle | m68000 | m68k | m88k \
    253         | maxq | mb | microblaze | mcore \
     253        | maxq | mb | microblaze | mcore | mep \
    254254        | mips | mipsbe | mipseb | mipsel | mipsle \
    255255        | mips16 \
     
    277277        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
    278278        | pyramid \
     279        | score \
    279280        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
    280281        | sh64 | sh64le \
     
    285286        | v850 | v850e \
    286287        | we32k \
    287         | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
     288        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
    288289        | z8k)
    289290                basic_machine=$basic_machine-unknown
     
    318319        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
    319320        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
    320         | avr-* \
     321        | avr-* | avr32-* \
    321322        | bfin-* | bs2000-* \
    322323        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
     
    324325        | d10v-* | d30v-* | dlx-* \
    325326        | elxsi-* \
    326         | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
     327        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
    327328        | h8300-* | h8500-* \
    328329        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
     
    368369        | v850-* | v850e-* | vax-* \
    369370        | we32k-* \
    370         | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
     371        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
    371372        | xstormy16-* | xtensa-* \
    372373        | ymp-* \
     
    682683                basic_machine=i386-pc
    683684                os=-mingw32
     685                ;;
     686        mingw32ce)
     687                basic_machine=arm-unknown
     688                os=-mingw32ce
    684689                ;;
    685690        miniframe)
     
    910915                basic_machine=mipsisa64sb1el-unknown
    911916                ;;
     917        sde)
     918                basic_machine=mipsisa32-sde
     919                os=-elf
     920                ;;
    912921        sei)
    913922                basic_machine=mips-sei
     
    920929                basic_machine=sh-hitachi
    921930                os=-hms
     931                ;;
     932        sh5el)
     933                basic_machine=sh5le-unknown
    922934                ;;
    923935        sh64)
     
    12151227              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    12161228              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
    1217               | -skyos* | -haiku* | -rdos*)
     1229              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
    12181230        # Remember, each alternative MUST END IN *, to match a version number.
    12191231                ;;
     
    13671379
    13681380case $basic_machine in
     1381        score-*)
     1382                os=-elf
     1383                ;;
    13691384        spu-*)
    13701385                os=-elf
     
    14061421        m68*-cisco)
    14071422                os=-aout
     1423                ;;
     1424        mep-*)
     1425                os=-elf
    14081426                ;;
    14091427        mips*-cisco)
  • trunk/configure

    r589 r605  
    26552655          cl* | */cl* | CL* | */CL*)
    26562656            coin_opt_cflags='-MT -O2'
    2657             coin_add_cflags='-nologo -wd4996'
     2657            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    26582658            coin_dbg_cflags='-MTd'
    26592659            ;;
     
    33903390fi
    33913391
     3392# It seems that we need to cleanup something here for the Windows
     3393case "$CXX" in
     3394  cl* | */cl* | CL* | */CL* )
     3395    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     3396    mv confdefs.hh confdefs.h
     3397    ;;
     3398esac
     3399
    33923400# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    33933401case "$CXX" in
     
    34903498            # The MT and MTd options are mutually exclusive
    34913499            coin_opt_cxxflags='-MT -O2'
    3492             coin_add_cxxflags='-nologo -EHsc -GR -wd4996'
     3500            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    34933501            coin_dbg_cxxflags='-MTd'
    34943502            ;;
     
    40124020
    40134021# Provide some information about the compiler.
    4014 echo "$as_me:4014:" \
     4022echo "$as_me:4022:" \
    40154023     "checking for Fortran 77 compiler version" >&5
    40164024ac_compiler=`set X $ac_compile; echo $2`
     
    62896297*-*-irix6*)
    62906298  # Find out which ABI we are using.
    6291   echo '#line 6291 "configure"' > conftest.$ac_ext
     6299  echo '#line 6299 "configure"' > conftest.$ac_ext
    62926300  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    62936301  (eval $ac_compile) 2>&5
     
    82538261   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82548262   -e 's:$: $lt_compiler_flag:'`
    8255    (eval echo "\"\$as_me:8255: $lt_compile\"" >&5)
     8263   (eval echo "\"\$as_me:8263: $lt_compile\"" >&5)
    82568264   (eval "$lt_compile" 2>conftest.err)
    82578265   ac_status=$?
    82588266   cat conftest.err >&5
    8259    echo "$as_me:8259: \$? = $ac_status" >&5
     8267   echo "$as_me:8267: \$? = $ac_status" >&5
    82608268   if (exit $ac_status) && test -s "$ac_outfile"; then
    82618269     # The compiler can only warn and ignore the option if not recognized
     
    85218529   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85228530   -e 's:$: $lt_compiler_flag:'`
    8523    (eval echo "\"\$as_me:8523: $lt_compile\"" >&5)
     8531   (eval echo "\"\$as_me:8531: $lt_compile\"" >&5)
    85248532   (eval "$lt_compile" 2>conftest.err)
    85258533   ac_status=$?
    85268534   cat conftest.err >&5
    8527    echo "$as_me:8527: \$? = $ac_status" >&5
     8535   echo "$as_me:8535: \$? = $ac_status" >&5
    85288536   if (exit $ac_status) && test -s "$ac_outfile"; then
    85298537     # The compiler can only warn and ignore the option if not recognized
     
    86258633   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86268634   -e 's:$: $lt_compiler_flag:'`
    8627    (eval echo "\"\$as_me:8627: $lt_compile\"" >&5)
     8635   (eval echo "\"\$as_me:8635: $lt_compile\"" >&5)
    86288636   (eval "$lt_compile" 2>out/conftest.err)
    86298637   ac_status=$?
    86308638   cat out/conftest.err >&5
    8631    echo "$as_me:8631: \$? = $ac_status" >&5
     8639   echo "$as_me:8639: \$? = $ac_status" >&5
    86328640   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    86338641   then
     
    1097010978  lt_status=$lt_dlunknown
    1097110979  cat > conftest.$ac_ext <<EOF
    10972 #line 10972 "configure"
     10980#line 10980 "configure"
    1097310981#include "confdefs.h"
    1097410982
     
    1107011078  lt_status=$lt_dlunknown
    1107111079  cat > conftest.$ac_ext <<EOF
    11072 #line 11072 "configure"
     11080#line 11080 "configure"
    1107311081#include "confdefs.h"
    1107411082
     
    1341413422   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1341513423   -e 's:$: $lt_compiler_flag:'`
    13416    (eval echo "\"\$as_me:13416: $lt_compile\"" >&5)
     13424   (eval echo "\"\$as_me:13424: $lt_compile\"" >&5)
    1341713425   (eval "$lt_compile" 2>conftest.err)
    1341813426   ac_status=$?
    1341913427   cat conftest.err >&5
    13420    echo "$as_me:13420: \$? = $ac_status" >&5
     13428   echo "$as_me:13428: \$? = $ac_status" >&5
    1342113429   if (exit $ac_status) && test -s "$ac_outfile"; then
    1342213430     # The compiler can only warn and ignore the option if not recognized
     
    1351813526   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1351913527   -e 's:$: $lt_compiler_flag:'`
    13520    (eval echo "\"\$as_me:13520: $lt_compile\"" >&5)
     13528   (eval echo "\"\$as_me:13528: $lt_compile\"" >&5)
    1352113529   (eval "$lt_compile" 2>out/conftest.err)
    1352213530   ac_status=$?
    1352313531   cat out/conftest.err >&5
    13524    echo "$as_me:13524: \$? = $ac_status" >&5
     13532   echo "$as_me:13532: \$? = $ac_status" >&5
    1352513533   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1352613534   then
     
    1508815096   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1508915097   -e 's:$: $lt_compiler_flag:'`
    15090    (eval echo "\"\$as_me:15090: $lt_compile\"" >&5)
     15098   (eval echo "\"\$as_me:15098: $lt_compile\"" >&5)
    1509115099   (eval "$lt_compile" 2>conftest.err)
    1509215100   ac_status=$?
    1509315101   cat conftest.err >&5
    15094    echo "$as_me:15094: \$? = $ac_status" >&5
     15102   echo "$as_me:15102: \$? = $ac_status" >&5
    1509515103   if (exit $ac_status) && test -s "$ac_outfile"; then
    1509615104     # The compiler can only warn and ignore the option if not recognized
     
    1519215200   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1519315201   -e 's:$: $lt_compiler_flag:'`
    15194    (eval echo "\"\$as_me:15194: $lt_compile\"" >&5)
     15202   (eval echo "\"\$as_me:15202: $lt_compile\"" >&5)
    1519515203   (eval "$lt_compile" 2>out/conftest.err)
    1519615204   ac_status=$?
    1519715205   cat out/conftest.err >&5
    15198    echo "$as_me:15198: \$? = $ac_status" >&5
     15206   echo "$as_me:15206: \$? = $ac_status" >&5
    1519915207   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1520015208   then
     
    1739917407   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1740017408   -e 's:$: $lt_compiler_flag:'`
    17401    (eval echo "\"\$as_me:17401: $lt_compile\"" >&5)
     17409   (eval echo "\"\$as_me:17409: $lt_compile\"" >&5)
    1740217410   (eval "$lt_compile" 2>conftest.err)
    1740317411   ac_status=$?
    1740417412   cat conftest.err >&5
    17405    echo "$as_me:17405: \$? = $ac_status" >&5
     17413   echo "$as_me:17413: \$? = $ac_status" >&5
    1740617414   if (exit $ac_status) && test -s "$ac_outfile"; then
    1740717415     # The compiler can only warn and ignore the option if not recognized
     
    1766717675   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1766817676   -e 's:$: $lt_compiler_flag:'`
    17669    (eval echo "\"\$as_me:17669: $lt_compile\"" >&5)
     17677   (eval echo "\"\$as_me:17677: $lt_compile\"" >&5)
    1767017678   (eval "$lt_compile" 2>conftest.err)
    1767117679   ac_status=$?
    1767217680   cat conftest.err >&5
    17673    echo "$as_me:17673: \$? = $ac_status" >&5
     17681   echo "$as_me:17681: \$? = $ac_status" >&5
    1767417682   if (exit $ac_status) && test -s "$ac_outfile"; then
    1767517683     # The compiler can only warn and ignore the option if not recognized
     
    1777117779   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1777217780   -e 's:$: $lt_compiler_flag:'`
    17773    (eval echo "\"\$as_me:17773: $lt_compile\"" >&5)
     17781   (eval echo "\"\$as_me:17781: $lt_compile\"" >&5)
    1777417782   (eval "$lt_compile" 2>out/conftest.err)
    1777517783   ac_status=$?
    1777617784   cat out/conftest.err >&5
    17777    echo "$as_me:17777: \$? = $ac_status" >&5
     17785   echo "$as_me:17785: \$? = $ac_status" >&5
    1777817786   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1777917787   then
Note: See TracChangeset for help on using the changeset viewer.