changeset 7404:32c1c3a3b07c

[project @ 2008-01-19 06:24:47 by jwe]
author jwe
date Sat, 19 Jan 2008 06:24:47 +0000
parents 135c13496faf
children b0734cf13ad4
files scripts/optimization/sqp.m src/graphics.h.in
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/optimization/sqp.m	Sat Jan 19 06:10:33 2008 +0000
+++ b/scripts/optimization/sqp.m	Sat Jan 19 06:24:47 2008 +0000
@@ -734,4 +734,4 @@
 %!
 %! obj_opt = 0.0539498477702739;
 %!
-%! assert (all (abs (x-x_opt) < sqrt (eps)) && abs (obj-obj_opt) < sqrt (eps));
+%! assert (all (abs (x-x_opt) < 4*sqrt (eps)) && abs (obj-obj_opt) < sqrt (eps));
--- a/src/graphics.h.in	Sat Jan 19 06:10:33 2008 +0000
+++ b/src/graphics.h.in	Sat Jan 19 06:24:47 2008 +0000
@@ -963,26 +963,26 @@
   base_properties (const std::string& ty = "unknown",
                    const graphics_handle& mh = graphics_handle (),
                    const graphics_handle& p = graphics_handle ())
-    : tag ("tag", mh),
-      type ("type", mh, ty),
-      __modified__ ("__modified__", mh, true),
-      __myhandle__ (mh),
-      parent ("parent", mh, p), 
-      children (),
+    : beingdeleted ("beingdeleted", mh, false),
       busyaction ("parent", mh, "{queue}|cancel"),
       buttondownfcn ("buttondownfcn", mh, Matrix ()),
+      children (),
       clipping ("clipping", mh, true),
       createfcn ("createfcn" , mh, Matrix ()),
       deletefcn ("deletefcn", mh, Matrix ()),
       handlevisibility ("handlevisibility", mh, "{on}|callback|off"),
       hittest ("hittest", mh, true),
       interruptible ("interruptible", mh, true),
+      parent ("parent", mh, p), 
       selected ("selected", mh, false),
       selectionhighlight ("selectionhighlight", mh, true),
-      uicontextmenu ("uicontextmenu", mh, graphics_handle ()),
+      tag ("tag", mh),
+      type ("type", mh, ty),
       userdata ("userdata", mh, Matrix ()),
       visible ("visible", mh, true),
-	  beingdeleted ("beingdeleted", mh, false)
+      __modified__ ("__modified__", mh, true),
+      __myhandle__ (mh),
+      uicontextmenu ("uicontextmenu", mh, graphics_handle ())
     { }
 
   virtual ~base_properties (void) { }