Changeset 492

Timestamp:

Nov 20, 2006 1:54:19 PM (13 years ago)

Author:

forrest

Message:

for nonlinear

File:

• branches/devel/Cbc/src/Cbc_ampl.cpp (modified) (6 diffs)

branches/devel/Cbc/src/Cbc_ampl.cpp

@@ -607 +607 @@
     sizeAssociated_(0),
     associated_(NULL),
+    numberSOS_(0),
+    startSOS_(NULL),
+    memberSOS_(NULL),
+    typeSOS_(NULL),
+    prioritySOS_(NULL),
+    referenceSOS_(NULL),
+    priority_(NULL),
     logLevel_(0),
     type_(-1),
@@ -810 +817 @@
     nl = jac0dim(stub, (long) strlen(stub));
     free(stub);
+    suf_declare(suftab, sizeof(suftab)/sizeof(SufDecl));
     /* read  model*/
     X0 = (double*) malloc(n_var*sizeof(double));
@@ -955 +963 @@
                 linear=true;
               }
-              char temp[100];
+              char temp[1000];
               char temp2[30];
               if (value==1.0) 
@@ -974 +982 @@
                   sprintf(temp,"%s%s",expr,temp2);
               }
+              assert (strlen(temp)<1000);
               setElement(iRow,j,temp);
               printf("el for row %d column c%7.7d is %s\n",iRow,j,temp);
@@ -998 +1007 @@
                 linear=true;
               }
-              char temp[100];
+              char temp[1000];
               char temp2[30];
               if (value==1.0) 
@@ -1017 +1026 @@
                   sprintf(temp,"%s%s",expr,temp2);
               }
+              assert (strlen(temp)<1000);
               setObjective(j,temp);
               printf("el for objective column c%7.7d is %s\n",j,temp);