Changeset 2031 for stable

Timestamp:

Apr 14, 2014 1:35:27 PM (5 years ago)

Author:

forrest

Message:

fix some ampl problems

Location:

stable/2.8/Cbc/src

Files:

• CbcSolver.cpp (modified) (1 diff)
• Cbc_ampl.cpp (modified) (2 diffs)

stable/2.8/Cbc/src/CbcSolver.cpp

@@ -1609 +1609 @@
                 // modify objective if necessary
                 solver->setObjSense(info.direction);
-                solver->setDblParam(OsiObjOffset, info.offset);
+                solver->setDblParam(OsiObjOffset, -info.offset);
                 if (info.offset) {
                     sprintf(generalPrint, "Ampl objective offset is %g",

stable/2.8/Cbc/src/Cbc_ampl.cpp

@@ -413 +413 @@
     /* for basis info */
     info->columnStatus = (int *) malloc(n_var * sizeof(int));
+    for (int i=0;i<n_var;i++)
+      info->columnStatus[i]=3;
     info->rowStatus = (int *) malloc(n_con * sizeof(int));
+    for (int i=0;i<n_con;i++)
+      info->rowStatus[i]=1;
     csd = suf_iput("sstatus", ASL_Sufkind_var, info->columnStatus);
     rsd = suf_iput("sstatus", ASL_Sufkind_con, info->rowStatus);
@@ -694 +698 @@
 int ampl_obj_prec()
 {
-    return obj_prec();
+    int precision = obj_prec();
+    if (precision<=0)
+        precision=15;
+    return precision;
 }
 void writeAmpl(ampl_info * info)