Mercurial > octave-nkf

comparison scripts/optimization/qp.m @ 20266:83792dd9bcc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use in-place operators in m-files where possible. * scripts/audio/@audioplayer/set.m, scripts/audio/@audiorecorder/set.m, scripts/audio/mu2lin.m, scripts/elfun/cosd.m, scripts/general/del2.m, scripts/general/profexplore.m, scripts/general/quadl.m, scripts/general/rat.m, scripts/general/rotdim.m, scripts/help/get_first_help_sentence.m, scripts/help/private/__strip_html_tags__.m, scripts/image/cubehelix.m, scripts/io/textread.m, scripts/linear-algebra/duplication_matrix.m, scripts/linear-algebra/housh.m, scripts/linear-algebra/krylov.m, scripts/linear-algebra/logm.m, scripts/linear-algebra/normest.m, scripts/linear-algebra/onenormest.m, scripts/optimization/fminsearch.m, scripts/optimization/lsqnonneg.m, scripts/optimization/qp.m, scripts/plot/appearance/annotation.m, scripts/plot/appearance/axis.m, scripts/plot/appearance/legend.m, scripts/plot/appearance/specular.m, scripts/plot/draw/colorbar.m, scripts/plot/draw/hist.m, scripts/plot/draw/plotmatrix.m, scripts/plot/draw/private/__stem__.m, scripts/plot/util/__actual_axis_position__.m, scripts/plot/util/__gnuplot_drawnow__.m, scripts/plot/util/findobj.m, scripts/plot/util/print.m, scripts/plot/util/private/__go_draw_axes__.m, scripts/plot/util/private/__print_parse_opts__.m, scripts/plot/util/rotate.m, scripts/polynomial/pchip.m, scripts/polynomial/polyaffine.m, scripts/polynomial/polyder.m, scripts/polynomial/private/__splinefit__.m, scripts/polynomial/residue.m, scripts/signal/arch_fit.m, scripts/signal/arch_rnd.m, scripts/signal/bartlett.m, scripts/signal/blackman.m, scripts/signal/freqz.m, scripts/signal/hamming.m, scripts/signal/hanning.m, scripts/signal/spectral_adf.m, scripts/signal/spectral_xdf.m, scripts/signal/stft.m, scripts/sparse/bicgstab.m, scripts/sparse/cgs.m, scripts/sparse/private/__sprand_impl__.m, scripts/sparse/qmr.m, scripts/sparse/sprandsym.m, scripts/sparse/svds.m, scripts/specfun/legendre.m, scripts/special-matrix/gallery.m, scripts/statistics/base/gls.m, scripts/statistics/models/logistic_regression.m, scripts/statistics/tests/kruskal_wallis_test.m, scripts/statistics/tests/manova.m, scripts/statistics/tests/wilcoxon_test.m, scripts/time/datevec.m: Use in-place operators in m-files where possible.
author Rik <rik@octave.org>
date Tue, 26 May 2015 21:07:42 -0700
parents f1d0f506ee78
children 5c088348fddb
comparison
equal deleted inserted replaced
20265:e914b5399c67 20266:83792dd9bcc1
235 ## These are actually an equality constraint 235 ## These are actually an equality constraint
236 tmprow = zeros (1,n); 236 tmprow = zeros (1,n);
237 tmprow(i) = 1; 237 tmprow(i) = 1;
238 A = [A;tmprow]; 238 A = [A;tmprow];
239 b = [b; 0.5*(lb(i) + ub(i))]; 239 b = [b; 0.5*(lb(i) + ub(i))];
240 n_eq = n_eq + 1; 240 n_eq += 1;
241 else 241 else
242 tmprow = zeros (1,n); 242 tmprow = zeros (1,n);
243 tmprow(i) = 1; 243 tmprow(i) = 1;
244 Ain = [Ain; tmprow; -tmprow]; 244 Ain = [Ain; tmprow; -tmprow];
245 bin = [bin; lb(i); -ub(i)]; 245 bin = [bin; lb(i); -ub(i)];
246 n_in = n_in + 2; 246 n_in += 2;
247 endif 247 endif
248 endfor 248 endfor
249 endif 249 endif
250 endif 250 endif
251 251
279 < rtol*(1 + max (abs (A_lb(i) + A_ub(i))))) 279 < rtol*(1 + max (abs (A_lb(i) + A_ub(i)))))
280 ## These are actually an equality constraint 280 ## These are actually an equality constraint
281 tmprow = A_in(i,:); 281 tmprow = A_in(i,:);
282 A = [A;tmprow]; 282 A = [A;tmprow];
283 b = [b; 0.5*(A_lb(i) + A_ub(i))]; 283 b = [b; 0.5*(A_lb(i) + A_ub(i))];
284 n_eq = n_eq + 1; 284 n_eq += 1;
285 else 285 else
286 tmprow = A_in(i,:); 286 tmprow = A_in(i,:);
287 Ain = [Ain; tmprow; -tmprow]; 287 Ain = [Ain; tmprow; -tmprow];
288 bin = [bin; A_lb(i); -A_ub(i)]; 288 bin = [bin; A_lb(i); -A_ub(i)];
289 n_in = n_in + 2; 289 n_in += 2;
290 endif 290 endif
291 endfor 291 endfor
292 endif 292 endif
293 endif 293 endif
294 endif 294 endif