Mercurial > octave-libtiff

changeset 23169:6f2164303aac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 08 Feb 2017 19:16:50 -0500
parents a2d6b84ce5c5 (current diff) d7ea2662a7a8 (diff)
children b3f2645803fe
files libgui/src/main-window.cc scripts/optimization/qp.m scripts/testfun/__run_test_suite__.m
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Wed Feb 08 12:24:03 2017 +0100
+++ b/libgui/src/main-window.cc	Wed Feb 08 19:16:50 2017 -0500
@@ -1445,6 +1445,8 @@
       connect (qApp, SIGNAL (aboutToQuit ()),
                workspace_window, SLOT (save_settings ()));
       connect (qApp, SIGNAL (aboutToQuit ()),
+               editor_window, SLOT (save_settings ()));
+      connect (qApp, SIGNAL (aboutToQuit ()),
                this, SLOT (prepare_to_exit ()));
       connect (qApp, SIGNAL (aboutToQuit ()),
                shortcut_manager::instance, SLOT (cleanup_instance ()));
--- a/scripts/optimization/qp.m	Wed Feb 08 12:24:03 2017 +0100
+++ b/scripts/optimization/qp.m	Wed Feb 08 19:16:50 2017 -0500
@@ -373,8 +373,8 @@
             Atmp = [Ain, gamma];
             btmp = bin;
           endif
-          ctmp = [zeros(n, 1); ones(n_in, 1)];
-          lb = [-Inf(n,1); zeros(n_in,1)];
+          ctmp = [zeros(n-n_eq, 1); ones(n_in, 1)];
+          lb = [-Inf(n-n_eq,1); zeros(n_in,1)];
           ub = [];
           ctype = repmat ("L", n_in, 1);
           [P, dummy, status] = glpk (ctmp, Atmp, btmp, lb, ub, ctype);
--- a/scripts/testfun/__run_test_suite__.m	Wed Feb 08 12:24:03 2017 +0100
+++ b/scripts/testfun/__run_test_suite__.m	Wed Feb 08 19:16:50 2017 -0500
@@ -122,10 +122,10 @@
   end_unwind_protect
 
   if (nargout > 0)
-    pass = np;
+    pass = dp;
     fail = nfail;
     xfail = dxf;
-    skip = xsk;
+    skip = dsk;
   endif
 
 endfunction