From 1c3f30bb99789adc9a380d9b5379f45bcfb7fe43 Mon Sep 17 00:00:00 2001 From: JimmyBoivie Date: Mon, 7 Dec 2015 19:08:44 -0500 Subject: [PATCH] Removing System.out --- main/DrawHalfEdge.pde | 8 ++++---- main/Face.pde | 10 +++++----- main/HalfEdge.pde | 16 ++++++++++------ main/Point.pde | 2 +- main/main.pde | 8 ++++---- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/main/DrawHalfEdge.pde b/main/DrawHalfEdge.pde index 739a80f..67c80c2 100644 --- a/main/DrawHalfEdge.pde +++ b/main/DrawHalfEdge.pde @@ -1,7 +1,7 @@ public class DrawHalfEdge { public void drawline(Point v1, Point v2) { - //System.out.println(v1 + " " + v2); + ////System.out.println(v1 + " " + v2); line(v1.getX(), v1.getY(), v2.getX(), v2.getY()); } public void drawpoint(Point v) { @@ -18,17 +18,17 @@ public class DrawHalfEdge { public void drawConnectedGraph(Point p) { ArrayList edges = p.getLeaving(); drawpoint(p); - //System.out.println(p); + ////System.out.println(p); if(edges != null) { for(HalfEdge edge: edges) { - //System.out.println(edge); + ////System.out.println(edge); drawConnection(edge); } } } public void drawConnection(HalfEdge edge) { - //System.out.println("drawing connection"); + ////System.out.println("drawing connection"); Point v2 = edge.getOrigin(); Point v1 = edge.gettwin().getOrigin(); drawline(v1, v2); diff --git a/main/Face.pde b/main/Face.pde index 17708db..a454c01 100644 --- a/main/Face.pde +++ b/main/Face.pde @@ -10,16 +10,16 @@ public class Face { } public void printFace() { - System.out.println("Outer Face:"); + //System.out.println("Outer Face:"); if (outerComponent != null) { outerComponent.printRNext(); } - System.out.println(); - System.out.println("Inner Components:"); + //System.out.println(); + //System.out.println("Inner Components:"); int num = innerComponents.size(); for (int i = 0; i < num; i++) { - System.out.println("COMPONENT[" + i + "]"); + //System.out.println("COMPONENT[" + i + "]"); innerComponents.get(i).printRNext(); } - System.out.println(); + //System.out.println(); } } diff --git a/main/HalfEdge.pde b/main/HalfEdge.pde index 97eebed..4cbf2ff 100644 --- a/main/HalfEdge.pde +++ b/main/HalfEdge.pde @@ -18,6 +18,7 @@ public class HalfEdge { p.setRef(null); q.setRef(null); state = 0; + console.log("CLASS0"); } else if (p.count() == 1) { p.setRef(null); q.setRef(twin.getAnotherLeaving()); @@ -26,6 +27,7 @@ public class HalfEdge { // NOTHING SPECIAL MUST BE DONE // Make Sure face is not represented by dissapearing edge state = 1; + console.log("CLASS1A"); } else if (q.count() == 1) { p.setRef(this.getAnotherLeaving()); q.setRef(null); @@ -34,6 +36,7 @@ public class HalfEdge { // NOTHING SPECIAL MUST BE DONE // Make sure face is not represented by dissapearing edge state = 1; + console.log("CLASS1B"); } else { int expected = p.count() - 2; p.setRef(this.getAnotherLeaving()); @@ -42,6 +45,7 @@ public class HalfEdge { twin.getprevious().setnext(this.getnext()); this.getprevious().setnext(twin.getnext()); twin.getnext().setprevious(this.getprevious()); + console.log("CLASS23"); if (p.count() == expected) { // was not broken faces merge! // @@ -248,13 +252,13 @@ public class HalfEdge { } public void printFace() { HalfEdge temp = next; - System.out.println("PrintFaceBegin"); - System.out.println(origin + " " + twin.getOrigin()); + ////System.out.println("PrintFaceBegin"); + ////System.out.println(origin + " " + twin.getOrigin()); while (temp != this) { - System.out.println(temp.getOrigin() + " " + temp.gettwin().getOrigin()); + ////System.out.println(temp.getOrigin() + " " + temp.gettwin().getOrigin()); temp = temp.getnext(); } - System.out.println(); + ////System.out.println(); } private boolean isReachable(HalfEdge h) { @@ -367,10 +371,10 @@ public class HalfEdge { } public void printRNext() { - System.out.println(" " + origin); + ////System.out.println(" " + origin); HalfEdge temp = next; while (temp != this) { - System.out.println(" " + temp.getOrigin()); + //System.out.println(" " + temp.getOrigin()); temp = temp.getnext(); } } diff --git a/main/Point.pde b/main/Point.pde index ba5aa9e..2d10ac5 100644 --- a/main/Point.pde +++ b/main/Point.pde @@ -56,7 +56,7 @@ public class Point { public void deleteEdges() { while(ref != null) { - System.out.println("REMOVING EDGE " + ref.getOrigin() + " " + ref.gettwin().getOrigin()); + //System.out.println("REMOVING EDGE " + ref.getOrigin() + " " + ref.gettwin().getOrigin()); ref.Remove(); } diff --git a/main/main.pde b/main/main.pde index 5259954..090fe19 100644 --- a/main/main.pde +++ b/main/main.pde @@ -67,13 +67,13 @@ public void setup() { //h1.printFace(); //float f = CompGeo.signedArea(h1.gettwin()); //float f2 = CompGeo.signedArea(h1); - //System.out.println("Signed Area: " + f); - //System.out.println("Signed Area: " + f2); + ////System.out.println("Signed Area: " + f); + ////System.out.println("Signed Area: " + f2); //h1.gettwin().printFace(); //h1.printFace(); //if (CompGeo.inside(h1.gettwin(), p6, p7)) { - // System.out.println("INSIDE"); - //} else { System.out.println("OUTSIDE"); } + // //System.out.println("INSIDE"); + //} else { //System.out.println("OUTSIDE"); } //HalfEdge h5 = new HalfEdge(p5, p2); //h5.gettwin().printFace(); //h5.printFace();