Merge pull request #107 from ProgrammingLife3/fix/removeUnusedHashableCollection

Removed HashableCollection

Author: Tom Brouws

src/main/java/tudelft/ti2806/pl3/data/wrapper/util/HorizontalWrapUtil.java

@@ -7,11 +7,11 @@
 import tudelft.ti2806.pl3.data.wrapper.VerticalWrapper;
 import tudelft.ti2806.pl3.data.wrapper.WrappedGraphData;
 import tudelft.ti2806.pl3.data.wrapper.Wrapper;
-import tudelft.ti2806.pl3.util.HashableCollection;
 import tudelft.ti2806.pl3.util.Pair;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -160,7 +160,7 @@ static List<List<Wrapper>> findCombineableNodes(List<Wrapper> nodes) {
 				List<Wrapper> foundGroup = new ArrayList<>();
 				foundGroup.add(startNode);
 
-				HashableCollection<Genome> genome = new HashableCollection<>(startNode.getGenome());
+				HashSet<Genome> genome = (HashSet<Genome>) startNode.getGenome();
 				combineRight(startNode, foundGroup, genome);
 				combineLeft(startNode, foundGroup, genome);
 
@@ -187,12 +187,11 @@ static List<List<Wrapper>> findCombineableNodes(List<Wrapper> nodes) {
 	 *            a set of genomes which should be equal for each found node
 	 */
 	private static void combineRight(Wrapper startNode, List<Wrapper> foundGroup,
-			HashableCollection<Genome> genome) {
+			HashSet<Genome> genome) {
 		Wrapper node = startNode;
 		while (node.getOutgoing().size() == 1
 				&& node.getOutgoing().get(0).getIncoming().size() == 1
-				&& genome.equals(new HashableCollection<>(node.getOutgoing()
-						.get(0).getGenome()))) {
+				&& genome.equals(node.getOutgoing().get(0).getGenome())) {
 			node = node.getOutgoing().get(0);
 			foundGroup.add(node);
 		}
@@ -209,12 +208,11 @@ private static void combineRight(Wrapper startNode, List<Wrapper> foundGroup,
 	 *            a set of genomes which should be equal for each found node
 	 */
 	private static void combineLeft(Wrapper startNode, List<Wrapper> foundGroup,
-			HashableCollection<Genome> genome) {
+			HashSet<Genome> genome) {
 		Wrapper node = startNode;
 		while (node.getIncoming().size() == 1
 				&& node.getIncoming().get(0).getOutgoing().size() == 1
-				&& genome.equals(new HashableCollection<>(node.getIncoming()
-						.get(0).getGenome()))) {
+				&& genome.equals(node.getIncoming().get(0).getGenome())) {
 			node = node.getIncoming().get(0);
 			foundGroup.add(0, node);
 		}

src/main/java/tudelft/ti2806/pl3/data/wrapper/util/SpaceWrapUtil.java

@@ -6,7 +6,6 @@
 import tudelft.ti2806.pl3.data.wrapper.WrappedGraphData;
 import tudelft.ti2806.pl3.data.wrapper.Wrapper;
 import tudelft.ti2806.pl3.exception.DuplicateGenomeNameException;
-import tudelft.ti2806.pl3.util.HashableCollection;
 import tudelft.ti2806.pl3.util.Pair;
 
 import java.util.ArrayList;
@@ -195,7 +194,7 @@ private static List<Pair<Integer, Pair<Wrapper, Wrapper>>> computeAllCandidates(
 	 * @return a collection of buckets
 	 */
 	private static Collection<Pair<Set<Genome>, List<Wrapper>>> getNodesByGenome(List<Wrapper> nodes) {
-		Map<HashableCollection<Genome>, Pair<Set<Genome>, List<Wrapper>>> searchMap = new HashMap<>();
+		Map<Set<Genome>, Pair<Set<Genome>, List<Wrapper>>> searchMap = new HashMap<>();
 		for (Wrapper node : nodes) {
 			Set<Genome> genome = node.getGenome();
 			/*
@@ -204,10 +203,10 @@ private static Collection<Pair<Set<Genome>, List<Wrapper>>> getNodesByGenome(Lis
 			if (genome.size() <= 1) {
 				continue;
 			}
-			Pair<Set<Genome>, List<Wrapper>> pair = searchMap.get(new HashableCollection<>(genome));
+			Pair<Set<Genome>, List<Wrapper>> pair = searchMap.get(genome);
 			if (pair == null) {
 				pair = new Pair<>(genome, new ArrayList<>());
-				searchMap.put(new HashableCollection<>(genome), pair);
+				searchMap.put(genome, pair);
 			}
 			pair.getSecond().add(node);
 		}

src/main/java/tudelft/ti2806/pl3/data/wrapper/util/VerticalWrapUtil.java

@@ -5,7 +5,6 @@
 import tudelft.ti2806.pl3.data.wrapper.VerticalWrapper;
 import tudelft.ti2806.pl3.data.wrapper.WrappedGraphData;
 import tudelft.ti2806.pl3.data.wrapper.Wrapper;
-import tudelft.ti2806.pl3.util.HashableCollection;
 import tudelft.ti2806.pl3.util.Pair;
 
 import java.util.ArrayList;
@@ -95,15 +94,13 @@ private static List<CombineWrapper> generateCombinedNodes(List<Wrapper> nodes,
 	 * @return a list of edges which could be combined
 	 */
 	static List<List<Wrapper>> findCombineableNodes(List<Wrapper> nodes) {
-		Map<Pair<HashableCollection<Wrapper>, HashableCollection<Wrapper>>,List<Wrapper>> map
+		Map<Pair<List<Wrapper>, List<Wrapper>>,List<Wrapper>> map
 			= new HashMap<>();
 		for (Wrapper node : nodes) {
-			List<Wrapper> list = map.get(new Pair<>(new HashableCollection<>(node.getIncoming()),
-					new HashableCollection<>(node.getOutgoing())));
+			List<Wrapper> list = map.get(new Pair<>(node.getIncoming(), node.getOutgoing()));
 			if (list == null) {
 				list = new ArrayList<>();
-				map.put(new Pair<>(new HashableCollection<>(node.getIncoming()),
-						new HashableCollection<>(node.getOutgoing())), list);
+				map.put(new Pair<>(node.getIncoming(), node.getOutgoing()), list);
 			}
 			list.add(node);
 		}