Changeset 1369 for trunk/Clp


Ignore:
Timestamp:
May 30, 2009 4:56:01 AM (11 years ago)
Author:
forrest
Message:

forgot this

File:
1 edited

Legend:

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

    r1367 r1369  
    3333#else
    3434static char coin_prompt[]="Clp:";
     35#endif
     36#ifdef CLP_CILK
     37#ifndef CBC_THREAD
     38#define CBC_THREAD
     39#endif
    3540#endif
    3641#if WSSMP_BARRIER>=2
     
    13091314#endif
    13101315  parameters[numberParameters++]=
    1311     CbcOrClpParam("bscale","Whether to scale in barrier",
     1316    CbcOrClpParam("bscale","Whether to scale in barrier (and ordering speed)",
    13121317                  "off",BARRIERSCALE,7,false);
    13131318  parameters[numberParameters-1].append("on");
     1319  parameters[numberParameters-1].append("off1");
     1320  parameters[numberParameters-1].append("on1");
     1321  parameters[numberParameters-1].append("off2");
     1322  parameters[numberParameters-1].append("on2");
    13141323  parameters[numberParameters++]=
    13151324    CbcOrClpParam("chol!esky","Which cholesky algorithm",
Note: See TracChangeset for help on using the changeset viewer.