# HG changeset patch
# User jwe
# Date 982894391 0
# Node ID bc61e418f20079edd34efd1625b473134bd66c01
# Parent  115cbfcd067efa95186cebf859bde7cf5f90cf7a
[project @ 2001-02-23 02:13:10 by jwe]

diff -r 115cbfcd067e -r bc61e418f200 scripts/ChangeLog
--- a/scripts/ChangeLog	Thu Feb 22 21:55:17 2001 +0000
+++ b/scripts/ChangeLog	Fri Feb 23 02:13:11 2001 +0000
@@ -1,3 +1,12 @@
+2001-02-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* linear-algebra/norm.m: Use sqrt instead of ^0.5.
+
+2001-02-22  Heinz Bauschke  <bauschke@cecm.sfu.ca>
+
+	* linear-algebra/norm.m: Use more efficient method for Frobenius
+	norm.
+
 2001-02-09  David Livings  <david.livings@asa.co.uk>
 
 	* statistics/tests/welch_test.m: Fix typo.
diff -r 115cbfcd067e -r bc61e418f200 scripts/linear-algebra/norm.m
--- a/scripts/linear-algebra/norm.m	Thu Feb 22 21:55:17 2001 +0000
+++ b/scripts/linear-algebra/norm.m	Fri Feb 23 02:13:11 2001 +0000
@@ -75,7 +75,7 @@
     if (nargin == 2)
       if (isstr (p))
         if (strcmp (p, "fro"))
-          retval = sqrt (sum (diag (x' * x)));
+	  retval = sqrt (sum (abs (x) .^ 2));
         elseif (strcmp (p, "inf"))
           retval = max (abs (x));
         else
@@ -91,7 +91,7 @@
         endif
       endif
     elseif (nargin == 1)
-      retval = sum (abs (x) .^ 2) ^ 0.5;
+      retval = sqrt (sum (abs (x) .^ 2));
     endif
 
   else
@@ -99,7 +99,7 @@
     if (nargin == 2)
       if (isstr (p))
         if (strcmp (p, "fro"))
-          retval = sqrt (sum (diag (x' * x)));
+	  retval = sqrt (sum (sum (abs (x) .^ 2)));
         elseif (strcmp (p, "inf"))
           retval = max (sum (abs (x')));
         else