Changeset 1369 for trunk

Timestamp:

May 30, 2009 4:56:01 AM (12 years ago)

Author:

forrest

Message:

forgot this

File:

• trunk/Clp/src/CbcOrClpParam.cpp (modified) (2 diffs)

trunk/Clp/src/CbcOrClpParam.cpp

@@ -33 +33 @@
 #else
 static char coin_prompt[]="Clp:";
+#endif
+#ifdef CLP_CILK
+#ifndef CBC_THREAD
+#define CBC_THREAD
+#endif
 #endif
 #if WSSMP_BARRIER>=2
@@ -1309 +1314 @@
 #endif
   parameters[numberParameters++]=
-    CbcOrClpParam("bscale","Whether to scale in barrier",
+    CbcOrClpParam("bscale","Whether to scale in barrier (and ordering speed)",
                   "off",BARRIERSCALE,7,false);
   parameters[numberParameters-1].append("on");
+  parameters[numberParameters-1].append("off1");
+  parameters[numberParameters-1].append("on1");
+  parameters[numberParameters-1].append("off2");
+  parameters[numberParameters-1].append("on2");
   parameters[numberParameters++]=
     CbcOrClpParam("chol!esky","Which cholesky algorithm",