Changeset 2036 for trunk/Cbc/src
 Timestamp:
 May 25, 2014 9:07:36 PM (5 years ago)
 Location:
 trunk/Cbc/src
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Cbc/src/Cbc_C_Interface.cpp
r2033 r2036 32 32 { \ 33 33 return m>model_>prop(); \ 34 } 35 36 #define CbcSetSolverProperty(T,prop) \ 37 COINLIBAPI void COINLINKAGE \ 38 Cbc_ ## prop (Cbc_Model *m, int index, T val) \ 39 { \ 40 m>model_>solver()>prop(index,val); \ 34 41 } 35 42 … … 700 707 701 708 CbcGetProperty(const double*, getRowLower) 709 CbcSetSolverProperty(double, setRowLower) 702 710 CbcGetProperty(const double*, getRowUpper) 711 CbcSetSolverProperty(double, setRowUpper) 703 712 CbcGetProperty(const double*, getObjCoefficients) 713 CbcSetSolverProperty(double, setObjCoeff) 704 714 CbcGetProperty(const double*, getColLower) 715 CbcSetSolverProperty(double, setColLower) 705 716 CbcGetProperty(const double*, getColUpper) 717 CbcSetSolverProperty(double, setColUpper) 706 718 707 719 CbcGetProperty(double, getObjValue) … … 824 836 } 825 837 /** Add SOS constraints to the model using roworder matrix */ 838 /* 826 839 COINLIBAPI void COINLINKAGE 827 840 Cbc_addSOS(Cbc_Model * model, int numRows, const int * rowStarts, … … 890 903 if (VERBOSE > 2) { 891 904 printf("%s calling addObjects()\n", prefix); 892 /*893 printf("%s numObjects = %i, objects = %X\n",prefix,numObjects,objects);894 for (row=0; row<numObjects; row++)895 printf("%s objects[%i] = %X\n",prefix,row,objects[row]);896 */905 906 // printf("%s numObjects = %i, objects = %X\n",prefix,numObjects,objects); 907 // for (row=0; row<numObjects; row++) 908 // printf("%s objects[%i] = %X\n",prefix,row,objects[row]); 909 897 910 } 898 911 fflush(stdout); … … 905 918 if (VERBOSE > 0) printf("%sreturn\n", prefix); 906 919 return; 907 } 920 }*/ 908 921 909 922 /** Print the solution */ 
trunk/Cbc/src/Cbc_C_Interface.h
r2033 r2036 173 173 Cbc_getRowLower(Cbc_Model * model) 174 174 ; 175 /** Set the lower bound of a single constraint */ 176 COINLIBAPI void COINLINKAGE 177 Cbc_setRowLower(Cbc_Model * model, int index, double value) 178 ; 175 179 /** Constraint upper bounds */ 176 180 COINLIBAPI const double* COINLINKAGE 177 181 Cbc_getRowUpper(Cbc_Model * model) 178 182 ; 183 /** Set the upper bound of a single constraint */ 184 COINLIBAPI void COINLINKAGE 185 Cbc_setRowUpper(Cbc_Model * model, int index, double value) 186 ; 179 187 /** Objective vector */ 180 188 COINLIBAPI const double * COINLINKAGE 181 189 Cbc_getObjCoefficients(Cbc_Model * model) 182 190 ; 191 /** Set the objective coefficient of a single variable */ 192 COINLIBAPI void COINLINKAGE 193 Cbc_setObjCoeff(Cbc_Model * model, int index, double value) 194 ; 183 195 /** Variable lower bounds */ 184 196 COINLIBAPI const double * COINLINKAGE 185 197 Cbc_getColLower(Cbc_Model * model) 186 198 ; 199 /** Set the lower bound of a single variable */ 200 COINLIBAPI void COINLINKAGE 201 Cbc_setColLower(Cbc_Model * model, int index, double value) 202 ; 187 203 /** Variable upper bounds */ 188 204 COINLIBAPI const double * COINLINKAGE 189 205 Cbc_getColUpper(Cbc_Model * model) 206 ; 207 /** Set the upper bound of a single variable */ 208 COINLIBAPI void COINLINKAGE 209 Cbc_setColUpper(Cbc_Model * model, int index, double value) 190 210 ; 191 211 /** Determine whether the ith variable is integer restricted */ … … 201 221 Cbc_setInteger(Cbc_Model * model, int iColumn) 202 222 ; 203 /** Add SOS constraints to the model using roworder matrix */ 204 COINLIBAPI void COINLINKAGE 223 /* Add SOS constraints to the model using roworder matrix 224 * Unable to confirm that this function is working. */ 225 /*COINLIBAPI void COINLINKAGE 205 226 Cbc_addSOS(Cbc_Model * model, int numRows, const int * rowStarts, 206 227 const int * colIndices, const double * weights, const int type) 207 ; 228 ;*/ 208 229 /** Print the model */ 209 230 COINLIBAPI void COINLINKAGE
Note: See TracChangeset
for help on using the changeset viewer.