[Octave-cvsupdate] SF.net SVN: octave:[10235] trunk/octave-forge/main/geometry

[<jpi...@us...>]

Revision: 10235
          http://octave.svn.sourceforge.net/octave/?rev=10235&view=rev
Author:   jpicarbajal
Date:     2012-04-16 08:31:15 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
geometry: Fixing PKG_ADD and PKG_DEL

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/INDEX
    trunk/octave-forge/main/geometry/PKG_ADD
    trunk/octave-forge/main/geometry/PKG_DEL
    trunk/octave-forge/main/geometry/inst/io/data2geo.m

Modified: trunk/octave-forge/main/geometry/INDEX
===================================================================
--- trunk/octave-forge/main/geometry/INDEX	2012-04-16 07:34:41 UTC (rev 10234)
+++ trunk/octave-forge/main/geometry/INDEX	2012-04-16 08:31:15 UTC (rev 10235)
@@ -125,7 +125,7 @@
  shapecentroid
  shapeplot
  shapetransform
- curvelval
+ curveval
  curve2polyline
 2D Others
  bisector

Modified: trunk/octave-forge/main/geometry/PKG_ADD
===================================================================
--- trunk/octave-forge/main/geometry/PKG_ADD	2012-04-16 07:34:41 UTC (rev 10234)
+++ trunk/octave-forge/main/geometry/PKG_ADD	2012-04-16 08:31:15 UTC (rev 10235)
@@ -2,22 +2,35 @@
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip", "graphs"};
 dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
 pp = strsplit (dirname,filesep (), true);
-
-%% Check if prefix was used
-[pkg_folder dep_folder] = pkg ("prefix");
-pkg_folder = [pkg_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
-dep_folder = [dep_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
-
-%% If we are in Architecture dependent folder add from outside
 arch = cstrcat (octave_config_info ("canonical_host_type"),
                               "-", octave_config_info ("api_version"));
-if strcmp (arch , pp{end})
-  dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
-  pkg_folder = strsplit (pkg_folder,filesep (), true);
-  pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
+
+%% Get the correct path
+% Search installed packages
+[local_packages, global_packages] = pkg("list");
+installed_pkgs_lst = {local_packages{:}, global_packages{:}};
+pkg_data = installed_pkgs_lst (cellfun(@(x) ismember (x.name, {"geometry"}), ...
+                                             installed_pkgs_lst, "unif", true));
+if isempty(pkg_data)
+  % The package is not installed yet
+  [pkg_folder dep_folder] = pkg ("prefix");
+  pkg_folder = [pkg_folder strcat(filesep(),{pp{end-1:end}}){:} ];
+%  dep_folder = [dep_folder strcat(filesep(),{pp{end-1:end}}){:} ];
+  if strcmp (arch , pp{end})
+  %% If we are in Architecture dependent folder add from outside
+    pkg_folder = strsplit (pkg_folder,filesep (), true);
+    pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
+%    dep_folder = strsplit (dep_folder,filesep (), true);
+%    dep_folder = [strcat(filesep(),{dep_folder{1:end-1}}){:}];
+  end
+else
+  pkg_folder = pkg_data{1}.dir;
+%  dep_folder = pkg_data{1}.archprefix;
 end
 
-if (! exist (fullfile (dirname, "inst"), "dir"))
+%dep_folder = [dep_folder filesep arch];
+
+if (! exist (fullfile (pkg_folder, "inst"), "dir"))
 %% Installing
   for ii=1:length (dirlist)
     addpath ( [ pkg_folder filesep() dirlist{ii}],"-end")
@@ -27,9 +40,11 @@
 %% Testing
   warning("geometry:Devel","Adding path for testing.");
   for ii=1:length(dirlist)
-    addpath ([ dirname "/inst/" dirlist{ii}])
+    addpath ([ pkg_folder "/inst/" dirlist{ii}])
   endfor
 endif
+%addpath (dep_folder)
 
 warning('off', 'Octave:fopen-file-in-path');
-clear dirlist dirname pp arch pkg_folder dep_folder
+clear dirlist dirname pp arch pkg_folder
+%dep_folder

Modified: trunk/octave-forge/main/geometry/PKG_DEL
===================================================================
--- trunk/octave-forge/main/geometry/PKG_DEL	2012-04-16 07:34:41 UTC (rev 10234)
+++ trunk/octave-forge/main/geometry/PKG_DEL	2012-04-16 08:31:15 UTC (rev 10235)
@@ -2,28 +2,34 @@
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip","graphs"};
 dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
 pp = strsplit (dirname,filesep (), true);
-
-%% Get the correct path
-p1 = pkg_info ("miscellaneous", "archprefix");
-p2 = octave_config_info ("canonical_host_type");
-p2 = octave_config_info ("api_version");
-arch_dep_fldr = [p1 filesep "-" p3];
-
-%[pkg_folder dep_folder] = pkg ("prefix");
-%pkg_folder = [pkg_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
-%dep_folder = [dep_folder filesep() strcat(filesep(),{pp{end-1:end}}){:} ];
-
-%% If we are not in Architecture dependent folder
 arch = cstrcat (octave_config_info ("canonical_host_type"),
                               "-", octave_config_info ("api_version"));
-pp = strsplit (dirname,filesep (), true);
-if strcmp(arch , pp{end})
-  dirname = [pkg("prefix") filesep() pp{end-1}];
-  pkg_folder = strsplit (pkg_folder,filesep (), true);
-  pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
+%% Get the correct path
+% Search installed packages
+[local_packages, global_packages] = pkg("list");
+installed_pkgs_lst = {local_packages{:}, global_packages{:}};
+pkg_data = installed_pkgs_lst (cellfun(@(x) ismember (x.name, {"geometry"}), ...
+                                             installed_pkgs_lst, "unif", true));
+if isempty(pkg_data)
+  % The package is not installed yet
+  [pkg_folder dep_folder] = pkg ("prefix");
+  pkg_folder = [pkg_folder strcat(filesep(),{pp{end-1:end}}){:} ];
+%  dep_folder = [dep_folder strcat(filesep(),{pp{end-1:end}}){:} ];
+  if strcmp (arch , pp{end})
+  %% If we are in Architecture dependent folder add from outside
+    pkg_folder = strsplit (pkg_folder,filesep (), true);
+    pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
+%    dep_folder = strsplit (dep_folder,filesep (), true);
+%    dep_folder = [strcat(filesep(),{dep_folder{1:end-1}}){:}];
+  end
+else
+  pkg_folder = pkg_data{1}.dir;
+%  dep_folder = pkg_data{1}.archprefix;
 end
 
-if (! exist (fullfile (dirname, "inst"), "dir"))
+%dep_folder = [dep_folder filesep arch];
+
+if (! exist (fullfile (pkg_folder, "inst"), "dir"))
 ## Run this if the package is installed
   for ii=1:length (dirlist)
     rmpath ( [ pkg_folder filesep() dirlist{ii}])
@@ -31,8 +37,10 @@
 else
   warning("geometry:Devel","Removing path for testing.");
   for ii=1:length(dirlist)
-    rmpath ([ dirname "/inst/" dirlist{ii}])
+    rmpath ([ pkg_folder "/inst/" dirlist{ii}])
   endfor
 endif
+%rmpath (dep_folder);
 
-clear dirlist dirname pp arch pkg_folder dep_folder
+clear dirlist dirname pp arch pkg_folder
+%dep_folder

Modified: trunk/octave-forge/main/geometry/inst/io/data2geo.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/io/data2geo.m	2012-04-16 07:34:41 UTC (rev 10234)
+++ trunk/octave-forge/main/geometry/inst/io/data2geo.m	2012-04-16 08:31:15 UTC (rev 10235)
@@ -97,6 +97,7 @@
 %! ids = dc.pathid();
 %! P = dc.path2polygon(ids{1},12)(1:end-1,:);
 %! P = bsxfun(@minus, P, centroid(P));
+%! P = simplifypolygon(P,'tol',5e-1);
 %! filename = tmpnam ();
 %! meshsize = sqrt(mean(sumsq(diff(P,1,1),2)))/2;
 %! data2geo (P, meshsize, 'output', [filename '.geo']);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.