Mercurial > octave-nkf

changeset 6527:2a04f026ef54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-04-16 16:54:09 by jwe]
author jwe
date Mon, 16 Apr 2007 16:54:09 +0000
parents 2a715c6409a5
children b3e973d63c1c
files scripts/ChangeLog scripts/optimization/sqp.m scripts/plot/__go_draw_axes__.m
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Fri Apr 13 20:31:50 2007 +0000
+++ b/scripts/ChangeLog	Mon Apr 16 16:54:09 2007 +0000
@@ -1,5 +1,11 @@
+2007-04-16  John W. Eaton  <jwe@octave.org>
+
+	* plot/__go_draw_axes__.m: For log plots, omit zero values too.
+
 2007-04-13  John W. Eaton  <jwe@octave.org>
 
+	* optimization/sqp.m: Initialize info to 0.
+
 	* optimization/qp.m: Undo previous change.
 
 2007-04-13  Geordie McBain  <geordie.mcbain@aeromech.usyd.edu.au>
--- a/scripts/optimization/sqp.m	Fri Apr 13 20:31:50 2007 +0000
+++ b/scripts/optimization/sqp.m	Mon Apr 16 16:54:09 2007 +0000
@@ -279,6 +279,8 @@
 
     ## report (iter, qp_iter, alpha, nfun, obj);
 
+    info = 0;
+
     while (++iter < iter_max)
 
       ## Check convergence.  This is just a simple check on the first
--- a/scripts/plot/__go_draw_axes__.m	Fri Apr 13 20:31:50 2007 +0000
+++ b/scripts/plot/__go_draw_axes__.m	Mon Apr 16 16:54:09 2007 +0000
@@ -700,12 +700,12 @@
     if (isinf (min_pos))
       warning ("axis: logscale with no positive values to plot");
     endif
-    if (min_val < 0)
+    if (min_val <= 0)
       min_val = min_pos;
-      if (max_val < 0)
+      if (max_val <= 0)
 	max_val = min_pos;
       endif
-      warning ("axis: omitting negative data in log plot");
+      warning ("axis: omitting nonpositive data in log plot");
     endif
     ## FIXME -- maybe this test should also be relative?
     if (abs (min_val - max_val) < sqrt (eps))