From 413a41247e6b75b8a48d49fa8d1c331069da1fd1 Mon Sep 17 00:00:00 2001 From: Stefan Sechelmann Date: Mon, 26 Feb 2018 12:51:51 +0100 Subject: [PATCH] resolve warnings --- .../QuasiisothermicUtility.java | 1 + .../discreteconformal/util/PathUtility.java | 82 +++++++++---------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/de/varylab/discreteconformal/unwrapper/quasiisothermic/QuasiisothermicUtility.java b/src/de/varylab/discreteconformal/unwrapper/quasiisothermic/QuasiisothermicUtility.java index 3ba5868..86158a1 100644 --- a/src/de/varylab/discreteconformal/unwrapper/quasiisothermic/QuasiisothermicUtility.java +++ b/src/de/varylab/discreteconformal/unwrapper/quasiisothermic/QuasiisothermicUtility.java @@ -71,6 +71,7 @@ public OppositeAnglesAdapter(Map betaMap) { this.angleMap = betaMap; } + @SuppressWarnings("unlikely-arg-type") @Override public < VV extends Vertex, diff --git a/src/de/varylab/discreteconformal/util/PathUtility.java b/src/de/varylab/discreteconformal/util/PathUtility.java index 16661b8..84dcd19 100755 --- a/src/de/varylab/discreteconformal/util/PathUtility.java +++ b/src/de/varylab/discreteconformal/util/PathUtility.java @@ -4,12 +4,10 @@ import java.util.HashSet; import java.util.Set; -import java.util.Stack; import java.util.TreeSet; import de.jtem.halfedge.Edge; import de.jtem.halfedge.Face; -import de.jtem.halfedge.HalfEdgeDataStructure; import de.jtem.halfedge.Vertex; import de.varylab.discreteconformal.util.Search.WeightAdapter; @@ -159,46 +157,46 @@ > boolean isCycleSimple(Set cycle) { - /** - * Checks whether a cycle is essential - * TODO This is not ready yet! - * @param - * @param - * @param - * @param cycle must be a cycle of consistently oriented half-edges - * @return - */ - public static < - V extends Vertex, - E extends Edge, - F extends Face - > boolean isCycleEssential(Set cycle) { - if (cycle.size() == 0) { - return false; - } - if (!isCycleSimple(cycle)) { - return false; - } - E seed = cycle.iterator().next(); - V startLeft = seed.getNextEdge().getTargetVertex(); - V startRight = seed.getOppositeEdge().getNextEdge().getTargetVertex(); - Set leftVisited = new HashSet(); - Set rightVisited = new HashSet(); - Stack leftPath = new Stack(); - Stack rightPath = new Stack(); - leftPath.push(startLeft); - rightPath.push(startRight); - leftVisited.add(startLeft); - rightVisited.add(startRight); - - HalfEdgeDataStructure hds = startLeft.getHalfEdgeDataStructure(); - Set validVertices = new HashSet(hds.getVertices()); - validVertices.removeAll(cycle); - - - - return false; - } +// /** +// * Checks whether a cycle is essential +// * TODO This is not ready yet! +// * @param +// * @param +// * @param +// * @param cycle must be a cycle of consistently oriented half-edges +// * @return +// */ +// public static < +// V extends Vertex, +// E extends Edge, +// F extends Face +// > boolean isCycleEssential(Set cycle) { +// if (cycle.size() == 0) { +// return false; +// } +// if (!isCycleSimple(cycle)) { +// return false; +// } +// E seed = cycle.iterator().next(); +// V startLeft = seed.getNextEdge().getTargetVertex(); +// V startRight = seed.getOppositeEdge().getNextEdge().getTargetVertex(); +// Set leftVisited = new HashSet(); +// Set rightVisited = new HashSet(); +// Stack leftPath = new Stack(); +// Stack rightPath = new Stack(); +// leftPath.push(startLeft); +// rightPath.push(startRight); +// leftVisited.add(startLeft); +// rightVisited.add(startRight); +// +// HalfEdgeDataStructure hds = startLeft.getHalfEdgeDataStructure(); +// Set validVertices = new HashSet(hds.getVertices()); +// validVertices.removeAll(cycle); +// +// +// +// return false; +// } }