Changeset 182 for branches


Ignore:
Timestamp:
Jul 18, 2003 3:49:05 PM (16 years ago)
Author:
forrest
Message:

Finished for now

Location:
branches/pre
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/pre/ClpSimplex.cpp

    r180 r182  
    27872787  return ((ClpSimplexPrimal *) this)->primal(ifValuesPass);
    27882788}
    2789 #ifdef QUADRATIC
    27902789#include "ClpSimplexPrimalQuadratic.hpp"
    27912790/* Solves quadratic problem using SLP - may be used as crash
     
    28032802  return ((ClpSimplexPrimalQuadratic *) this)->primalQuadratic(phase);
    28042803}
    2805 #endif
    28062804/* For strong branching.  On input lower and upper are new bounds
    28072805   while on output they are objective function values (>1.0e50 infeasible).
  • branches/pre/ClpSimplexPrimalQuadratic.cpp

    r180 r182  
    88#include "CoinHelperFunctions.hpp"
    99#include "ClpSimplexPrimalQuadratic.hpp"
    10 #ifdef QUADRATIC
    1110#include "ClpPrimalQuadraticDantzig.hpp"
    12 #endif
    1311#include "ClpFactorization.hpp"
    1412#include "ClpNonLinearCost.hpp"
  • branches/pre/Makefile.Clp

    r170 r182  
    3232LIBSRC += ClpSimplexPrimal.cpp
    3333LIBSRC += ClpSimplexPrimalQuadratic.cpp
    34 #LIBSRC += ClpPrimalQuadraticDantzig.cpp
     34LIBSRC += ClpPrimalQuadraticDantzig.cpp
    3535# and Presolve stuff
    36 LIBSRC += Presolve.cpp
    37 LIBSRC += PresolveDoubleton.cpp
    38 LIBSRC += PresolveEmpty.cpp
    39 LIBSRC += PresolveFixed.cpp
    40 LIBSRC += PresolveMatrix.cpp
    41 LIBSRC += PresolvePsdebug.cpp
    42 LIBSRC += PresolveSingleton.cpp
    43 LIBSRC += PresolveZeros.cpp
    44 LIBSRC += PresolveDual.cpp                 
    45 LIBSRC += PresolveDupcol.cpp               
    46 LIBSRC += PresolveForcing.cpp               
    47 LIBSRC += PresolveImpliedFree.cpp           
    48 LIBSRC += PresolveIsolated.cpp     
    49 LIBSRC += PresolveSubst.cpp                 
    50 LIBSRC += PresolveTighten.cpp               
    51 LIBSRC += PresolveUseless.cpp             
     36LIBSRC += ClpPresolve.cpp
    5237
    5338LIBSRC += Idiot.cpp
     
    6449CXXFLAGS += -DCLP_IDIOT
    6550CXXFLAGS += -DUSE_PRESOLVE
    66 #CXXFLAGS += -DQUADRATIC
    6751ifeq ($(OptLevel),-g)
    6852#     CXXFLAGS += -DCLP_DEBUG
  • branches/pre/Test/Makefile.test

    r175 r182  
    2828# Pick up any include files in Test
    2929CXXFLAGS += -I.
    30 #CXXFLAGS += -DQUADRATIC
    3130#ifeq ($(OPTFLAG),-g)
    3231#    CXXFLAGS += -DCLP_DEBUG -DPRESOLVE_SUMMARY=1
Note: See TracChangeset for help on using the changeset viewer.