Mercurial > repos > public > sbplib

diff +sbp/D2Variable.m @ 395:359861563866 feature/beams

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with default.
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 26 Jan 2017 15:17:38 +0100
parents 42c89b5eedc0 ded4156e53e2
children 43ea848b6aa1
line wrap: on
line diff
--- a/+sbp/D2Variable.m	Wed Jan 25 16:22:18 2017 +0100
+++ b/+sbp/D2Variable.m	Thu Jan 26 15:17:38 2017 +0100
@@ -31,15 +31,20 @@
                         obj.e_r, obj.d1_l, obj.d1_r] = ...
                         sbp.implementations.d2_variable_4(m,obj.h);
                     obj.borrowing.M.d1 = 0.2505765857;
+                case 2
+                    [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,...
+                        obj.e_r, obj.d1_l, obj.d1_r] = ...
+                        sbp.implementations.d2_variable_2(m,obj.h);
+                    obj.borrowing.M.d1 = 0.3636363636; 
+                    % Borrowing const taken from Virta 2014
+                    
                 otherwise
                     error('Invalid operator order %d.',order);
             end
 
             obj.m = m;
             obj.M = [];
-
         end
-
         function str = string(obj)
             str = [class(obj) '_' num2str(obj.order)];
         end