Updates to annulusmap to make it fit the global style.

Author: tobydriscoll

@annulusmap/annulusmap.m

@@ -1,42 +1,64 @@
-function map = annulusmap(rgn)
-%ANNULUSMAP Solve the nonlinear system for D-SC parameter.
-%   ANNULUSMAP(RGN) solves the nonlinear system for D-SC parameter of a
-%   doubly connected region RGN as created by DSCPOLYGONS.
-%
-%   See also DSCPOLYGONS.
-
-%   Copyright by Alfa Heryudono, 2003.
-
-% Get inner and outer polygons from region rgn
-[p1 p0] = get(rgn);
-
-% Making the bridge to old subroutine :-) (I am lazy to clean the code
-% right now)
-map.region = rgn; %store rgn. Needed by plot. Too many unnecessary assignment. clean code later.
-
-% Check if the outer polygon is unbounded (ISHAPE = 1)
-if isinf(p0)==1
-    % Truncate Infinite vertices.
-    p0 = truncate(p0);
-    map.M = length(p0); map.N = length(p1);
-    map.Z0 = vertex(p0).'; map.Z1 = vertex(Z1).';
-    map.ALFA0 = angle(p0)'; map.ALFA1 = 2 - angle(p1)';
-    map.ISHAPE = 1;
-else
-    p0 = truncate(p0);
-    map.M = length(p0); map.N = length(p1);
-    map.Z0 = vertex(p0).'; map.Z1 = vertex(p1).';
-    map.ALFA0 = angle(p0)'; map.ALFA1 = 2 - angle(p1)';
-    map.ISHAPE = 0;
+classdef annulusmap
+    %ANNULUSMAP Conformal map to doubly connected polygonal region.
+    %   ANNULUSMAP(POLYOUTER,POLYINNER) creates a Schwarz-Christoffel annulus
+    %   map to the region bounded by polygons POLYOUTER and POLYINNER.
+    %
+    %   ANNULUSMAP(POLYOUTER,POLYINNER,'truncate') will truncate any unbounded
+    %   sides. Otherwise an error is thrown for unbounded regions.
+    
+    %   Copyright by Toby Driscoll, 2014
+    %   Written by Alfa Heryudono, 2003 and Toby Driscoll, 2014.
+    
+    properties
+        boundary
+        M, N, Z0, Z1, ALFA0, ALFA1
+        isUnbounded
+        qwork
+        u, c, w0, w1, phi0, phi1
+    end
+    
+    properties (Dependent)
+        % backward compatibility
+        ISHAPE
+    end
+    
+    methods
+        
+        function map = annulusmap(outerPolygon,innerPolygon,varargin)
+            
+            map.boundary = { outerPolygon, innerPolygon };
+            
+            if isinf(outerPolygon)
+                if (nargin < 3) || ~isequal(varargin{1},'truncate')
+                    error('Region must be bounded, or extra option given.')
+                else
+                    outerPolygon = truncate(outerPolygon);
+                    map.isUnbounded = true;
+                end
+            else
+                map.isUnbounded = false;
+            end
+            
+            map.M = length(outerPolygon); map.N = length(innerPolygon);
+            map.Z0 = vertex(outerPolygon).';
+            map.Z1 = vertex(innerPolygon).';
+            map.ALFA0 = angle(outerPolygon)'; 
+            map.ALFA1 = 2 - angle(innerPolygon)';
+            
+            % Generate the Gauss-Jacobi weights & nodes
+            nptq = 8;
+            map.qwork = qinit(map,nptq);
+            
+            % Solve parameter problem.
+            iguess = 0;  %(0 nonequally spaced guess or 1 equally spaced guess)
+            linearc = 1; % (0 line path or 1 circular path)
+            [map.u,map.c,map.w0,map.w1,map.phi0,map.phi1] = ...
+                dscsolv(iguess,nptq,map.qwork,map.isUnbounded,linearc,map);
+            
+        end
+        
+        function I = get.ISHAPE(map)
+            I = map.isUnbounded;
+        end
+    end
 end
-
-% Generate the Gauss-Jacobi weights & nodes
-nptq = 8;
-map.qwork = qinit(map,nptq);
-
-% Solve D-SC parameter
-iguess = 0;  %(0 nonequally spaced guess or 1 equally spaced guess)
-linearc = 1; % (0 line path or 1 circular path)
-[map.u,map.c,map.w0,map.w1,map.phi0,map.phi1] = dscsolv(iguess,nptq,map.qwork,map.ISHAPE,linearc,map);
-
-map = class(map,'annulusmap');

@annulusmap/dscmap.m

@@ -0,0 +1,35 @@
+function z = eval(map,w)
+%EVAL Evaluate Schwarz-Christoffel annulus map at points.
+%   EVAL(MAP,Z) evaluates the Schwarz-Christoffel map MAP at the points Z
+%   in the canoncial annulus. 
+%
+%   See also ANNULUSMAP.
+
+%   Copyright 2014 by Toby Driscoll.
+%   Written by Alfa Heryudono.
+
+% TODO: check if w is in the annulus
+
+kww = 0;
+ic = 2;
+
+% check if w is in W0.
+idx = find(map.w0 == w, 1 );
+if isempty(idx)==0
+    kww = idx;
+    ic = 0;
+else
+    % check if w is in W1.
+    idx = find(map.w1 == w, 1 );
+    if isempty(idx)==0
+        kww = idx;
+        ic = 1;
+    end
+end
+nptq = 8;
+
+%Making the bridge to old subroutine
+dataz = struct('M',map.M,'N',map.N,'Z0',map.Z0,'Z1',map.Z1,'ALFA0',map.ALFA0,'ALFA1',map.ALFA1,'ISHAPE',map.ISHAPE);
+z = zdsc(w,kww,ic,map.u,map.c,map.w0,map.w1,map.phi0,map.phi1,nptq,map.qwork,1,dataz);
+
+end

@annulusmap/eval.m

@@ -1,23 +1,24 @@
-function w = dscinvmap(map,z)
-%DSCINVMAP   Values of the inverse map.
-%   DSCINVMAP(MAP,Z) finds the inverse image of a point Z under the annulusmap 
-%   MAP. That is, it maps from the DC polygonal domain MAP.REGION to the
-%   annulus.
+function w = evalinv(map,z)
+%EVALINV   Evaluate the inverse map.
+%   EVALINV(MAP,Z) finds the inverse image of a point Z under the annulusmap 
+%   MAP. That is, it maps from a doubly connected polygonal domain to the
+%   canonical annulus.
 %
-% See also ANNULUSMAP, ANNULUSMAP.DSCMAP.
+% See also ANNULUSMAP, ANNULUSMAP.EvAL.
 
-% Copyright by Alfa Heryudono, 2003. 
+% Copyright by Toby Driscoll, 2014.
+% Written by Alfa Heryudono, 2003. 
 
 % TODO: check if z is in the doubly connected region
 
 % z is not allowed to be a vertex.
 % check if z is in Z0.
-idx = min(find(map.Z0 == z));
+idx = find(map.Z0 == z, 1 );
 if isempty(idx)==0
     error('The point calculated is a vertex.');
 else
     % check if z is in Z1.
-    idx = min(find(map.Z1 == z));
+    idx = find(map.Z1 == z, 1 );
     if isempty(idx)==0
        error('The point calculated is a vertex.');
     end