Ignore:
Timestamp:
Nov 5, 2009 10:57:25 AM (10 years ago)
Author:
forrest
Message:

Creating new stable branch 2.4 from trunk (rev 1270)

Location:
stable/2.4
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable/2.4

    • Property svn:externals
      •  

        old new  
        77CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
        88Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.10/Clp
         9Clp               https://projects.coin-or.org/svn/Clp/stable/1.11/Clp
        1010Osi               https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
        1111Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • stable/2.4/Cbc/src/Cbc_C_Interface.cpp

    r767 r1271  
    104104
    105105Cbc_MessageHandler::Cbc_MessageHandler (const CoinMessageHandler & rhs)
    106   : CoinMessageHandler(),
     106  : CoinMessageHandler(rhs),
    107107    model_(NULL),
    108108    callback_(NULL)
     
    112112// Constructor with pointer to model
    113113Cbc_MessageHandler::Cbc_MessageHandler(Cbc_Model * model,
    114                FILE * userPointer)
     114                                       FILE * /*userPointer*/)
    115115  : CoinMessageHandler(),
    116116    model_(model),
     
    394394/* Drop integer informations */
    395395COINLIBAPI void COINLINKAGE
    396 Cbc_deleteIntegerInformation(Cbc_Model * model)
     396Cbc_deleteIntegerInformation(Cbc_Model * /*model*/)
    397397{
    398398  const char prefix[] = "Cbc_C_Interface::Cbc_deleteIntegerInformation(): ";
     
    409409/* Resizes rim part of model  */
    410410COINLIBAPI void COINLINKAGE
    411 Cbc_resize (Cbc_Model * model, int newNumberRows, int newNumberColumns)
     411Cbc_resize (Cbc_Model * /*model*/, int /*newNumberRows*/,
     412            int /*newNumberColumns*/)
    412413{
    413414  const char prefix[] = "Cbc_C_Interface::Cbc_resize(): ";
     
    436437/* Add rows */
    437438COINLIBAPI void COINLINKAGE
    438 Cbc_addRows(Cbc_Model * model, const int number, const double * rowLower,
    439          const double * rowUpper,
    440          const int * rowStarts, const int * columns,
    441          const double * elements)
     439Cbc_addRows(Cbc_Model * /*model*/, const int /*number*/,
     440            const double * /*rowLower*/,
     441            const double * /*rowUpper*/,
     442            const int * /*rowStarts*/, const int * /*columns*/,
     443            const double * /*elements*/)
    442444{
    443445  const char prefix[] = "Cbc_C_Interface::Cbc_addRows(): ";
     
    467469/* Add columns */
    468470COINLIBAPI void COINLINKAGE
    469 Cbc_addColumns(Cbc_Model * model, int number, const double * columnLower,
    470       const double * columnUpper,
    471       const double * objective,
    472       const int * columnStarts, const int * rows,
    473       const double * elements)
     471Cbc_addColumns(Cbc_Model * /*model*/, int /*number*/,
     472               const double * /*columnLower*/,
     473               const double * /*columnUpper*/,
     474               const double * /*objective*/,
     475               const int * /*columnStarts*/, const int * /*rows*/,
     476               const double * /*elements*/)
    474477{
    475478  const char prefix[] = "Cbc_C_Interface::Cbc_addColumns(): ";
     
    486489/* Drops names - makes lengthnames 0 and names empty */
    487490COINLIBAPI void COINLINKAGE
    488 Cbc_dropNames(Cbc_Model * model)
     491Cbc_dropNames(Cbc_Model * /*model*/)
    489492{
    490493  const char prefix[] = "Cbc_C_Interface::Cbc_dropNames(): ";
     
    500503/* Copies in names */
    501504COINLIBAPI void COINLINKAGE
    502 Cbc_copyNames(Cbc_Model * model, const char * const * rowNamesIn,
    503         const char * const * columnNamesIn)
     505Cbc_copyNames(Cbc_Model * /*model*/, const char * const * /*rowNamesIn*/,
     506              const char * const * /*columnNamesIn*/)
    504507{
    505508  const char prefix[] = "Cbc_C_Interface::Cbc_copyNames(): ";
     
    660663/* Objective offset */
    661664COINLIBAPI double COINLINKAGE
    662 Cbc_objectiveOffset(Cbc_Model * model)
     665Cbc_objectiveOffset(Cbc_Model * /*model*/)
    663666{
    664667  const char prefix[] = "Cbc_C_Interface::Cbc_objectiveOffset(): ";
     
    675678}
    676679COINLIBAPI void COINLINKAGE
    677 Cbc_setObjectiveOffset(Cbc_Model * model, double value)
     680Cbc_setObjectiveOffset(Cbc_Model * /*model*/, double /*value*/)
    678681{
    679682  const char prefix[] = "Cbc_C_Interface::Cbc_setObjectiveOffset(): ";
     
    705708/* Sets problem name.  Must have \0 at end.  */
    706709COINLIBAPI int COINLINKAGE
    707 Cbc_setProblemName(Cbc_Model * model, int maxNumberCharacters, char * array)
     710Cbc_setProblemName(Cbc_Model * model, int /*maxNumberCharacters*/, char * array)
    708711{
    709712  const char prefix[] = "Cbc_C_Interface::Cbc_setProblemName(): ";
     
    732735}
    733736COINLIBAPI void COINLINKAGE
    734 Cbc_setNumberIterations(Cbc_Model * model, int numberIterations)
     737Cbc_setNumberIterations(Cbc_Model * /*model*/, int /*numberIterations*/)
    735738{
    736739  const char prefix[] = "Cbc_C_Interface::Cbc_setNumberIterations(): ";
     
    747750/* Maximum number of iterations */
    748751COINLIBAPI int COINLINKAGE
    749 Cbc_maximumIterations(Cbc_Model * model)
     752Cbc_maximumIterations(Cbc_Model * /*model*/)
    750753{
    751754  const char prefix[] = "Cbc_C_Interface::Cbc_maximumIterations(): ";
     
    762765}
    763766COINLIBAPI void COINLINKAGE
    764 Cbc_setMaximumIterations(Cbc_Model * model, int value)
     767Cbc_setMaximumIterations(Cbc_Model * /*model*/, int /*value*/)
    765768{
    766769  const char prefix[] = "Cbc_C_Interface::Cbc_setMaximumIterations(): ";
     
    851854/* Returns true if hit maximum iteratio`ns (or time) */
    852855COINLIBAPI int COINLINKAGE
    853 Cbc_hitMaximumIterations(Cbc_Model * model)
     856Cbc_hitMaximumIterations(Cbc_Model * /*model*/)
    854857{
    855858  const char prefix[] = "Cbc_C_Interface::Cbc_hitMaximumIterations(): ";
     
    887890/* Set problem status */
    888891COINLIBAPI void COINLINKAGE
    889 Cbc_setProblemStatus(Cbc_Model * model, int problemStatus)
     892Cbc_setProblemStatus(Cbc_Model * /*model*/, int /*problemStatus*/)
    890893{
    891894  const char prefix[] = "Cbc_C_Interface::Cbc_setProblemStatus(): ";
     
    922925}
    923926COINLIBAPI void COINLINKAGE
    924 Cbc_setSecondaryStatus(Cbc_Model * model, int status)
     927Cbc_setSecondaryStatus(Cbc_Model * /*model*/, int /*status*/)
    925928{
    926929  const char prefix[] = "Cbc_C_Interface::Cbc_setSecondaryStatus(): ";
     
    962965/* Primal row solution */
    963966COINLIBAPI double * COINLINKAGE
    964 Cbc_primalRowSolution(Cbc_Model * model)
     967Cbc_primalRowSolution(Cbc_Model * /*model*/)
    965968{
    966969  const char prefix[] = "Cbc_C_Interface::Cbc_primalRowSolution(): ";
     
    980983/* Primal column solution */
    981984COINLIBAPI double * COINLINKAGE
    982 Cbc_primalColumnSolution(Cbc_Model * model)
     985Cbc_primalColumnSolution(Cbc_Model * /*model*/)
    983986{
    984987  const char prefix[] = "Cbc_C_Interface::Cbc_primalColumnSolution(): ";
     
    9971000/* Dual row solution */
    9981001COINLIBAPI double * COINLINKAGE
    999 Cbc_dualRowSolution(Cbc_Model * model)
     1002Cbc_dualRowSolution(Cbc_Model * /*model*/)
    10001003{
    10011004  const char prefix[] = "Cbc_C_Interface::Cbc_dualRowSolution(): ";
     
    10141017/* Reduced costs */
    10151018COINLIBAPI double * COINLINKAGE
    1016 Cbc_dualColumnSolution(Cbc_Model * model)
     1019Cbc_dualColumnSolution(Cbc_Model * /*model*/)
    10171020{
    10181021  const char prefix[] = "Cbc_C_Interface::Cbc_dualColumnSolution(): ";
     
    10311034/* Row lower */
    10321035COINLIBAPI double * COINLINKAGE
    1033 Cbc_rowLower(Cbc_Model * model)
     1036Cbc_rowLower(Cbc_Model * /*model*/)
    10341037{
    10351038  const char prefix[] = "Cbc_C_Interface::Cbc_rowLower(): ";
     
    10481051/* Row upper  */
    10491052COINLIBAPI double * COINLINKAGE
    1050 Cbc_rowUpper(Cbc_Model * model)
     1053Cbc_rowUpper(Cbc_Model * /*model*/)
    10511054{
    10521055  const char prefix[] = "Cbc_C_Interface::Cbc_rowUpper(): ";
     
    10651068/* Objective Coefficients */
    10661069COINLIBAPI double * COINLINKAGE
    1067 Cbc_objective(Cbc_Model * model)
     1070Cbc_objective(Cbc_Model * /*model*/)
    10681071{
    10691072  const char prefix[] = "Cbc_C_Interface::Cbc_objective(): ";
     
    10821085/* Column Lower */
    10831086COINLIBAPI double * COINLINKAGE
    1084 Cbc_columnLower(Cbc_Model * model)
     1087Cbc_columnLower(Cbc_Model * /*model*/)
    10851088{
    10861089  const char prefix[] = "Cbc_C_Interface::Cbc_columnLower(): ";
     
    10991102/* Column Upper */
    11001103COINLIBAPI double * COINLINKAGE
    1101 Cbc_columnUpper(Cbc_Model * model)
     1104Cbc_columnUpper(Cbc_Model * /*model*/)
    11021105{
    11031106  const char prefix[] = "Cbc_C_Interface::Cbc_columnUpper(): ";
     
    12091212   Up to user to use delete [] on these arrays.  */
    12101213COINLIBAPI double * COINLINKAGE
    1211 Cbc_infeasibilityRay(Cbc_Model * model)
     1214Cbc_infeasibilityRay(Cbc_Model * /*model*/)
    12121215{
    12131216  const char prefix[] = "Cbc_C_Interface::Cbc_infeasibilityRay(): ";
     
    12261229}
    12271230COINLIBAPI double * COINLINKAGE
    1228 Cbc_unboundedRay(Cbc_Model * model)
     1231Cbc_unboundedRay(Cbc_Model * /*model*/)
    12291232{
    12301233  const char prefix[] = "Cbc_C_Interface::Cbc_unboundedRay(): ";
     
    12441247/* See if status array exists (partly for OsiClp) */
    12451248COINLIBAPI int COINLINKAGE
    1246 Cbc_statusExists(Cbc_Model * model)
     1249Cbc_statusExists(Cbc_Model * /*model*/)
    12471250{
    12481251  const char prefix[] = "Cbc_C_Interface::Cbc_statusExists(): ";
     
    12591262/* Return address of status array (char[numberRows+numberColumns]) */
    12601263COINLIBAPI void  COINLINKAGE
    1261 Cbc_getBasisStatus(Cbc_Model * model, int * cstat, int * rstat)
     1264Cbc_getBasisStatus(Cbc_Model * /*model*/, int * /*cstat*/, int * /*rstat*/)
    12621265{
    12631266  const char prefix[] = "Cbc_C_Interface::Cbc_getBasisStatus(): ";
     
    12741277/* Copy in status vector */
    12751278COINLIBAPI void COINLINKAGE
    1276 Cbc_setBasisStatus(Cbc_Model * model,  int * cstat, int * rstat)
     1279Cbc_setBasisStatus(Cbc_Model * /*model*/,  int * /*cstat*/, int * /*rstat*/)
    12771280{
    12781281  const char prefix[] = "Cbc_C_Interface::Cbc_setBasisStatus(): ";
     
    12881291/* User pointer for whatever reason */
    12891292COINLIBAPI void COINLINKAGE
    1290 Cbc_setUserPointer (Cbc_Model * model, void * pointer)
     1293Cbc_setUserPointer (Cbc_Model * /*model*/, void * /*pointer*/)
    12911294{
    12921295  const char prefix[] = "Cbc_C_Interface::Cbc_setUserPointer(): ";
     
    13021305}
    13031306COINLIBAPI void * COINLINKAGE
    1304 Cbc_getUserPointer (Cbc_Model * model)
     1307Cbc_getUserPointer (Cbc_Model * /*model*/)
    13051308{
    13061309  const char prefix[] = "Cbc_C_Interface::Cbc_getUserPointer(): ";
     
    13861389/* length of names (0 means no names0 */
    13871390COINLIBAPI int COINLINKAGE
    1388 Cbc_lengthNames(Cbc_Model * model)
     1391Cbc_lengthNames(Cbc_Model * /*model*/)
    13891392{
    13901393  const char prefix[] = "Cbc_C_Interface::Cbc_lengthNames(): ";
     
    14021405/* Fill in array (at least lengthNames+1 long) with a row name */
    14031406COINLIBAPI void COINLINKAGE
    1404 Cbc_rowName(Cbc_Model * model, int iRow, char * name)
     1407Cbc_rowName(Cbc_Model * /*model*/, int iRow, char * name)
    14051408{
    14061409  const char prefix[] = "Cbc_C_Interface::Cbc_rowName(): ";
     
    14181421// cannot find names in Cbc, Osi, or OsiClp
    14191422COINLIBAPI void COINLINKAGE
    1420 Cbc_columnName(Cbc_Model * model, int iColumn, char * name)
     1423Cbc_columnName(Cbc_Model * /*model*/, int iColumn, char * name)
    14211424{
    14221425  const char prefix[] = "Cbc_C_Interface::Cbc_columnName(): ";
     
    14881491/* Gets scalingFlag */
    14891492COINLIBAPI int COINLINKAGE
    1490 Cbc_scalingFlag(Cbc_Model * model)
     1493Cbc_scalingFlag(Cbc_Model * /*model*/)
    14911494{
    14921495  const char prefix[] = "Cbc_C_Interface::Cbc_scalingFlag(): ";
     
    15171520*/
    15181521COINLIBAPI int COINLINKAGE
    1519 Cbc_crash(Cbc_Model * model, double gap,int pivot)
     1522Cbc_crash(Cbc_Model * /*model*/, double /*gap*/,int /*pivot*/)
    15201523{
    15211524  const char prefix[] = "Cbc_C_Interface::Cbc_crash(): ";
     
    15631566/* Dual bound */
    15641567COINLIBAPI double COINLINKAGE
    1565 Cbc_dualBound(Cbc_Model * model)
     1568Cbc_dualBound(Cbc_Model * /*model*/)
    15661569{
    15671570  const char prefix[] = "Cbc_C_Interface::Cbc_dualBound(): ";
     
    15781581}
    15791582COINLIBAPI void COINLINKAGE
    1580 Cbc_setDualBound(Cbc_Model * model, double value)
     1583Cbc_setDualBound(Cbc_Model * /*model*/, double /*value*/)
    15811584{
    15821585  const char prefix[] = "Cbc_C_Interface::Cbc_setDualBound(): ";
     
    15921595/* Infeasibility cost */
    15931596COINLIBAPI double COINLINKAGE
    1594 Cbc_infeasibilityCost(Cbc_Model * model)
     1597Cbc_infeasibilityCost(Cbc_Model * /*model*/)
    15951598{
    15961599  const char prefix[] = "Cbc_C_Interface::Cbc_infeasibilityCost(): ";
     
    16071610}
    16081611COINLIBAPI void COINLINKAGE
    1609 Cbc_setInfeasibilityCost(Cbc_Model * model, double value)
     1612Cbc_setInfeasibilityCost(Cbc_Model * /*model*/, double /*value*/)
    16101613{
    16111614  const char prefix[] = "Cbc_C_Interface::Cbc_setInfeasibilityCost(): ";
     
    16281631*/
    16291632COINLIBAPI int COINLINKAGE
    1630 Cbc_perturbation(Cbc_Model * model)
     1633Cbc_perturbation(Cbc_Model * /*model*/)
    16311634{
    16321635  const char prefix[] = "Cbc_C_Interface::Cbc_perturbation(): ";
     
    16431646}
    16441647COINLIBAPI void COINLINKAGE
    1645 Cbc_setPerturbation(Cbc_Model * model, int value)
     1648Cbc_setPerturbation(Cbc_Model * /*model*/, int /*value*/)
    16461649{
    16471650  const char prefix[] = "Cbc_C_Interface::Cbc_setPerturbation(): ";
     
    16571660/* Current (or last) algorithm */
    16581661COINLIBAPI int COINLINKAGE
    1659 Cbc_algorithm(Cbc_Model * model)
     1662Cbc_algorithm(Cbc_Model * /*model*/)
    16601663{
    16611664  const char prefix[] = "Cbc_C_Interface::Cbc_setPerturbation(): ";
     
    16731676/* Set algorithm */
    16741677COINLIBAPI void COINLINKAGE
    1675 Cbc_setAlgorithm(Cbc_Model * model, int value)
     1678Cbc_setAlgorithm(Cbc_Model * /*model*/, int /*value*/)
    16761679{
    16771680  const char prefix[] = "Cbc_C_Interface::Cbc_setAlgorithm(): ";
     
    16871690/* Sum of dual infeasibilities */
    16881691COINLIBAPI double COINLINKAGE
    1689 Cbc_sumDualInfeasibilities(Cbc_Model * model)
     1692Cbc_sumDualInfeasibilities(Cbc_Model * /*model*/)
    16901693{
    16911694  const char prefix[] = "Cbc_C_Interface::Cbc_sumDualInfeasibilities(): ";
     
    17031706/* Number of dual infeasibilities */
    17041707COINLIBAPI int COINLINKAGE
    1705 Cbc_numberDualInfeasibilities(Cbc_Model * model)
     1708Cbc_numberDualInfeasibilities(Cbc_Model * /*model*/)
    17061709{
    17071710  const char prefix[] = "Cbc_C_Interface::Cbc_numberDualInfeasibilities(): ";
     
    17191722/* Sum of primal infeasibilities */
    17201723COINLIBAPI double COINLINKAGE
    1721 Cbc_sumPrimalInfeasibilities(Cbc_Model * model)
     1724Cbc_sumPrimalInfeasibilities(Cbc_Model * /*model*/)
    17221725{
    17231726  const char prefix[] = "Cbc_C_Interface::Cbc_sumPrimalInfeasibilities(): ";
     
    17351738/* Number of primal infeasibilities */
    17361739COINLIBAPI int COINLINKAGE
    1737 Cbc_numberPrimalInfeasibilities(Cbc_Model * model)
     1740Cbc_numberPrimalInfeasibilities(Cbc_Model * /*model*/)
    17381741{
    17391742  const char prefix[] = "Cbc_C_Interface::Cbc_numberPrimalInfeasibilities(): ";
     
    17551758*/
    17561759COINLIBAPI int COINLINKAGE
    1757 Cbc_saveModel(Cbc_Model * model, const char * fileName)
     1760Cbc_saveModel(Cbc_Model * /*model*/, const char * /*fileName*/)
    17581761{
    17591762  const char prefix[] = "Cbc_C_Interface::Cbc_saveModel(): ";
     
    17721775   deletes current model */
    17731776COINLIBAPI int COINLINKAGE
    1774 Cbc_restoreModel(Cbc_Model * model, const char * fileName)
     1777Cbc_restoreModel(Cbc_Model * /*model*/, const char * /*fileName*/)
    17751778{
    17761779  const char prefix[] = "Cbc_C_Interface::Cbc_restoreModel(): ";
     
    17931796*/
    17941797COINLIBAPI void COINLINKAGE
    1795 Cbc_checkSolution(Cbc_Model * model)
     1798Cbc_checkSolution(Cbc_Model * /*model*/)
    17961799{
    17971800  const char prefix[] = "Cbc_C_Interface::Cbc_checkSolution(): ";
     
    21992202
    22002203COINLIBAPI double COINLINKAGE
    2201 Cbc_cpuTime(Cbc_Model * model)
     2204Cbc_cpuTime(Cbc_Model * /*model*/)
    22022205{
    22032206  const char prefix[] = "Cbc_C_Interface::Cbc_cpuTime(): ";
     
    25182521  /** Dual initial solve */
    25192522  COINLIBAPI int COINLINKAGE
    2520   Cbc_initialDualSolve(Cbc_Model * model)
     2523  Cbc_initialDualSolve(Cbc_Model * /*model*/)
    25212524  {
    25222525    return 0;
     
    25242527  /** Primal initial solve */
    25252528  COINLIBAPI int COINLINKAGE
    2526   Cbc_initialPrimalSolve(Cbc_Model * model)
     2529  Cbc_initialPrimalSolve(Cbc_Model * /*model*/)
    25272530  {
    25282531    return 0;
     
    25302533  /** Dual algorithm - see ClpSimplexDual.hpp for method */
    25312534  COINLIBAPI int COINLINKAGE
    2532   Cbc_dual(Cbc_Model * model, int ifValuesPass)
     2535  Cbc_dual(Cbc_Model * /*model*/, int /*ifValuesPass*/)
    25332536  {
    25342537    return 0;
     
    25362539  /** Primal algorithm - see ClpSimplexPrimal.hpp for method */
    25372540  COINLIBAPI int COINLINKAGE
    2538   Cbc_primal(Cbc_Model * model, int ifValuesPass)
     2541  Cbc_primal(Cbc_Model * /*model*/, int /*ifValuesPass*/)
    25392542  {
    25402543    return 0;
Note: See TracChangeset for help on using the changeset viewer.