[Ptinpoly-commits] r32 - in pkg: . src

[noreply at r-forge.r-project.org]

Author: jmaisog
Date: 2020-05-16 17:48:58 +0200 (Sat, 16 May 2020)
New Revision: 32

Modified:
   pkg/DESCRIPTION
   pkg/src/pinpolyhedronA.cc
Log:


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2014-08-27 01:25:50 UTC (rev 31)
+++ pkg/DESCRIPTION	2020-05-16 15:48:58 UTC (rev 32)
@@ -1,7 +1,7 @@
 Package: ptinpoly
 Title: Point-In-Polyhedron Test (2D and 3D)
-Version: 2.4
-Date: 2014-17-03
+Version: 2.5
+Date: 2020-16-05
 Author: Jose M. Maisog, Yuan Wang, George Luta, Jianfei Liu
 Maintainer: Jose M. Maisog <bravas02 at gmail.com>
 Description: Function 'pip3d' tests whether a point in 3D space is

Modified: pkg/src/pinpolyhedronA.cc
===================================================================
--- pkg/src/pinpolyhedronA.cc	2014-08-27 01:25:50 UTC (rev 31)
+++ pkg/src/pinpolyhedronA.cc	2020-05-16 15:48:58 UTC (rev 32)
@@ -590,8 +590,8 @@
 		vec_2p(pv,vertcoord[nbverts[i]],pvpi);
 		vec_uni(pvpi);
 		if((dp=vec_dotp(pvpi,pvp))>maxcosa){
-			if(dp>epscoplanar)
-				dp=dp;
+//			if(dp>epscoplanar)
+//				dp=dp;
 			maxcosa=dp;
 			vridge=nbverts[i];
 		}
@@ -1762,8 +1762,8 @@
 	for(int i=0 ;i<numvert; i++){
 		int vf=seg2end[v2seg[i][0]][0];
 		int vb=seg2end[v2seg[i][1]][1];
-		if(i==11821) 
-			i=i;
+//		if(i==11821) 
+//			i=i;
 		vertattrib[i]=-convexityOf3Point(vert[vf],vert[i],vert[vb],epscoplanar);
 	}
 }