From: <raj...@us...> - 2006-06-10 15:37:51
|
Revision: 6421 Author: rajarshi Date: 2006-06-10 08:37:46 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/cdk/?rev=6421&view=rev Log Message: ----------- Updated code to fix some PMD unused warnings Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycle.java trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis.java Modified: trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycle.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycle.java 2006-06-10 15:34:12 UTC (rev 6420) +++ trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycle.java 2006-06-10 15:37:46 UTC (rev 6421) @@ -28,18 +28,12 @@ */ package org.openscience.cdk.ringsearch.cyclebasis; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - import org._3pq.jgrapht.Edge; -import org._3pq.jgrapht.Graph; import org._3pq.jgrapht.UndirectedGraph; import org._3pq.jgrapht.graph.UndirectedSubgraph; +import java.util.*; + /** * A cycle in a graph. * A cycle in a graph G is a subgraph in which every vertex has even degree. @@ -76,10 +70,10 @@ * @param edges the edges of the cycle */ public SimpleCycle (UndirectedGraph g, Set edges) { - super(g, inducedVertices(g, edges), edges); + super(g, inducedVertices(edges), edges); } - static private Set inducedVertices(Graph g, Set edges) { + static private Set inducedVertices(Set edges) { Set inducedVertices = new HashSet(); for (Iterator i = edges.iterator(); i.hasNext();) { Edge edge = (Edge) i.next(); Modified: trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis.java 2006-06-10 15:34:12 UTC (rev 6420) +++ trunk/cdk/src/org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis.java 2006-06-10 15:37:46 UTC (rev 6421) @@ -28,19 +28,6 @@ */ package org.openscience.cdk.ringsearch.cyclebasis; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Vector; - import org._3pq.jgrapht.DirectedGraph; import org._3pq.jgrapht.Edge; import org._3pq.jgrapht.Graph; @@ -52,6 +39,8 @@ import org.openscience.cdk.graph.BFSShortestPath; import org.openscience.cdk.graph.MinimalPathIterator; +import java.util.*; + /** * Auxiliary class for <code>CycleBasis</code>. * @@ -299,7 +288,7 @@ boolean[] u = constructKernelVector(edgeList.size(), a, i); // Construct auxiliary graph gu - AuxiliaryGraph gu = new AuxiliaryGraph(graph, edgeList, u); + AuxiliaryGraph gu = new AuxiliaryGraph(graph, u); SimpleCycle shortestCycle = (SimpleCycle) cycles.get(i); @@ -503,7 +492,7 @@ } // Construct kernel vector u from a column of the inverse of a - AuxiliaryGraph gu = new AuxiliaryGraph(graph, edgeList, u); + AuxiliaryGraph gu = new AuxiliaryGraph(graph, u); boolean isEssential = true; @@ -589,7 +578,7 @@ } // Construct auxiliary graph gu - AuxiliaryGraph gu = new AuxiliaryGraph(graph, edgeList, u); + AuxiliaryGraph gu = new AuxiliaryGraph(graph, u); Iterator vertexIterator = graph.vertexSet().iterator(); while (vertexIterator.hasNext()) { @@ -849,7 +838,7 @@ Graph g; boolean[] u; - AuxiliaryGraph(Graph graph, List edgeList, boolean[] u) { + AuxiliaryGraph(Graph graph, boolean[] u) { g = graph; this.u = u; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |