Fixes to make the demos work.

tobydriscoll · Jul 22, 2014 · 7477a93 · 7477a93
1 parent 5a7b97f
commit 7477a93
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/@crdiskmap/crdiskmap.m b/@crdiskmap/crdiskmap.m
@@ -53,7 +53,7 @@
                     oldmap = poly;
                     % Continuation of given map to given polygon
                     poly = varargin{1};
-                    opt = scmapopt(oldmap);
+                    opt = options(oldmap);
                     cr0 = oldmap.crossratio;
                     if length(cr0) ~= length(poly)-3
                         msg = 'Polygon %s must have the same length as that in %s.';

diff --git a/@crrectmap/crrectmap.m b/@crrectmap/crrectmap.m
@@ -79,7 +79,7 @@
                         error('Invalid continuation syntax.')
                     end
                     poly = polygon(MD);
-                    opt = scmapopt(MD);
+                    opt = options(MD);
 
                 case 'crdiskmap'
                     MD = poly;
@@ -128,7 +128,7 @@
             else
                 param = parameters(MD);
                 orig = true(size(w));
-                opt = scmapopt(MD);
+                opt = options(MD);
             end
 
             map = map@scmap(poly,opt);

diff --git a/@crrectmap/private/crrect.m b/@crrectmap/private/crrect.m
@@ -146,11 +146,11 @@
 else
   % betar was supplied: just do computation
 
-  aff = craffine(w,beta,cr,Q);
+  aff = crdiskmap.craffine(w,beta,cr,Q);
   k = min(find(betar<0));
   wr = NaN*w;
   wr([k rem(k,n)+1]) = [0;1];
-  [affr,wr] = craffine(wr,betar,cr,Q);
+  [affr,wr] = crdiskmap.craffine(wr,betar,cr,Q);
 end
 
 % End of user-call section

diff --git a/scdlong.m b/scdlong.m
@@ -24,7 +24,7 @@
    '  -2.0000 + 2.0000i',
    '   2.0000 + 2.0000i  ]);',
    'plot(p)',
-   'f=diskmap(p,scmapopt(''tol'',1e-6,''trace'',''on''));',
+   'f=diskmap(p,sctool.scmapopt(''tol'',1e-6,''trace'',''on''));',
    '',
    '',
    '' };
@@ -67,7 +67,7 @@
 
   slide(5).code={
    'cla',
-   'f=rectmap(p,[1 3 4 6],scmapopt(''tol'',1e-6));',
+   'f=rectmap(p,[1 3 4 6],sctool.scmapopt(''tol'',1e-6));',
    'plot(f,4,8)',
    'title(''Map from rectangle'')' };
   slide(5).text={
@@ -92,7 +92,7 @@
   %========== Slide 7 ==========
 
   slide(7).code={
-   'f=stripmap(p,[3 6],scmapopt(''tol'',1e-6));',
+   'f=stripmap(p,[3 6],sctool.scmapopt(''tol'',1e-6));',
    'plot(f,8,4)',
    'title(''Map from strip'')' };
   slide(7).text={
@@ -122,7 +122,7 @@
   %========== Slide 9 ==========
 
   slide(9).code={
-   'f=rectmap(p,[2 4 5 1],scmapopt(''tol'',1e-4));',
+   'f=rectmap(p,[2 4 5 1],sctool.scmapopt(''tol'',1e-4));',
    'plot(f,4,6)' };
   slide(9).text={
    '>> f = rectmap(p,[2 4 5 1]);',
@@ -136,7 +136,7 @@
   %========== Slide 10 ==========
 
   slide(10).code={
-   'f=crdiskmap(p,scmapopt(''tol'',1e-4));',
+   'f=crdiskmap(p,sctool.scmapopt(''tol'',1e-4));',
    'f=center(f,i);',
    'plot(f)',
    '' };

diff --git a/scdtutor.m b/scdtutor.m
@@ -29,7 +29,7 @@
   %========== Slide 3 ==========
 
   slide(3).code={
-   'opt = scmapopt(''trace'',''off'');',
+   'opt = sctool.scmapopt(''trace'',''off'');',
    'f = hplmap(p,opt);',
    'plot(f,12,6)',
    '' };