Delete unnecessary toString() and add hashCode for efficiency.

fcyu · Nov 1, 2017 · c015c25 · c015c25
1 parent d368f5e
commit c015c25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/src/main/java/proteomics/Types/ChainEntry.java b/src/main/java/proteomics/Types/ChainEntry.java
@@ -10,7 +10,6 @@ public class ChainEntry {
     public final boolean n_term;
     public final boolean c_term;
     public final int binaryModType;
-    private final String toString;
 
     public ChainEntry(String seq, float chain_mass, Set<Short> link_site_set, boolean n_term, boolean c_term, int binaryModType) {
         this.seq = seq;
@@ -19,7 +18,6 @@ public ChainEntry(String seq, float chain_mass, Set<Short> link_site_set, boolea
         this.n_term = n_term;
         this.c_term = c_term;
         this.binaryModType = binaryModType;
-        toString = seq + "-" + binaryModType;
     }
 
     @Override
@@ -31,8 +29,4 @@ public boolean equals(Object other) {
             return false;
         }
     }
-
-    public String toString() {
-        return toString;
-    }
 }
diff --git a/src/main/java/proteomics/Types/SpectrumEntry.java b/src/main/java/proteomics/Types/SpectrumEntry.java
@@ -12,7 +12,6 @@ public class SpectrumEntry {
     public final int precursor_charge;
     public final String mgfTitle;
     public Map<Double, Double> originalPlMap;
-    private final String to_string;
 
     public SpectrumEntry(int scan_num, String spectrum_id, float precursor_mz, float precursor_mass, int precursor_charge, float rt, Map<Double, Double> originalPlMap, float linker_mass, String mgfTitle) {
         this.scan_num = scan_num;
@@ -24,11 +23,6 @@ public SpectrumEntry(int scan_num, String spectrum_id, float precursor_mz, float
         this.rt = rt;
         this.mgfTitle = mgfTitle;
         this.originalPlMap = originalPlMap;
-        to_string = this.scan_num + "(charge=" + precursor_charge + ",mass=" + precursor_mass + ",peakNum=" + originalPlMap.size() + ")";
-    }
-
-    public String toString() {
-        return to_string;
     }
 
     public int hashCode() {

diff --git a/src/main/java/proteomics/Types/VarModParam.java b/src/main/java/proteomics/Types/VarModParam.java
@@ -5,20 +5,22 @@ public class VarModParam {
 
     public final float modMass;
     public final char aa;
-    public final String toString;
+    private final String toString;
+    private final int hashCode;
 
     public VarModParam(float modMass, char aa) {
         this.modMass = modMass;
         this.aa = aa;
         toString = modMass + "@" + aa;
+        hashCode = toString.hashCode();
     }
 
     public String toString() {
         return toString;
     }
 
     public int hashCode() {
-        return toString.hashCode();
+        return hashCode;
     }
 
     public boolean equals(Object other) {

diff --git a/src/main/java/proteomics/Types/VarSequence.java b/src/main/java/proteomics/Types/VarSequence.java
@@ -7,12 +7,14 @@ public class VarSequence {
     public final short linkSite;
     public final int binaryModType;
     private final String toString;
+    private final int hashCode;
 
     public VarSequence(String seq, short linkSite, int binaryModType) {
         this.seq = seq;
         this.linkSite = linkSite;
         this.binaryModType = binaryModType;
         toString = seq + "-" + linkSite + "-" + binaryModType;
+        hashCode = toString.hashCode();
     }
 
     public boolean equals(Object other) {
@@ -29,6 +31,6 @@ public String toString() {
     }
 
     public int hashCode() {
-        return toString.hashCode();
+        return hashCode;
     }
 }