Changeset 1035


Ignore:
Timestamp:
Jun 26, 2007 4:01:03 AM (13 years ago)
Author:
forrest
Message:

forgot to add ClpConstraint?

Location:
trunk/Clp/src
Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/Makefile.am

    r994 r1035  
    2323        ClpCholeskyDense.cpp ClpCholeskyDense.hpp \
    2424        ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp \
    25         ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp \
    26         ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp \
     25        ClpConstraint.cpp ClpConstraint.hpp \
     26        ClpConstraintLinear.cpp ClpConstraintLinear.hpp \
     27        ClpConstraintQuadratic.cpp ClpConstraintQuadratic.hpp \
    2728        Clp_C_Interface.cpp Clp_C_Interface.h \
    2829        ClpDualRowDantzig.cpp ClpDualRowDantzig.hpp \
     
    121122        ClpCholeskyDense.hpp \
    122123        ClpCholeskyWssmp.hpp \
     124        ClpConstraint.hpp \
     125        ClpConstraintLinear.hpp \
     126        ClpConstraintQuadratic.hpp \
    123127        ClpDualRowDantzig.hpp \
    124128        ClpDualRowPivot.hpp \
  • trunk/Clp/src/Makefile.in

    r994 r1035  
    6969libClp_la_LIBADD =
    7070am_libClp_la_OBJECTS = ClpCholeskyBase.lo ClpCholeskyDense.lo \
    71         ClpCholeskyUfl.lo ClpCholeskyWssmp.lo ClpCholeskyWssmpKKT.lo \
    72         Clp_C_Interface.lo ClpDualRowDantzig.lo ClpDualRowPivot.lo \
    73         ClpDualRowSteepest.lo ClpDummyMatrix.lo \
    74         ClpDynamicExampleMatrix.lo ClpDynamicMatrix.lo \
    75         ClpEventHandler.lo ClpFactorization.lo ClpGubDynamicMatrix.lo \
    76         ClpGubMatrix.lo ClpHelperFunctions.lo ClpInterior.lo \
    77         ClpLinearObjective.lo ClpMatrixBase.lo ClpMessage.lo \
    78         ClpModel.lo ClpNetworkBasis.lo ClpNetworkMatrix.lo \
    79         ClpNonLinearCost.lo ClpObjective.lo ClpPackedMatrix.lo \
    80         ClpPlusMinusOneMatrix.lo ClpPredictorCorrector.lo \
    81         ClpPresolve.lo ClpPrimalColumnDantzig.lo \
    82         ClpPrimalColumnPivot.lo ClpPrimalColumnSteepest.lo \
    83         ClpQuadraticObjective.lo ClpSimplex.lo ClpSimplexDual.lo \
    84         ClpSimplexNonlinear.lo ClpSimplexOther.lo ClpSimplexPrimal.lo \
    85         ClpSolve.lo Idiot.lo IdiSolve.lo
     71        ClpCholeskyUfl.lo ClpConstraint.lo ClpConstraintLinear.lo \
     72        ClpConstraintQuadratic.lo Clp_C_Interface.lo \
     73        ClpDualRowDantzig.lo ClpDualRowPivot.lo ClpDualRowSteepest.lo \
     74        ClpDummyMatrix.lo ClpDynamicExampleMatrix.lo \
     75        ClpDynamicMatrix.lo ClpEventHandler.lo ClpFactorization.lo \
     76        ClpGubDynamicMatrix.lo ClpGubMatrix.lo ClpHelperFunctions.lo \
     77        ClpInterior.lo ClpLinearObjective.lo ClpMatrixBase.lo \
     78        ClpMessage.lo ClpModel.lo ClpNetworkBasis.lo \
     79        ClpNetworkMatrix.lo ClpNonLinearCost.lo ClpObjective.lo \
     80        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
    8687libClp_la_OBJECTS = $(am_libClp_la_OBJECTS)
    8788binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     
    275276        ClpCholeskyDense.cpp ClpCholeskyDense.hpp \
    276277        ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp \
    277         ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp \
    278         ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp \
     278        ClpConstraint.cpp ClpConstraint.hpp \
     279        ClpConstraintLinear.cpp ClpConstraintLinear.hpp \
     280        ClpConstraintQuadratic.cpp ClpConstraintQuadratic.hpp \
    279281        Clp_C_Interface.cpp Clp_C_Interface.h \
    280282        ClpDualRowDantzig.cpp ClpDualRowDantzig.hpp \
     
    366368        ClpCholeskyDense.hpp \
    367369        ClpCholeskyWssmp.hpp \
     370        ClpConstraint.hpp \
     371        ClpConstraintLinear.hpp \
     372        ClpConstraintQuadratic.hpp \
    368373        ClpDualRowDantzig.hpp \
    369374        ClpDualRowPivot.hpp \
     
    509514@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpCholeskyDense.Plo@am__quote@
    510515@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpCholeskyUfl.Plo@am__quote@
    511 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpCholeskyWssmp.Plo@am__quote@
    512 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpCholeskyWssmpKKT.Plo@am__quote@
     516@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpConstraint.Plo@am__quote@
     517@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpConstraintLinear.Plo@am__quote@
     518@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpConstraintQuadratic.Plo@am__quote@
    513519@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpDualRowDantzig.Plo@am__quote@
    514520@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpDualRowPivot.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.