Changeset 755


Ignore:
Timestamp:
May 11, 2006 12:01:47 PM (13 years ago)
Author:
andreasw
Message:

finished Clp (create now bin/clp_solver)

Location:
trunk
Files:
6 edited
9 moved

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/CbcOrClpParam.cpp

    r754 r755  
    66#endif
    77
     8#include "ClpConfig.hpp"
    89#include <string>
    910#include <iostream>
     
    1112
    1213#include "CbcOrClpParam.hpp"
    13 #ifdef COIN_USE_CBC
     14#ifdef COIN_HAS_CBC
    1415#include "OsiClpSolverInterface.hpp"
    1516#include "ClpSimplex.hpp"
     
    1718#endif
    1819#ifdef COIN_HAS_CLP
    19 #ifndef COIN_USE_CLP
    20 #define COIN_USE_CLP
    21 #endif
    22 #endif
    23 #ifdef COIN_USE_CLP
     20#ifndef COIN_HAS_CLP
     21#define COIN_HAS_CLP
     22#endif
     23#endif
     24#ifdef COIN_HAS_CLP
    2425#include "ClpSimplex.hpp"
    2526#include "ClpFactorization.hpp"
    2627#endif
    27 #ifdef COIN_USE_READLINE     
     28#ifdef COIN_HAS_READLINE     
    2829#include <readline/readline.h>
    2930#include <readline/history.h>
     
    398399  }
    399400}
    400 #ifdef COIN_USE_CBC
     401#ifdef COIN_HAS_CBC
    401402int
    402403CbcOrClpParam::setDoubleParameter (OsiSolverInterface * model,double value)
     
    429430}
    430431#endif
    431 #ifdef COIN_USE_CLP
     432#ifdef COIN_HAS_CLP
    432433int
    433434CbcOrClpParam::setDoubleParameter (ClpSimplex * model,double value)
     
    445446    doubleValue_=value;
    446447    switch(type_) {
    447 #ifndef COIN_USE_CBC
     448#ifndef COIN_HAS_CBC
    448449    case DUALTOLERANCE:
    449450      model->setDualTolerance(value);
     
    459460      model->setInfeasibilityCost(value);
    460461      break;
    461 #ifndef COIN_USE_CBC
     462#ifndef COIN_HAS_CBC
    462463    case TIMELIMIT:
    463464      model->setMaximumSeconds(value);
     
    484485  double value;
    485486  switch(type_) {
    486 #ifndef COIN_USE_CBC
     487#ifndef COIN_HAS_CBC
    487488  case DUALTOLERANCE:
    488489    value=model->dualTolerance();
     
    498499    value=model->infeasibilityCost();
    499500    break;
    500 #ifndef COIN_USE_CBC
     501#ifndef COIN_HAS_CBC
    501502  case TIMELIMIT:
    502503    value=model->maximumSeconds();
     
    562563  int value;
    563564  switch(type_) {
    564 #ifndef COIN_USE_CBC
     565#ifndef COIN_HAS_CBC
    565566  case SOLVERLOGLEVEL:
    566567    value=model->logLevel();
     
    601602  }
    602603}
    603 #ifdef COIN_USE_CBC
     604#ifdef COIN_HAS_CBC
    604605double
    605606CbcOrClpParam::doubleParameter (OsiSolverInterface * model) const
     
    881882  if (!where) {
    882883    // need new line
    883 #ifdef COIN_USE_READLINE     
     884#ifdef COIN_HAS_READLINE     
    884885    if (CbcOrClpReadCommand==stdin) {
    885886      // Get a line from the user.
     
    10841085    CbcOrClpParam("-","From stdin",
    10851086                  STDIN,3,false);
    1086 #ifdef COIN_USE_CBC
     1087#ifdef COIN_HAS_CBC
    10871088    parameters[numberParameters++]=
    10881089      CbcOrClpParam("allow!ableGap","Stop when gap between best possible and \
     
    10961097     );
    10971098#endif
    1098 #ifdef COIN_USE_CLP
     1099#ifdef COIN_HAS_CLP
    10991100  parameters[numberParameters++]=
    11001101    CbcOrClpParam("allS!lack","Set basis back to all slack and reset solution",
     
    11531154  parameters[numberParameters-1].setCurrentOption("LX");
    11541155#endif
    1155 #ifdef COIN_USE_CBC
     1156#ifdef COIN_HAS_CBC
    11561157  parameters[numberParameters++]=
    11571158    CbcOrClpParam("branch!AndCut","Do Branch and Cut",
     
    12091210     );
    12101211  //#endif
    1211 #ifdef COIN_USE_CBC
     1212#ifdef COIN_HAS_CBC
    12121213  parameters[numberParameters++]=
    12131214    CbcOrClpParam("clique!Cuts","Whether to use Clique cuts",
     
    12421243     );
    12431244#endif
    1244 #ifdef COIN_USE_CLP
     1245#ifdef COIN_HAS_CLP
    12451246  parameters[numberParameters++]=
    12461247    CbcOrClpParam("crash","Whether to create basis for problem",
     
    12721273     );
    12731274#endif
    1274 #ifdef COIN_USE_CBC
     1275#ifdef COIN_HAS_CBC
    12751276  parameters[numberParameters++]=
    12761277    CbcOrClpParam("cutD!epth","Depth in tree at which to do cuts",
     
    13411342  It is initialized to './'"
    13421343     );
    1343 #ifdef COIN_USE_CLP
     1344#ifdef COIN_HAS_CLP
    13441345  parameters[numberParameters++]=
    13451346    CbcOrClpParam("dualB!ound","Initially algorithm acts as if no \
     
    14011402correct tolerance (remembering to switch off presolve for this final short clean up phase)."
    14021403     );
    1403 #ifdef COIN_USE_CLP
     1404#ifdef COIN_HAS_CLP
    14041405  parameters[numberParameters++]=
    14051406    CbcOrClpParam("either!Simplex","Do dual or primal simplex algorithm",
     
    14451446 is initialized to 'default.mps'."
    14461447     );
    1447 #ifdef COIN_USE_CLP
     1448#ifdef COIN_HAS_CLP
    14481449  parameters[numberParameters++]=
    14491450    CbcOrClpParam("fakeB!ound","All bounds <= this value - DEBUG",
    14501451                  1.0,1.0e15,FAKEBOUND,false);
    1451 #ifdef COIN_USE_CBC
     1452#ifdef COIN_HAS_CBC
    14521453    parameters[numberParameters++]=
    14531454      CbcOrClpParam("feas!ibilityPump","Whether to try Feasibility Pump",
     
    14911492  parameters[numberParameters-1].append("deltastrong");
    14921493#endif
    1493 #ifdef COIN_USE_CBC
     1494#ifdef COIN_HAS_CBC
    14941495  parameters[numberParameters++]=
    14951496    CbcOrClpParam("gap!Ratio","Stop when gap between best possible and \
     
    15461547you should be past that stage:-)"
    15471548     );
    1548 #ifdef COIN_USE_CBC
     1549#ifdef COIN_HAS_CBC
    15491550  parameters[numberParameters++]=
    15501551    CbcOrClpParam("hot!StartMaxIts","Maximum iterations on hot start",
    15511552                  0,INT_MAX,MAXHOTITS,false);
    15521553#endif
    1553 #ifdef COIN_USE_CLP
     1554#ifdef COIN_HAS_CLP
    15541555  parameters[numberParameters++]=
    15551556    CbcOrClpParam("idiot!Crash","Whether to try idiot crash",
     
    15731574 files 'xxxxxxxx.gz'.."
    15741575     );
    1575 #ifdef COIN_USE_CBC
     1576#ifdef COIN_HAS_CBC
    15761577  parameters[numberParameters++]=
    15771578    CbcOrClpParam("inc!rement","A valid solution must be at least this \
     
    16101611     );
    16111612#endif
    1612 #ifdef COIN_USE_CLP
     1613#ifdef COIN_HAS_CLP
    16131614  parameters[numberParameters++]=
    16141615    CbcOrClpParam("keepN!ames","Whether to keep names from import",
     
    16251626  parameters[numberParameters-1].append("on");
    16261627#endif
    1627 #ifdef COIN_USE_CBC
     1628#ifdef COIN_HAS_CBC
    16281629  parameters[numberParameters++]=
    16291630    CbcOrClpParam("knapsack!Cuts","Whether to use Knapsack cuts",
     
    16491650     );
    16501651#endif
    1651 #ifndef COIN_USE_CBC
     1652#ifndef COIN_HAS_CBC
    16521653  parameters[numberParameters++]=
    16531654    CbcOrClpParam("log!Level","Level of detail in Solver output",
     
    16721673You can also use the parameters 'direction maximize'."
    16731674     );
    1674 #ifdef COIN_USE_CLP
     1675#ifdef COIN_HAS_CLP
    16751676  parameters[numberParameters++]=
    16761677    CbcOrClpParam("maxF!actor","Maximum number of iterations between \
     
    16941695     );
    16951696#endif
    1696 #ifdef COIN_USE_CBC
     1697#ifdef COIN_HAS_CBC
    16971698  parameters[numberParameters++]=
    16981699    CbcOrClpParam("maxN!odes","Maximum number of nodes to do",
     
    17131714You can also use the parameters 'direction minimize'."
    17141715     );
    1715 #ifdef COIN_USE_CBC
     1716#ifdef COIN_HAS_CBC
    17161717  parameters[numberParameters++]=
    17171718    CbcOrClpParam("mipO!ptions","Dubious options for mip",
     
    17431744 you intend to override the behavior of a particular message."
    17441745     );
    1745 #ifdef COIN_USE_CBC
     1746#ifdef COIN_HAS_CBC
    17461747  parameters[numberParameters++]=
    17471748    CbcOrClpParam("miniT!ree","Size of fast mini tree",
     
    17561757                  MIPLIB,3);
    17571758#endif
    1758 #ifdef COIN_USE_CLP
     1759#ifdef COIN_HAS_CLP
    17591760  parameters[numberParameters++]=
    17601761    CbcOrClpParam("netlib","Solve entire netlib test set",
     
    18111812specialized network code."
    18121813     );
    1813 #ifdef COIN_USE_CBC
     1814#ifdef COIN_HAS_CBC
    18141815  parameters[numberParameters++]=
    18151816    CbcOrClpParam("numberA!nalyze","Number of analysis iterations",
     
    18431844values, 2 saves values, 3 with greater accuracy and 4 in IEEE."
    18441845     );
    1845 #ifdef COIN_USE_CBC
     1846#ifdef COIN_HAS_CBC
    18461847  parameters[numberParameters++]=
    18471848    CbcOrClpParam("passC!uts","Number of cut passes at root node",
     
    18611862  parameters[numberParameters-1].setIntValue(20);
    18621863#endif
    1863 #ifdef COIN_USE_CLP
     1864#ifdef COIN_HAS_CLP
    18641865  parameters[numberParameters++]=
    18651866    CbcOrClpParam("passP!resolve","How many passes in presolve",
     
    19281929to write the original to file using 'file'."
    19291930     );
    1930 #ifdef COIN_USE_CBC
     1931#ifdef COIN_HAS_CBC
    19311932  parameters[numberParameters++]=
    19321933    CbcOrClpParam("preprocess","Whether to use integer preprocessing",
     
    19461947     );
    19471948#endif
    1948 #ifdef COIN_USE_CLP
     1949#ifdef COIN_HAS_CLP
    19491950  parameters[numberParameters++]=
    19501951    CbcOrClpParam("preT!olerance","Tolerance to use in presolve",
     
    19931994 bit if a primal run seems to be having a hard time"
    19941995     );
    1995 #ifdef COIN_USE_CLP
     1996#ifdef COIN_HAS_CLP
    19961997  parameters[numberParameters++]=
    19971998    CbcOrClpParam("primalW!eight","Initially algorithm acts as if it \
     
    20352036This is only active if model has names."
    20362037     );
    2037 #ifdef COIN_USE_CBC
     2038#ifdef COIN_HAS_CBC
    20382039  parameters[numberParameters++]=
    20392040    CbcOrClpParam("prio!rityIn","Import priorities etc from file",
     
    20662067     "This stops the execution of Clp, end, exit, quit and stop are synonyms"
    20672068     );
    2068 #ifdef COIN_USE_CLP
     2069#ifdef COIN_HAS_CLP
    20692070  parameters[numberParameters++]=
    20702071    CbcOrClpParam("reallyO!bjectiveScale","Scale factor to apply to objective in place",
     
    20792080                  REALLY_SCALE,7,false);
    20802081#endif
    2081 #ifdef COIN_USE_CBC
     2082#ifdef COIN_HAS_CBC
    20822083    parameters[numberParameters++]=
    20832084      CbcOrClpParam("reduce!AndSplitCuts","Whether to use Reduce-and-Split cuts",
     
    20922093     );
    20932094#endif
    2094 #ifdef COIN_USE_CLP
     2095#ifdef COIN_HAS_CLP
    20952096  parameters[numberParameters++]=
    20962097    CbcOrClpParam("restore!Model","Restore model from binary file",
     
    21192120  parameters[numberParameters-1].setDoubleValue(1.0);
    21202121#endif
    2121 #ifdef COIN_USE_CBC
     2122#ifdef COIN_HAS_CBC
    21222123  parameters[numberParameters++]=
    21232124    CbcOrClpParam("round!ingHeuristic","Whether to use Rounding heuristic",
     
    21642165     );
    21652166  parameters[numberParameters-1].setCurrentOption(3); // say auto
    2166 #ifndef COIN_USE_CBC
     2167#ifndef COIN_HAS_CBC
    21672168  parameters[numberParameters++]=
    21682169    CbcOrClpParam("sec!onds","Maximum seconds",
     
    21912192     "If passed to solver fom ampl, then ampl will wait so that you can copy .nl file for debug."
    21922193     );
    2193 #ifdef COIN_USE_CLP
     2194#ifdef COIN_HAS_CLP
    21942195  parameters[numberParameters++]=
    21952196    CbcOrClpParam("slp!Value","Number of slp passes before primal",
     
    22102211 is initialized to 'stdout'.  The amount of output can be varied using printi!ngOptions or printMask."
    22112212     );
    2212 #ifdef COIN_USE_CLP
    2213 #ifdef COIN_USE_CBC
     2213#ifdef COIN_HAS_CLP
     2214#ifdef COIN_HAS_CBC
    22142215  parameters[numberParameters++]=
    22152216    CbcOrClpParam("solv!e","Solve problem",
     
    22392240#endif
    22402241#endif
    2241 #ifdef COIN_USE_CLP
     2242#ifdef COIN_HAS_CLP
    22422243  parameters[numberParameters++]=
    22432244    CbcOrClpParam("spars!eFactor","Whether factorization treated as sparse",
     
    22742275     "This stops the execution of Clp, end, exit, quit and stop are synonyms"
    22752276     );
    2276 #ifdef COIN_USE_CBC
     2277#ifdef COIN_HAS_CBC
    22772278  parameters[numberParameters++]=
    22782279    CbcOrClpParam("strengthen","Create strengthened problem",
     
    22942295     );
    22952296#endif
    2296 #ifdef COIN_USE_CLP
     2297#ifdef COIN_HAS_CLP
    22972298  parameters[numberParameters++]=
    22982299    CbcOrClpParam("subs!titution","How long a column to substitute for in presolve",
     
    23082309                  -2,64,THREADS);
    23092310#endif
    2310 #ifdef COIN_USE_CBC
     2311#ifdef COIN_HAS_CBC
    23112312  parameters[numberParameters++]=
    23122313    CbcOrClpParam("tighten!Factor","Tighten bounds using this times largest \
     
    23182319     );
    23192320#endif
    2320 #ifdef COIN_USE_CLP
     2321#ifdef COIN_HAS_CLP
    23212322  parameters[numberParameters++]=
    23222323    CbcOrClpParam("tightLP","Poor person's preSolve for now",
    23232324                  TIGHTEN,7,false);
    23242325#endif
    2325 #ifdef COIN_USE_CBC
     2326#ifdef COIN_HAS_CBC
    23262327  parameters[numberParameters++]=
    23272328    CbcOrClpParam("trust!PseudoCosts","Number of branches before we trust pseudocosts",
     
    23332334     );
    23342335#endif
    2335 #ifdef COIN_USE_CBC
     2336#ifdef COIN_HAS_CBC
    23362337  parameters[numberParameters++]=
    23372338    CbcOrClpParam("two!MirCuts","Whether to use Two phase Mixed Integer Rounding cuts",
  • trunk/Clp/src/CbcOrClpParam.hpp

    r754 r755  
    1010   I know this is not elegant but it seems simplest.
    1111   
    12    It uses COIN_USE_CBC for parameters wanted by CBC
    13    It uses COIN_USE_CLP for parameters wanted by CLP (or CBC using CLP)
    14    It could use COIN_USE_DYLP for parameters wanted by DYLP
    15    It could use COIN_USE_DYLP_OR_CLP for parameters wanted by DYLP or CLP etc etc
     12   It uses COIN_HAS_CBC for parameters wanted by CBC
     13   It uses COIN_HAS_CLP for parameters wanted by CLP (or CBC using CLP)
     14   It could use COIN_HAS_DYLP for parameters wanted by DYLP
     15   It could use COIN_HAS_DYLP_OR_CLP for parameters wanted by DYLP or CLP etc etc
    1616
    1717 */
     
    4949
    5050    SOLVERLOGLEVEL=101,
    51 #ifndef COIN_USE_CBC
     51#ifndef COIN_HAS_CBC
    5252    LOGLEVEL = 101,
    5353#endif
     
    5858    STRONGBRANCHING=151,CUTDEPTH, MAXNODES,NUMBERBEFORE,NUMBERANALYZE,
    5959    NUMBERMINI,MIPOPTIONS,MOREMIPOPTIONS,MAXHOTITS,FPUMPITS,CUTPASS,
    60 #ifdef COIN_USE_CBC
     60#ifdef COIN_HAS_CBC
    6161    LOGLEVEL ,
    6262#endif
  • trunk/Clp/src/Makefile.am

    r754 r755  
    6363# This is for libtool (on Windows)
    6464libClp_la_LDFLAGS = -no-undefined
     65
     66########################################################################
     67#                        clp_solver program                            #
     68########################################################################
     69
     70# Name of the executable compiled in this directory.  We want it to be
     71# installed in the 'bin' directory
     72bin_PROGRAMS = clp_solver
     73
     74# List all source files for this executable, including headers
     75clp_solver_SOURCES = \
     76        ClpMain.cpp \
     77        CbcOrClpParam.cpp CbcOrClpParam.hpp \
     78        MyEventHandler.cpp MyEventHandler.hpp \
     79        MyMessageHandler.cpp MyMessageHandler.hpp \
     80        unitTest.cpp
     81
     82# List all additionally required COIN libraries
     83clp_solver_LDADD = libClp.la \
     84        $(COINBASEOBJDIR)/src/libCoinBase.la
     85
     86# And finally we add all missing libraries.  ADDLIBS is set bu configure to
     87# include all libraries that are determined to be necessary (such as -lgz)
     88LIBS += $(ADDLIBS) `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt`
     89
     90########################################################################
     91#                            Additional flags                          #
     92########################################################################
     93
    6594
    6695# Here list all include flags, relative to this "srcdir" directory.  This
  • trunk/Clp/src/Makefile.in

    r754 r755  
    2020
    2121# Author:  Andreas Waechter           IBM    2006-04-13
     22
    2223
    2324
     
    4445build_triplet = @build@
    4546host_triplet = @host@
     47bin_PROGRAMS = clp_solver$(EXEEXT)
    4648subdir = src
    4749DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     
    6163  esac;
    6264am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    63 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \
    64         "$(DESTDIR)$(includedir)"
     65am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
     66        "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
    6567libLTLIBRARIES_INSTALL = $(INSTALL)
    6668LTLIBRARIES = $(lib_LTLIBRARIES)
     
    8284        ClpSolve.lo Idiot.lo IdiSolve.lo
    8385libClp_la_OBJECTS = $(am_libClp_la_OBJECTS)
     86binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     87PROGRAMS = $(bin_PROGRAMS)
     88am_clp_solver_OBJECTS = ClpMain.$(OBJEXT) CbcOrClpParam.$(OBJEXT) \
     89        MyEventHandler.$(OBJEXT) MyMessageHandler.$(OBJEXT) \
     90        unitTest.$(OBJEXT)
     91clp_solver_OBJECTS = $(am_clp_solver_OBJECTS)
     92clp_solver_DEPENDENCIES = libClp.la \
     93        $(COINBASEOBJDIR)/src/libCoinBase.la
    8494DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    8595depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    101111LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    102112        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    103 SOURCES = $(libClp_la_SOURCES)
    104 DIST_SOURCES = $(libClp_la_SOURCES)
     113SOURCES = $(libClp_la_SOURCES) $(clp_solver_SOURCES)
     114DIST_SOURCES = $(libClp_la_SOURCES) $(clp_solver_SOURCES)
    105115includeHEADERS_INSTALL = $(INSTALL_HEADER)
    106116nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
     
    143153CXXDEPMODE = @CXXDEPMODE@
    144154
     155########################################################################
     156#                            Additional flags                          #
     157########################################################################
     158
    145159# Here list all include flags, relative to this "srcdir" directory.  This
    146160# "cygpath" stuff is necessary to compile with native compilers on Windows.
     
    167181LDFLAGS = @LDFLAGS@
    168182LIBOBJS = @LIBOBJS@
    169 LIBS = @LIBS@
     183
     184# And finally we add all missing libraries.  ADDLIBS is set bu configure to
     185# include all libraries that are determined to be necessary (such as -lgz)
     186LIBS = @LIBS@ $(ADDLIBS) `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt`
    170187LIBTOOL = @LIBTOOL@
    171188LIBTOOLM4 = @LIBTOOLM4@
     
    297314libClp_la_LDFLAGS = -no-undefined
    298315
     316# List all source files for this executable, including headers
     317clp_solver_SOURCES = \
     318        ClpMain.cpp \
     319        CbcOrClpParam.cpp CbcOrClpParam.hpp \
     320        MyEventHandler.cpp MyEventHandler.hpp \
     321        MyMessageHandler.cpp MyMessageHandler.hpp \
     322        unitTest.cpp
     323
     324
     325# List all additionally required COIN libraries
     326clp_solver_LDADD = libClp.la \
     327        $(COINBASEOBJDIR)/src/libCoinBase.la
     328
     329
    299330########################################################################
    300331#                Headers that need to be installed                     #
     
    404435libClp.la: $(libClp_la_OBJECTS) $(libClp_la_DEPENDENCIES)
    405436        $(CXXLINK) -rpath $(libdir) $(libClp_la_LDFLAGS) $(libClp_la_OBJECTS) $(libClp_la_LIBADD) $(LIBS)
     437install-binPROGRAMS: $(bin_PROGRAMS)
     438        @$(NORMAL_INSTALL)
     439        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
     440        @list='$(bin_PROGRAMS)'; for p in $$list; do \
     441          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
     442          if test -f $$p \
     443             || test -f $$p1 \
     444          ; then \
     445            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
     446           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     447           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
     448          else :; fi; \
     449        done
     450
     451uninstall-binPROGRAMS:
     452        @$(NORMAL_UNINSTALL)
     453        @list='$(bin_PROGRAMS)'; for p in $$list; do \
     454          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
     455          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     456          rm -f "$(DESTDIR)$(bindir)/$$f"; \
     457        done
     458
     459clean-binPROGRAMS:
     460        @list='$(bin_PROGRAMS)'; for p in $$list; do \
     461          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
     462          echo " rm -f $$p $$f"; \
     463          rm -f $$p $$f ; \
     464        done
     465clp_solver$(EXEEXT): $(clp_solver_OBJECTS) $(clp_solver_DEPENDENCIES)
     466        @rm -f clp_solver$(EXEEXT)
     467        $(CXXLINK) $(clp_solver_LDFLAGS) $(clp_solver_OBJECTS) $(clp_solver_LDADD) $(LIBS)
    406468
    407469mostlyclean-compile:
     
    411473        -rm -f *.tab.c
    412474
     475@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcOrClpParam.Po@am__quote@
    413476@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpCholeskyBase.Plo@am__quote@
    414477@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpCholeskyDense.Plo@am__quote@
     
    427490@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpInterior.Plo@am__quote@
    428491@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpLinearObjective.Plo@am__quote@
     492@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpMain.Po@am__quote@
    429493@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpMatrixBase.Plo@am__quote@
    430494@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpMessage.Plo@am__quote@
     
    451515@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IdiSolve.Plo@am__quote@
    452516@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Idiot.Plo@am__quote@
     517@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MyEventHandler.Po@am__quote@
     518@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MyMessageHandler.Po@am__quote@
     519@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTest.Po@am__quote@
    453520
    454521.cpp.o:
     
    594661check-am: all-am
    595662check: check-am
    596 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     663all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
     664install-binPROGRAMS: install-libLTLIBRARIES
     665
    597666installdirs:
    598         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
     667        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
    599668          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    600669        done
     
    627696clean: clean-am
    628697
    629 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    630         mostlyclean-am
     698clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
     699        clean-libtool mostlyclean-am
    631700
    632701distclean: distclean-am
     
    648717install-data-am: install-includeHEADERS install-nodist_includeHEADERS
    649718
    650 install-exec-am: install-libLTLIBRARIES
     719install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
    651720
    652721install-info: install-info-am
     
    674743ps-am:
    675744
    676 uninstall-am: uninstall-includeHEADERS uninstall-info-am \
    677         uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
    678 
    679 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    680         clean-libLTLIBRARIES clean-libtool ctags distclean \
    681         distclean-compile distclean-generic distclean-libtool \
    682         distclean-tags distdir dvi dvi-am html html-am info info-am \
    683         install install-am install-data install-data-am install-exec \
    684         install-exec-am install-includeHEADERS install-info \
    685         install-info-am install-libLTLIBRARIES install-man \
     745uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
     746        uninstall-info-am uninstall-libLTLIBRARIES \
     747        uninstall-nodist_includeHEADERS
     748
     749.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
     750        clean-generic clean-libLTLIBRARIES clean-libtool ctags \
     751        distclean distclean-compile distclean-generic \
     752        distclean-libtool distclean-tags distdir dvi dvi-am html \
     753        html-am info info-am install install-am install-binPROGRAMS \
     754        install-data install-data-am install-exec install-exec-am \
     755        install-includeHEADERS install-info install-info-am \
     756        install-libLTLIBRARIES install-man \
    686757        install-nodist_includeHEADERS install-strip installcheck \
    687758        installcheck-am installdirs maintainer-clean \
    688759        maintainer-clean-generic mostlyclean mostlyclean-compile \
    689760        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    690         tags uninstall uninstall-am uninstall-includeHEADERS \
    691         uninstall-info-am uninstall-libLTLIBRARIES \
    692         uninstall-nodist_includeHEADERS
     761        tags uninstall uninstall-am uninstall-binPROGRAMS \
     762        uninstall-includeHEADERS uninstall-info-am \
     763        uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
    693764
    694765$(libClp_la_OBJECTS): ../inc/$(CONFIG_DIST)
  • trunk/Clp/src/unitTest.cpp

    r754 r755  
    231231// where:
    232232//   -mpsDir: directory containing mps test files
    233 //       Default value V1="../Mps/Sample"   
     233//       Default value V1="../../Data/Sample"   
    234234//   -netlibDir: directory containing netlib files
    235 //       Default value V2="../Mps/Netlib"
     235//       Default value V2="../../Data/Netlib"
    236236//   -test
    237237//       If specified, then netlib test set run
     
    287287      std::cerr <<"  where:\n";
    288288      std::cerr <<"    -mpsDir: directory containing mps test files\n";
    289       std::cerr <<"        Default value V1=\"../Mps/Sample\"\n";
     289      std::cerr <<"        Default value V1=\"../../Data/Sample\"\n";
    290290      std::cerr <<"    -netlibDir: directory containing netlib files\n";
    291       std::cerr <<"        Default value V2=\"../Mps/Netlib\"\n";
     291      std::cerr <<"        Default value V2=\"../../Data/Netlib\"\n";
    292292      std::cerr <<"    -test\n";
    293293      std::cerr <<"        If specified, then netlib testset run.\n";
     
    304304    mpsDir=parms["-mpsDir"] + dirsep;
    305305  else
    306     mpsDir = dirsep == '/' ? "../Mps/Sample/" : "..\\Mps\\Sample\\";
     306    mpsDir = dirsep == '/' ? "../../Data/Sample/" : "..\\..\\Data\\Sample\\";
    307307 
    308308  // Set directory containing netlib data files.
     
    311311    netlibDir=parms["-netlibDir"] + dirsep;
    312312  else
    313     netlibDir = dirsep == '/' ? "../Mps/Netlib/" : "..\\Mps\\Netlib\\";
     313    netlibDir = dirsep == '/' ? "../../Data/Netlib/" : "..\\..\\Data\\Netlib\\";
    314314  if (!empty.numberRows()) {
    315315    testingMessage( "Testing ClpSimplex\n" );
  • trunk/Clp/test/Makefile.am

    r754 r755  
    1010
    1111########################################################################
    12 #                         unitTest for Coin                            #
     12#                         unitTest for Clp                             #
    1313########################################################################
    1414
    15 noinst_PROGRAMS = unitTest
     15# We are using the CLP solver executable to do the unit test
    1616
    17 unitTest_SOURCES = \
    18         CbcOrClpParam.cpp CbcOrClpParam.hpp \
    19         ClpMain.cpp \
    20         MyEventHandler.cpp MyEventHandler.hpp \
    21         MyMessageHandler.cpp MyMessageHandler.hpp \
    22         unitTest.cpp
     17test: ../src/clp_solver
     18        ../src/clp_solver -unitTest -netlib -netlibp
    2319
    24 # List libraries of COIN projects
    25 unitTest_LDADD = \
    26         $(CLPOBJDIR)/src/libClp.la
    27         $(COINBASEOBJDIR)/src/libCoinBase.la
    28 
    29 # List additional libraries
    30 LIBS += $(ADDLIBS) `cat $(COINBASEOBJDIR)/coin_addlibs.txt`
    31 
    32 # Here list all include flags, relative to this "srcdir" directory.  This
    33 # "cygpath" stuff is necessary to compile with native compilers on Windows
    34 CXXFLAGS += \
    35         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    36         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src`
    37 
    38 test: unitTest
    39         ./unitTest -unitTest -netlib -netlibp
     20.PHONY: test
    4021
    4122########################################################################
  • trunk/Clp/test/Makefile.in

    r754 r755  
    2020
    2121# Author:  Andreas Waechter           IBM    2006-04-13
    22 
    2322srcdir = @srcdir@
    2423top_srcdir = @top_srcdir@
     
    4342build_triplet = @build@
    4443host_triplet = @host@
    45 noinst_PROGRAMS = unitTest$(EXEEXT)
    4644subdir = test
    4745DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    5452CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    5553CONFIG_CLEAN_FILES =
    56 PROGRAMS = $(noinst_PROGRAMS)
    57 am_unitTest_OBJECTS = CbcOrClpParam.$(OBJEXT) ClpMain.$(OBJEXT) \
    58         MyEventHandler.$(OBJEXT) MyMessageHandler.$(OBJEXT) \
    59         unitTest.$(OBJEXT)
    60 unitTest_OBJECTS = $(am_unitTest_OBJECTS)
    61 unitTest_DEPENDENCIES = $(CLPOBJDIR)/src/libClp.la
    62 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    63 depcomp = $(SHELL) $(top_srcdir)/../depcomp
    64 am__depfiles_maybe = depfiles
    65 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    66         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    67 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
    68         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    69         $(AM_CXXFLAGS) $(CXXFLAGS)
    70 CXXLD = $(CXX)
    71 CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    72         $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    73 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    74         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    75 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
    76         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    77         $(AM_CFLAGS) $(CFLAGS)
    78 CCLD = $(CC)
    79 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    80         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    81 SOURCES = $(unitTest_SOURCES)
    82 DIST_SOURCES = $(unitTest_SOURCES)
    83 ETAGS = etags
    84 CTAGS = ctags
     54SOURCES =
     55DIST_SOURCES =
    8556DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    8657ACLOCAL = @ACLOCAL@
     
    11788CXXDEFS = @CXXDEFS@
    11889CXXDEPMODE = @CXXDEPMODE@
    119 
    120 # Here list all include flags, relative to this "srcdir" directory.  This
    121 # "cygpath" stuff is necessary to compile with native compilers on Windows
    122 CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    123         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src`
     90CXXFLAGS = @CXXFLAGS@
    12491CYGPATH_W = @CYGPATH_W@
    12592DEFS = @DEFS@
     
    141108LDFLAGS = @LDFLAGS@
    142109LIBOBJS = @LIBOBJS@
    143 
    144 # List additional libraries
    145 LIBS = @LIBS@ $(ADDLIBS) `cat $(COINBASEOBJDIR)/coin_addlibs.txt`
     110LIBS = @LIBS@
    146111LIBTOOL = @LIBTOOL@
    147112LIBTOOLM4 = @LIBTOOLM4@
     
    216181target_alias = @target_alias@
    217182AUTOMAKE_OPTIONS = foreign
    218 unitTest_SOURCES = \
    219         CbcOrClpParam.cpp CbcOrClpParam.hpp \
    220         ClpMain.cpp \
    221         MyEventHandler.cpp MyEventHandler.hpp \
    222         MyMessageHandler.cpp MyMessageHandler.hpp \
    223         unitTest.cpp
    224 
    225 
    226 # List libraries of COIN projects
    227 unitTest_LDADD = \
    228         $(CLPOBJDIR)/src/libClp.la
    229 
    230183
    231184########################################################################
     
    239192
    240193.SUFFIXES:
    241 .SUFFIXES: .cpp .lo .o .obj
    242194$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
    243195        @for dep in $?; do \
     
    270222        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    271223
    272 clean-noinstPROGRAMS:
    273         @list='$(noinst_PROGRAMS)'; for p in $$list; do \
    274           f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    275           echo " rm -f $$p $$f"; \
    276           rm -f $$p $$f ; \
    277         done
    278 unitTest$(EXEEXT): $(unitTest_OBJECTS) $(unitTest_DEPENDENCIES)
    279         @rm -f unitTest$(EXEEXT)
    280         $(CXXLINK) $(unitTest_LDFLAGS) $(unitTest_OBJECTS) $(unitTest_LDADD) $(LIBS)
    281 
    282 mostlyclean-compile:
    283         -rm -f *.$(OBJEXT)
    284 
    285 distclean-compile:
    286         -rm -f *.tab.c
    287 
    288 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcOrClpParam.Po@am__quote@
    289 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpMain.Po@am__quote@
    290 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MyEventHandler.Po@am__quote@
    291 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MyMessageHandler.Po@am__quote@
    292 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTest.Po@am__quote@
    293 
    294 .cpp.o:
    295 @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    296 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    297 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    298 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    299 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    300 
    301 .cpp.obj:
    302 @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
    303 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    304 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    305 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    306 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    307 
    308 .cpp.lo:
    309 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    310 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    311 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    312 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    313 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    314 
    315224mostlyclean-libtool:
    316225        -rm -f *.lo
     
    322231        -rm -f libtool
    323232uninstall-info-am:
    324 
    325 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    326         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
    327         unique=`for i in $$list; do \
    328             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    329           done | \
    330           $(AWK) '    { files[$$0] = 1; } \
    331                END { for (i in files) print i; }'`; \
    332         mkid -fID $$unique
    333233tags: TAGS
    334 
    335 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    336                 $(TAGS_FILES) $(LISP)
    337         tags=; \
    338         here=`pwd`; \
    339         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    340         unique=`for i in $$list; do \
    341             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    342           done | \
    343           $(AWK) '    { files[$$0] = 1; } \
    344                END { for (i in files) print i; }'`; \
    345         if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
    346           test -n "$$unique" || unique=$$empty_fix; \
    347           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    348             $$tags $$unique; \
    349         fi
     234TAGS:
     235
    350236ctags: CTAGS
    351 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    352                 $(TAGS_FILES) $(LISP)
    353         tags=; \
    354         here=`pwd`; \
    355         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    356         unique=`for i in $$list; do \
    357             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    358           done | \
    359           $(AWK) '    { files[$$0] = 1; } \
    360                END { for (i in files) print i; }'`; \
    361         test -z "$(CTAGS_ARGS)$$tags$$unique" \
    362           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
    363              $$tags $$unique
    364 
    365 GTAGS:
    366         here=`$(am__cd) $(top_builddir) && pwd` \
    367           && cd $(top_srcdir) \
    368           && gtags -i $(GTAGS_ARGS) $$here
    369 
    370 distclean-tags:
    371         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
     237CTAGS:
     238
    372239
    373240distdir: $(DISTFILES)
     
    400267check-am: all-am
    401268check: check-am
    402 all-am: Makefile $(PROGRAMS)
     269all-am: Makefile
    403270installdirs:
    404271install: install-am
     
    429296clean: clean-am
    430297
    431 clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
    432         mostlyclean-am
     298clean-am: clean-generic clean-libtool mostlyclean-am
    433299
    434300distclean: distclean-am
    435         -rm -rf ./$(DEPDIR)
    436301        -rm -f Makefile
    437 distclean-am: clean-am distclean-compile distclean-generic \
    438         distclean-libtool distclean-tags
     302distclean-am: clean-am distclean-generic distclean-libtool
    439303
    440304dvi: dvi-am
     
    459323
    460324maintainer-clean: maintainer-clean-am
    461         -rm -rf ./$(DEPDIR)
    462325        -rm -f Makefile
    463326maintainer-clean-am: distclean-am maintainer-clean-generic
     
    465328mostlyclean: mostlyclean-am
    466329
    467 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    468         mostlyclean-libtool
     330mostlyclean-am: mostlyclean-generic mostlyclean-libtool
    469331
    470332pdf: pdf-am
     
    478340uninstall-am: uninstall-info-am
    479341
    480 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    481         clean-libtool clean-noinstPROGRAMS ctags distclean \
    482         distclean-compile distclean-generic distclean-libtool \
    483         distclean-tags distdir dvi dvi-am html html-am info info-am \
    484         install install-am install-data install-data-am install-exec \
    485         install-exec-am install-info install-info-am install-man \
    486         install-strip installcheck installcheck-am installdirs \
    487         maintainer-clean maintainer-clean-generic mostlyclean \
    488         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    489         pdf pdf-am ps ps-am tags uninstall uninstall-am \
     342.PHONY: all all-am check check-am clean clean-generic clean-libtool \
     343        distclean distclean-generic distclean-libtool distdir dvi \
     344        dvi-am html html-am info info-am install install-am \
     345        install-data install-data-am install-exec install-exec-am \
     346        install-info install-info-am install-man install-strip \
     347        installcheck installcheck-am installdirs maintainer-clean \
     348        maintainer-clean-generic mostlyclean mostlyclean-generic \
     349        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
    490350        uninstall-info-am
    491351
    492         $(COINBASEOBJDIR)/src/libCoinBase.la
    493 
    494 test: unitTest
    495         ./unitTest -unitTest -netlib -netlibp
     352
     353########################################################################
     354#                         unitTest for Clp                             #
     355########################################################################
     356
     357# We are using the CLP solver executable to do the unit test
     358
     359test: ../src/clp_solver
     360        ../src/clp_solver -unitTest -netlib -netlibp
     361
     362.PHONY: test
    496363# Tell versions [3.59,3.63) of GNU make to not export all variables.
    497364# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/configure

    r754 r755  
    282282
    283283ac_unique_file="configure.ac"
     284ac_default_prefix=`pwd`
    284285ac_subdirs_all="$ac_subdirs_all CoinBase"
    285286ac_subdirs_all="$ac_subdirs_all Clp"
     
    12661267# List one file in the package so that the configure script can test
    12671268# whether the package is actually there
     1269
     1270
     1271# Where should everything be installed by default?  Here, we want it
     1272# to be installed directly in 'bin', 'lib', 'include' subdirectories
     1273# of the directory where configure is run.  The default would be
     1274# /usr/local.
    12681275
    12691276
  • trunk/configure.ac

    r754 r755  
    2626# whether the package is actually there
    2727AC_CONFIG_SRCDIR(configure.ac)
     28
     29# Where should everything be installed by default?  Here, we want it
     30# to be installed directly in 'bin', 'lib', 'include' subdirectories
     31# of the directory where configure is run.  The default would be
     32# /usr/local.
     33AC_PREFIX_DEFAULT([`pwd`])
    2834
    2935#############################################################################
Note: See TracChangeset for help on using the changeset viewer.