Changeset 1682 for trunk

Timestamp:

Feb 10, 2011 11:46:30 AM (9 years ago)

Author:

forrest

Message:

stupid me - I did it again - glpk fix

File:

• trunk/Clp/src/ClpMain.cpp (modified) (3 diffs)

trunk/Clp/src/ClpMain.cpp

@@ -29 +29 @@
 extern glp_tran* cbc_glp_tran;
 extern glp_prob* cbc_glp_prob;
+#else
+#define GLP_UNDEF 1
+#define GLP_FEAS 2
+#define GLP_INFEAS 3
+#define GLP_NOFEAS 4
+#define GLP_OPT 5
 #endif
 
@@ -1828 +1834 @@
                                        int numberColumns = models[iModel].getNumCols();
                                        int numberGlpkRows=numberRows+1;
+#ifdef COIN_HAS_GLPK
                                        if (cbc_glp_prob) {
                                          // from gmpl
@@ -1835 +1842 @@
                                                   numberRows,numberGlpkRows);
                                        }
+#endif
                                        fprintf(fp,"%d %d\n",numberGlpkRows,
                                                numberColumns);