From: Bjørn Rustad <rustadbjornen@gmail.com>
Date: Wed, 28 Sep 2011 08:23:26 +0000 (+0200)
Subject: Plot function values
X-Git-Url: http://git.rustad.me/?a=commitdiff_plain;h=49b58deea59b13ca6d6e2bffe839375a8e3b7469;p=nummat1

Plot function values
---

diff --git a/steepest.py b/steepest.py
index 04e55ce..7e10fd2 100644
--- a/steepest.py
+++ b/steepest.py
@@ -20,11 +20,13 @@ x0_norm = norm(gradient_g(xiter, H, b, c))
 tolerance = 0.01
 
 relative_residual = norm(gradient_g(xiter, H, b, c)) / x0_norm
-relative_residuals = [relative_residual]
+relative_residuals = []
+function_values = []
 
 while relative_residual > tolerance:
     relative_residual = norm(gradient_g(xiter, H, b, c)) / x0_norm
     relative_residuals.append(relative_residual)
+    function_values.append(function_g(xiter, H, b, c))
 
     xiter = steepest_iter(xiter, alpha, lambda x: gradient_g(x, H, b, c))
     z = function_g(xiter, H, b, c)
@@ -34,13 +36,15 @@ while relative_residual > tolerance:
 X, Y, Z = surf.surf(H, b, c, xiter[0]-2, xiter[0]+2, xiter[1]-2, xiter[1]+2, -10, 3)
 
 plt.figure(1)
-ax = plt.subplot(111)
+ax = plt.subplot(211)
 plt.plot(relative_residuals)
 ax.set_yscale('log')
-plt.show()
 
-#print relative_residuals
+ax = plt.subplot(212)
+plt.plot(function_values)
+
+plt.show()
 
-s = mlab.mesh(X, Y, Z)
+surface = mlab.mesh(X, Y, Z)
 axes = mlab.axes()
 mlab.show()