Changeset 1171


Ignore:
Timestamp:
Mar 4, 2008 11:31:56 AM (11 years ago)
Author:
forrest
Message:

put back pdco in case wanted

Location:
trunk/Clp
Files:
11 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1155 r1171  
    39663966# START
    39673967
    3968 # On Cygwin and AIX, building DLLs doesn't work
    3969 case $build in
    3970   *-cygwin*)
    3971     coin_disable_shared=yes
    3972     platform=Cygwin
    3973   ;;
    3974   *-aix*)
    3975     coin_disable_shared=yes
    3976     platform=AIX
    3977   ;;
    3978   *-mingw*)
    3979     coin_disable_shared=yes
    3980     platform="Msys"
    3981 #    case "$CXX" in
    3982 #      cl*)
    3983 #        coin_disable_shared=yes
    3984 #        platform="Msys with cl"
    3985 #    ;;
    3986 #    esac
    3987   ;;
    3988 esac
     3968# Test if force_shared has been set
     3969if test "x" = xforce_shared; then
     3970  if test x$enable_shared = xno; then
     3971    { { echo "$as_me:$LINENO: error: Shared libraries are disabled by user, but this is not feasible with the given options" >&5
     3972echo "$as_me: error: Shared libraries are disabled by user, but this is not feasible with the given options" >&2;}
     3973   { (exit 1); exit 1; }; }
     3974  fi
     3975  enable_shared=yes;
     3976else
     3977  # On Cygwin and AIX, building DLLs doesn't work
     3978  case $build in
     3979    *-cygwin*)
     3980      coin_disable_shared=yes
     3981      platform=Cygwin
     3982    ;;
     3983    *-aix*)
     3984      coin_disable_shared=yes
     3985      platform=AIX
     3986    ;;
     3987    *-mingw*)
     3988      coin_disable_shared=yes
     3989      platform="Msys"
     3990#      case "$CXX" in
     3991#        cl*)
     3992#          coin_disable_shared=yes
     3993#          platform="Msys with cl"
     3994#      ;;
     3995#      esac
     3996    ;;
     3997  esac
     3998fi
    39893999if test x"$coin_disable_shared" = xyes; then
    39904000  if test x"$enable_shared" = xyes; then
     
    56915701*-*-irix6*)
    56925702  # Find out which ABI we are using.
    5693   echo '#line 5693 "configure"' > conftest.$ac_ext
     5703  echo '#line 5703 "configure"' > conftest.$ac_ext
    56945704  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    56955705  (eval $ac_compile) 2>&5
     
    68256835
    68266836# Provide some information about the compiler.
    6827 echo "$as_me:6827:" \
     6837echo "$as_me:6837:" \
    68286838     "checking for Fortran 77 compiler version" >&5
    68296839ac_compiler=`set X $ac_compile; echo $2`
     
    78927902   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78937903   -e 's:$: $lt_compiler_flag:'`
    7894    (eval echo "\"\$as_me:7894: $lt_compile\"" >&5)
     7904   (eval echo "\"\$as_me:7904: $lt_compile\"" >&5)
    78957905   (eval "$lt_compile" 2>conftest.err)
    78967906   ac_status=$?
    78977907   cat conftest.err >&5
    7898    echo "$as_me:7898: \$? = $ac_status" >&5
     7908   echo "$as_me:7908: \$? = $ac_status" >&5
    78997909   if (exit $ac_status) && test -s "$ac_outfile"; then
    79007910     # The compiler can only warn and ignore the option if not recognized
     
    81608170   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81618171   -e 's:$: $lt_compiler_flag:'`
    8162    (eval echo "\"\$as_me:8162: $lt_compile\"" >&5)
     8172   (eval echo "\"\$as_me:8172: $lt_compile\"" >&5)
    81638173   (eval "$lt_compile" 2>conftest.err)
    81648174   ac_status=$?
    81658175   cat conftest.err >&5
    8166    echo "$as_me:8166: \$? = $ac_status" >&5
     8176   echo "$as_me:8176: \$? = $ac_status" >&5
    81678177   if (exit $ac_status) && test -s "$ac_outfile"; then
    81688178     # The compiler can only warn and ignore the option if not recognized
     
    82648274   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82658275   -e 's:$: $lt_compiler_flag:'`
    8266    (eval echo "\"\$as_me:8266: $lt_compile\"" >&5)
     8276   (eval echo "\"\$as_me:8276: $lt_compile\"" >&5)
    82678277   (eval "$lt_compile" 2>out/conftest.err)
    82688278   ac_status=$?
    82698279   cat out/conftest.err >&5
    8270    echo "$as_me:8270: \$? = $ac_status" >&5
     8280   echo "$as_me:8280: \$? = $ac_status" >&5
    82718281   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82728282   then
     
    1060910619  lt_status=$lt_dlunknown
    1061010620  cat > conftest.$ac_ext <<EOF
    10611 #line 10611 "configure"
     10621#line 10621 "configure"
    1061210622#include "confdefs.h"
    1061310623
     
    1070910719  lt_status=$lt_dlunknown
    1071010720  cat > conftest.$ac_ext <<EOF
    10711 #line 10711 "configure"
     10721#line 10721 "configure"
    1071210722#include "confdefs.h"
    1071310723
     
    1305313063   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1305413064   -e 's:$: $lt_compiler_flag:'`
    13055    (eval echo "\"\$as_me:13055: $lt_compile\"" >&5)
     13065   (eval echo "\"\$as_me:13065: $lt_compile\"" >&5)
    1305613066   (eval "$lt_compile" 2>conftest.err)
    1305713067   ac_status=$?
    1305813068   cat conftest.err >&5
    13059    echo "$as_me:13059: \$? = $ac_status" >&5
     13069   echo "$as_me:13069: \$? = $ac_status" >&5
    1306013070   if (exit $ac_status) && test -s "$ac_outfile"; then
    1306113071     # The compiler can only warn and ignore the option if not recognized
     
    1315713167   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1315813168   -e 's:$: $lt_compiler_flag:'`
    13159    (eval echo "\"\$as_me:13159: $lt_compile\"" >&5)
     13169   (eval echo "\"\$as_me:13169: $lt_compile\"" >&5)
    1316013170   (eval "$lt_compile" 2>out/conftest.err)
    1316113171   ac_status=$?
    1316213172   cat out/conftest.err >&5
    13163    echo "$as_me:13163: \$? = $ac_status" >&5
     13173   echo "$as_me:13173: \$? = $ac_status" >&5
    1316413174   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1316513175   then
     
    1472714737   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1472814738   -e 's:$: $lt_compiler_flag:'`
    14729    (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
     14739   (eval echo "\"\$as_me:14739: $lt_compile\"" >&5)
    1473014740   (eval "$lt_compile" 2>conftest.err)
    1473114741   ac_status=$?
    1473214742   cat conftest.err >&5
    14733    echo "$as_me:14733: \$? = $ac_status" >&5
     14743   echo "$as_me:14743: \$? = $ac_status" >&5
    1473414744   if (exit $ac_status) && test -s "$ac_outfile"; then
    1473514745     # The compiler can only warn and ignore the option if not recognized
     
    1483114841   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1483214842   -e 's:$: $lt_compiler_flag:'`
    14833    (eval echo "\"\$as_me:14833: $lt_compile\"" >&5)
     14843   (eval echo "\"\$as_me:14843: $lt_compile\"" >&5)
    1483414844   (eval "$lt_compile" 2>out/conftest.err)
    1483514845   ac_status=$?
    1483614846   cat out/conftest.err >&5
    14837    echo "$as_me:14837: \$? = $ac_status" >&5
     14847   echo "$as_me:14847: \$? = $ac_status" >&5
    1483814848   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1483914849   then
     
    1703817048   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1703917049   -e 's:$: $lt_compiler_flag:'`
    17040    (eval echo "\"\$as_me:17040: $lt_compile\"" >&5)
     17050   (eval echo "\"\$as_me:17050: $lt_compile\"" >&5)
    1704117051   (eval "$lt_compile" 2>conftest.err)
    1704217052   ac_status=$?
    1704317053   cat conftest.err >&5
    17044    echo "$as_me:17044: \$? = $ac_status" >&5
     17054   echo "$as_me:17054: \$? = $ac_status" >&5
    1704517055   if (exit $ac_status) && test -s "$ac_outfile"; then
    1704617056     # The compiler can only warn and ignore the option if not recognized
     
    1730617316   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1730717317   -e 's:$: $lt_compiler_flag:'`
    17308    (eval echo "\"\$as_me:17308: $lt_compile\"" >&5)
     17318   (eval echo "\"\$as_me:17318: $lt_compile\"" >&5)
    1730917319   (eval "$lt_compile" 2>conftest.err)
    1731017320   ac_status=$?
    1731117321   cat conftest.err >&5
    17312    echo "$as_me:17312: \$? = $ac_status" >&5
     17322   echo "$as_me:17322: \$? = $ac_status" >&5
    1731317323   if (exit $ac_status) && test -s "$ac_outfile"; then
    1731417324     # The compiler can only warn and ignore the option if not recognized
     
    1741017420   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1741117421   -e 's:$: $lt_compiler_flag:'`
    17412    (eval echo "\"\$as_me:17412: $lt_compile\"" >&5)
     17422   (eval echo "\"\$as_me:17422: $lt_compile\"" >&5)
    1741317423   (eval "$lt_compile" 2>out/conftest.err)
    1741417424   ac_status=$?
    1741517425   cat out/conftest.err >&5
    17416    echo "$as_me:17416: \$? = $ac_status" >&5
     17426   echo "$as_me:17426: \$? = $ac_status" >&5
    1741717427   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1741817428   then
  • trunk/Clp/examples/Makefile.in

    r1155 r1171  
    1919# CHANGEME: Here is the name of all object files corresponding to the source
    2020#           code that you wrote in order to define the problem statement
    21 OBJS =  $(DRIVER).@OBJEXT@
     21OBJS =  $(DRIVER).@OBJEXT@ \
     22        myPdco.@OBJEXT@
    2223
    2324# CHANGEME: Additional libraries
  • trunk/Clp/src/ClpInterior.cpp

    r754 r1171  
    1212#include "ClpInterior.hpp"
    1313#include "ClpMatrixBase.hpp"
    14 #ifdef PDCO
     14#ifdef COIN_DO_PDCO
    1515#include "ClpLsqr.hpp"
    1616#include "ClpPdcoBase.hpp"
     
    381381   y_ = ClpCopyOfArray(rhs.y_,numberRows_);
    382382  dj_ = ClpCopyOfArray(rhs.dj_,numberColumns_+numberRows_);
    383 #ifdef PDCO
     383#ifdef COIN_DO_PDCO
    384384  lsqrObject_= new ClpLsqr(*rhs.lsqrObject_);
    385385  pdcoStuff_ = rhs.pdcoStuff_->clone();
     
    472472  delete [] dj_;
    473473  dj_ = NULL;
    474 #ifdef PDCO
     474#ifdef COIN_DO_PDCO
    475475  delete lsqrObject_;
    476476  lsqrObject_ = NULL;
     
    966966  return status;
    967967}
    968 #ifdef PDCO
     968#ifdef COIN_DO_PDCO
    969969#include "ClpPdco.hpp"
    970970/* Pdco algorithm - see ClpPdco.hpp for method */
  • trunk/Clp/src/ClpInterior.hpp

    r1055 r1171  
    2020#include "ClpMatrixBase.hpp"
    2121#include "ClpSolve.hpp"
     22#include "CoinDenseVector.hpp"
    2223class ClpLsqr;
    2324class ClpPdcoBase;
  • trunk/Clp/src/Makefile.am

    r1170 r1171  
    5252        ClpPlusMinusOneMatrix.cpp ClpPlusMinusOneMatrix.hpp \
    5353        ClpPredictorCorrector.cpp ClpPredictorCorrector.hpp \
     54        ClpPdco.cpp ClpPdco.hpp \
     55        ClpPdcoBase.cpp ClpPdcoBase.hpp \
     56        ClpLsqr.cpp ClpLsqr.hpp \
    5457        ClpPresolve.cpp ClpPresolve.hpp \
    5558        ClpPrimalColumnDantzig.cpp ClpPrimalColumnDantzig.hpp \
     
    130133        ClpDualRowPivot.hpp \
    131134        ClpDualRowSteepest.hpp \
     135        ClpDummyMatrix.hpp \
    132136        ClpDynamicExampleMatrix.hpp \
    133137        ClpDynamicMatrix.hpp \
     
    146150        ClpObjective.hpp \
    147151        ClpPackedMatrix.hpp \
     152        ClpPdcoBase.hpp \
    148153        ClpPlusMinusOneMatrix.hpp \
    149154        ClpParameters.hpp \
  • trunk/Clp/src/Makefile.in

    r1170 r1171  
    7979        ClpNetworkMatrix.lo ClpNonLinearCost.lo ClpNode.lo \
    8080        ClpObjective.lo ClpPackedMatrix.lo ClpPlusMinusOneMatrix.lo \
    81         ClpPredictorCorrector.lo ClpPresolve.lo \
    82         ClpPrimalColumnDantzig.lo ClpPrimalColumnPivot.lo \
    83         ClpPrimalColumnSteepest.lo ClpQuadraticObjective.lo \
    84         ClpSimplex.lo ClpSimplexDual.lo ClpSimplexNonlinear.lo \
    85         ClpSimplexOther.lo ClpSimplexPrimal.lo ClpSolve.lo Idiot.lo \
    86         IdiSolve.lo
     81        ClpPredictorCorrector.lo ClpPdco.lo ClpPdcoBase.lo ClpLsqr.lo \
     82        ClpPresolve.lo ClpPrimalColumnDantzig.lo \
     83        ClpPrimalColumnPivot.lo ClpPrimalColumnSteepest.lo \
     84        ClpQuadraticObjective.lo ClpSimplex.lo ClpSimplexDual.lo \
     85        ClpSimplexNonlinear.lo ClpSimplexOther.lo ClpSimplexPrimal.lo \
     86        ClpSolve.lo Idiot.lo IdiSolve.lo
    8787libClp_la_OBJECTS = $(am_libClp_la_OBJECTS)
    8888binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     
    308308        ClpPlusMinusOneMatrix.cpp ClpPlusMinusOneMatrix.hpp \
    309309        ClpPredictorCorrector.cpp ClpPredictorCorrector.hpp \
     310        ClpPdco.cpp ClpPdco.hpp \
     311        ClpPdcoBase.cpp ClpPdcoBase.hpp \
     312        ClpLsqr.cpp ClpLsqr.hpp \
    310313        ClpPresolve.cpp ClpPresolve.hpp \
    311314        ClpPrimalColumnDantzig.cpp ClpPrimalColumnDantzig.hpp \
     
    379382        ClpDualRowPivot.hpp \
    380383        ClpDualRowSteepest.hpp \
     384        ClpDummyMatrix.hpp \
    381385        ClpDynamicExampleMatrix.hpp \
    382386        ClpDynamicMatrix.hpp \
     
    395399        ClpObjective.hpp \
    396400        ClpPackedMatrix.hpp \
     401        ClpPdcoBase.hpp \
    397402        ClpPlusMinusOneMatrix.hpp \
    398403        ClpParameters.hpp \
     
    537542@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpInterior.Plo@am__quote@
    538543@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpLinearObjective.Plo@am__quote@
     544@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpLsqr.Plo@am__quote@
    539545@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpMain.Po@am__quote@
    540546@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpMatrixBase.Plo@am__quote@
     
    547553@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpObjective.Plo@am__quote@
    548554@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpPackedMatrix.Plo@am__quote@
     555@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpPdco.Plo@am__quote@
     556@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpPdcoBase.Plo@am__quote@
    549557@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpPlusMinusOneMatrix.Plo@am__quote@
    550558@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpPredictorCorrector.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.