Mercurial > repos > public > sbplib

diff diracDiscr.m @ 1237:6e4cc4b66de0 feature/dirac_discr

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove overloading of norm() and fnorm
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 20 Nov 2019 00:13:56 +0100
parents 3722c2579818
children dea852e85b77
line wrap: on
line diff
--- a/diracDiscr.m	Wed Nov 20 00:10:30 2019 +0100
+++ b/diracDiscr.m	Wed Nov 20 00:13:56 2019 +0100
@@ -41,7 +41,6 @@
         ret = zeros(size(x));
 
     else
-        fnorm = diag(H);
         tot_order = m_order+s_order; %This is equiv. to the number of equations solved for
         S = [];
         M = [];
@@ -54,7 +53,9 @@
 
         polynomial = (x(index)-x(index(1)))/(x(index(end))-x(index(1)));
         x_0 = (x_s-x(index(1)))/(x(index(end))-x(index(1)));
-        norm = fnorm(index)/h;
+        
+        quadrature = diag(H);
+        quadrature_weights = quadrature(index)/h;
 
         h_polynomial = polynomial(2)-polynomial(1);
         b = zeros(tot_order,1);
@@ -65,7 +66,7 @@
 
         for i = 1:tot_order
             for j = 1:m_order
-                M(j,i) = polynomial(i)^(j-1)*h_polynomial*norm(i);
+                M(j,i) = polynomial(i)^(j-1)*h_polynomial*quadrature_weights(i);
             end
         end