Debugged display of curvdef systems and calculation of optimal coordinates in the presence of singularities

Author: Ross Hatton

ProgramFiles/sys_calcpath_fcns/integrate_cBVI.m

@@ -39,10 +39,11 @@
 					,struct('method','gauss','tol',1e-6))...
 					,(1:n_g)');
 
-			catch
+            catch
 
-				warning('Gait curve not sufficiently convex for simple integration. Specify either ''delaunay'' or ''section'' in p.complex_curve{i} to invoke that integration method')
-
+                if numel(s.grid.eval) == 2
+                    warning('Gait curve not sufficiently convex for simple integration. Specify either ''delaunay'' or ''section'' in p.complex_curve{i} to invoke that integration method')
+                end
 			end
 
 		else

ProgramFiles/sys_calcsystem_fcns/optimize_coordinate_choice.m

@@ -31,11 +31,11 @@
 	% optimization
 	if isfield(s,'coordinate_optimization_weighting_function')
 
-		weight = s.coordinate_optimization_weighting_function(s.grid.eval{:});
+		weight = s.coordinate_optimization_weighting_function(s.grid.finite_element{:});
 
 	elseif s.singularity
 
-		weight = weight_away_from_singularities(s.vecfield.eval.singularities, s.grid.eval);
+		weight = weight_away_from_singularities(s.vecfield.eval.singularities, s.grid.finite_element);
 
 	else
 		weight = ones(size(s.grid.finite_element{1}));
@@ -200,7 +200,7 @@
 	if s.singularity
 
 		for i = 1:numel(s.vecfield.display.content.Avec_optimized)
-			s.vecfield.display.content.Avec_optimized{i} = s.vecfield.display.content.Avec_optimized1{i} .* (1-s.vecfield.display.singularities{i});
+			s.vecfield.display.content.Avec_optimized{i} = s.vecfield.display.content.Avec_optimized{i} .* (1-s.vecfield.display.singularities{i});
 		end
 
 	end

ProgramFiles/sys_draw_fcns/illustrate_shapespace.m

@@ -15,7 +15,7 @@ function illustrate_shapespace(system,target)
 % the components of the grid are in a column cell array to avoid any
 % row/column problems below
 paramgrid = visual.grid(:);
-n_dim=size(visual.grid,1);
+n_dim=numel(visual.grid);
 test2=cell(1,n_dim-1);
 test3=cell(1,n_dim-2);
 test2{1}=1;

UserFiles/GenericUser/Systems/curv_triangle_wave_two_periods.m

@@ -1,4 +1,4 @@
-% (258094553458734611*sign((a1*cos(4*s*pi) + a2*sin(4*s*pi))/(a1^2 + a2^2)^(1/2))*abs(a1*cos(4*s*pi) + a2*sin(4*s*pi))^20*(a1^2 + a2^2)^(1/2))/(72057594037927936*abs(a1^2 + a2^2)^10)
+% (516189106917469267*sign((a1*cos(4*s*pi) + a2*sin(4*s*pi))/(a1^2 + a2^2)^(1/2))*abs(a1*cos(4*s*pi) + a2*sin(4*s*pi))^20*(a1^2 + a2^2)^(1/2))/(144115188075855872*abs(a1^2 + a2^2)^10)
 function output = curv_triangle_wave_two_periods(params,mode)
 
 % Turn params into a cell matrix

UserFiles/GenericUser/Systems/sysf_three_link_kinematic.m

@@ -67,8 +67,8 @@
 			%densities for various operations
 			s.density.vector = [10 10]; %density to display vector field
 			s.density.scalar = [30 30]; %density to display scalar functions
-			s.density.eval = [20 20];   %density for function evaluations
-            s.density.finite_element=31;
+			s.density.eval = [30 30];   %density for function evaluations
+            s.density.finite_element=30;
 
 			%%%
 			%Display parameters