Make sure the Union operation produces exactly the same point from the

standard and single operation

Author: madhephaestus

src/main/java/eu/mihosoft/vrl/v3d/CSG.java

@@ -877,13 +877,13 @@ public CSG dumbUnion(CSG csg) {
 	 */
 	public CSG union(List<CSG> csgs) {
 			if (CSGClient.isRunning()) {
-				ArrayList<CSG> go = new ArrayList<CSG>(csgs);
+				ArrayList<CSG> go = new ArrayList<CSG>();
 				go.add(this);
+				go.addAll(csgs);
 				try {
 					return CSGClient.getClient().union(go).get(0);
 				} catch (Exception e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
+					throw new RuntimeException(e);
 				}
 			}
 		CSG result = this;

src/main/java/eu/mihosoft/vrl/v3d/CSGClient.java

@@ -141,12 +141,8 @@ private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation op
 
 			ArrayList <CSG> toSend  =  new ArrayList<CSG>();
 			for(CSG c:csgList) {
-				CSG tmp = c.clone();
-				tmp.setStorage(new PropertyStorage());
-				tmp.setManipulator(null);
-				tmp.setManufacturing(null);
-				tmp.getMapOfparametrics().clear();
-				tmp.setRegenerate(null);
+				CSG tmp = CSG.fromPolygons(c.getPolygons());
+				tmp.setOptType(c.getOptType());
 				toSend.add(tmp);
 			}
 			CSGRequest request = new CSGRequest(toSend, operation,points,storage);

src/main/java/eu/mihosoft/vrl/v3d/CSGServerHandler.java

@@ -107,8 +107,10 @@ private CSGResponse processCSGRequest(CSGRequest request) {
 					back.add(c.triangulate(true));
 				break;
 			case UNION:
-				CSG d = csgList.remove(0);
-				back.add(d.union(csgList));
+				if(csgList.size()==2) {
+					back.add(csgList.get(0).union(csgList.get(1)));
+				}else
+					back.add(CSG.unionAll(csgList));
 				break;
 			case minkowskiHullShape:
 				CSG m1 = csgList.remove(0);

src/test/java/eu/mihosoft/vrl/v3d/ServerClientTest.java

@@ -54,7 +54,7 @@ public CSG prep(CSG incoming) {
 			CSG c = new Cube(10, 10, 10).toCSG();
 			c.getBounds();
 
-			CSG u1 = CSG.unionAll(a, b, c);
+			CSG u1 = a.union( b,c);
 			CSG d1 = a.difference(b);
 			CSG t1 = d1.clone().triangulate(true);
 			ArrayList<CSG> m1 = a.minkowskiHullShape(b);
@@ -66,26 +66,29 @@ public CSG prep(CSG incoming) {
 			// Connect to server
 			System.out.println("Client info: " + CSGClient.getClient().getServerInfo());
 
-			CSG u = CSG.unionAll(a, b, c);
-			if(u.getPolygons().size()!=u1.getPolygons().size())
+			CSG u =a.union( b,c);
+			if(testPoly(u1,u))
 				fail();
+			
 			CSG d = a.difference(b);
-			if(d.getPolygons().size()!=d1.getPolygons().size())
+			if(testPoly(d1,d))
 				fail("Difference Step fail , expected "+d1.getPolygons().size()+" got "+d.getPolygons().size());
 			CSG t = d.clone().triangulate(true);
-			if(t.getPolygons().size()!=t1.getPolygons().size())
+			if(testPoly(t1,t))
 				fail();
 			ArrayList<CSG> m = a.minkowskiHullShape(b);
 			if(m.size()!=m1.size()) {
 				fail();
 			}
 			for(int i=0;i<m.size();i++) {
-				if(m.get(i).getPolygons().size()!=m1.get(i).getPolygons().size()) {
+				if(testPoly(
+						m1.get(i),m.get(i)
+						)) {
 					fail();
 				}
 			}
 			CSG h = u1.hull();
-			if(h.getPolygons().size()!=h1.getPolygons().size())
+			if(testPoly(h,h1))
 				fail();
 			CSGClient.close();
 		} catch (Exception e) {
@@ -99,5 +102,34 @@ public CSG prep(CSG incoming) {
 		serverThread.join();
 		System.out.println("\nClient example completed.");
 	}
+	
+	boolean testPoly(CSG p1, CSG p2) {
+		int size1 = p1.getPolygons().size();
+		int size2 = p2.getPolygons().size();
+		if(size1!=size2) {
+			System.err.println("Mismatched number of polygons expected "+size1+" but got "+size2);
+			return true;
+		}
+		for(int i=0;i<size1;i++) {
+			Polygon poly1 = p1.getPolygons().get(i);
+			Polygon poly2 = p2.getPolygons().get(i);
+			int size = poly1.getPoints().size();
+			if(size!=poly2.getPoints().size()) {
+				System.err.println("Number of Points mismatch ");
+				return true;
+			}
+			for(int j=0;j<size;j++) {
+				Vector3d vector3d = poly1.getPoints().get(j);
+				Vector3d obj = poly2.getPoints().get(j);
+				if(!vector3d.test(obj, 0.000001)) {
+					System.err.println("Point distance "+vector3d.distance(obj));
+					return true;
+				}else {
+					//System.out.println("Point match ");
+				}
+			}
+		}
+		return false;
+	}
 
 }