Expected HashSet size

johnmay · egonw · commit b62c970ca552 · 2022-01-01T11:32:07.000+01:00
diff --git a/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/UniqueAtomMatches.java b/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/UniqueAtomMatches.java
@@ -24,9 +24,8 @@
 
 package org.openscience.cdk.isomorphism;
 
-import com.google.common.collect.Sets;
-
 import java.util.BitSet;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Predicate;
 
@@ -56,7 +55,7 @@ final class UniqueAtomMatches implements Predicate<int[]> {
      * @param expectedHits expected number of unique matches
      */
     private UniqueAtomMatches(int expectedHits) {
-        this.unique = Sets.newHashSetWithExpectedSize(expectedHits);
+        this.unique = new HashSet<>(2*expectedHits);
     }
 
     /**
diff --git a/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/UniqueBondMatches.java b/base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/UniqueBondMatches.java
@@ -24,8 +24,6 @@
 
 package org.openscience.cdk.isomorphism;
 
-import com.google.common.collect.Sets;
-
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -59,7 +57,7 @@ final class UniqueBondMatches implements Predicate<int[]> {
      * @param expectedHits expected number of unique matches
      */
     private UniqueBondMatches(int[][] g, int expectedHits) {
-        this.unique = Sets.newHashSetWithExpectedSize(expectedHits);
+        this.unique = new HashSet<>(2*expectedHits);
         this.g = g;
     }
 
diff --git a/base/standard/src/main/java/org/openscience/cdk/aromaticity/Aromaticity.java b/base/standard/src/main/java/org/openscience/cdk/aromaticity/Aromaticity.java
@@ -24,7 +24,6 @@
 
 package org.openscience.cdk.aromaticity;
 
-import com.google.common.collect.Sets;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.graph.CycleFinder;
 import org.openscience.cdk.graph.Cycles;
@@ -35,6 +34,7 @@
 import org.openscience.cdk.ringsearch.RingSearch;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
@@ -186,7 +186,7 @@ public Set<IBond> findBonds(IAtomContainer molecule) throws CDKException {
         final RingSearch ringSearch = new RingSearch(molecule, graph);
         final int[] electrons = model.contribution(molecule, ringSearch);
 
-        final Set<IBond> bonds = Sets.newHashSetWithExpectedSize(molecule.getBondCount());
+        final Set<IBond> bonds = new HashSet<>(2*molecule.getBondCount());
 
         // obtain the subset of electron contributions which are >= 0 (i.e.
         // allowed to be aromatic) - we then find the cycles in this subgraph
diff --git a/legacy/src/main/java/org/openscience/cdk/smiles/smarts/SMARTSQueryTool.java b/legacy/src/main/java/org/openscience/cdk/smiles/smarts/SMARTSQueryTool.java
@@ -19,7 +19,6 @@
 package org.openscience.cdk.smiles.smarts;
 
 import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
 import org.openscience.cdk.aromaticity.Aromaticity;
 import org.openscience.cdk.aromaticity.ElectronDonation;
@@ -43,6 +42,7 @@
 
 import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -406,7 +406,7 @@ public List<List<Integer>> getMatchingAtoms() {
      */
     public List<List<Integer>> getUniqueMatchingAtoms() {
         List<List<Integer>> matched = new ArrayList<List<Integer>>(mappings.size());
-        Set<BitSet> atomSets = Sets.newHashSetWithExpectedSize(mappings.size());
+        Set<BitSet> atomSets = new HashSet<>(2*mappings.size());
         for (int[] mapping : mappings) {
             BitSet atomSet = new BitSet();
             for (int x : mapping)
