comparison src/DLD-FUNCTIONS/__glpk__.cc @ 14854:5ae9f0f77635

maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory * __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __magick_read__.cc, besselj.cc, bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, daspk.cc, dasrt.cc, dassl.cc, dmperm.cc, fft.cc, filter.cc, find.cc, gcd.cc, kron.cc, lsode.cc, lu.cc, luinc.cc, quad.cc, quadcc.cc, rand.cc, regexp.cc, schur.cc, str2double.cc, symbfact.cc, symrcm.cc, tril.cc, urlwrite.cc: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory.
author Rik <octave@nomad.inbox5.com>
date Mon, 09 Jul 2012 13:01:49 -0700
parents 460a3c6d8bf1
children
comparison
equal deleted inserted replaced
14853:72b8b39e12be 14854:5ae9f0f77635
280 longjmp (mark, -1); 280 longjmp (mark, -1);
281 } 281 }
282 } 282 }
283 283
284 //-- scale the problem data (if required) 284 //-- scale the problem data (if required)
285 //-- if (scale && (!presol || method == 1)) lpx_scale_prob(lp); 285 //-- if (scale && (!presol || method == 1)) lpx_scale_prob (lp);
286 //-- LPX_K_SCALE=IParam[1] LPX_K_PRESOL=IParam[16] 286 //-- LPX_K_SCALE=IParam[1] LPX_K_PRESOL=IParam[16]
287 if (lpxIntParam[1] && (! lpxIntParam[16] || lpsolver != 1)) 287 if (lpxIntParam[1] && (! lpxIntParam[16] || lpsolver != 1))
288 lpx_scale_prob (lp); 288 lpx_scale_prob (lp);
289 289
290 //-- build advanced initial basis (if required) 290 //-- build advanced initial basis (if required)
291 if (lpsolver == 1 && ! lpxIntParam[16]) 291 if (lpsolver == 1 && ! lpxIntParam[16])
292 lpx_adv_basis (lp); 292 lpx_adv_basis (lp);
293 293
294 for(int i = 0; i < NIntP; i++) 294 for (int i = 0; i < NIntP; i++)
295 lpx_set_int_parm (lp, IParam[i], lpxIntParam[i]); 295 lpx_set_int_parm (lp, IParam[i], lpxIntParam[i]);
296 296
297 for (int i = 0; i < NRealP; i++) 297 for (int i = 0; i < NRealP; i++)
298 lpx_set_real_parm (lp, RParam[i], lpxRealParam[i]); 298 lpx_set_real_parm (lp, RParam[i], lpxRealParam[i]);
299 299
311 method = 'I'; 311 method = 'I';
312 errnum = lpx_simplex (lp); 312 errnum = lpx_simplex (lp);
313 errnum = lpx_integer (lp); 313 errnum = lpx_integer (lp);
314 } 314 }
315 else 315 else
316 errnum = lpx_simplex(lp); 316 errnum = lpx_simplex (lp);
317 } 317 }
318 break; 318 break;
319 319
320 case 'T': 320 case 'T':
321 errnum = lpx_interior(lp); 321 errnum = lpx_interior (lp);
322 break; 322 break;
323 323
324 default: 324 default:
325 break; 325 break;
326 #if 0 326 #if 0
529 error ("__glpk__: invalid value of A"); 529 error ("__glpk__: invalid value of A");
530 return retval; 530 return retval;
531 } 531 }
532 532
533 for (octave_idx_type j = 0; j < Anc; j++) 533 for (octave_idx_type j = 0; j < Anc; j++)
534 for (octave_idx_type i = A.cidx(j); i < A.cidx(j+1); i++) 534 for (octave_idx_type i = A.cidx (j); i < A.cidx (j+1); i++)
535 { 535 {
536 nz++; 536 nz++;
537 rn(nz) = A.ridx(i) + 1; 537 rn(nz) = A.ridx (i) + 1;
538 cn(nz) = j + 1; 538 cn(nz) = j + 1;
539 a(nz) = A.data(i); 539 a(nz) = A.data(i);
540 } 540 }
541 } 541 }
542 else 542 else