Merge pull request #64 from monarch-initiative/62-guice

[#62] moved guice modules away from core
monarch-initiative · Mar 8, 2017 · 5bba20a · 5bba20a
2 parents 6d2d4dd + b4e1308
commit 5bba20a
Show file tree

Hide file tree

Showing 38 changed files with 948 additions and 1,063 deletions.
diff --git a/owlsim-core/src/main/java/org/monarchinitiative/owlsim/compute/classmatch/ClassMatcher.java b/owlsim-core/src/main/java/org/monarchinitiative/owlsim/compute/classmatch/ClassMatcher.java
@@ -3,9 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
 
 import org.monarchinitiative.owlsim.kb.BMKnowledgeBase;
 import org.monarchinitiative.owlsim.kb.LabelMapper;
@@ -20,65 +17,57 @@
  */
 public class ClassMatcher {
 
-    BMKnowledgeBase kb;
-
-
-    @Inject
-    public ClassMatcher(BMKnowledgeBase kb) {
-        super();
-        this.kb = kb;
-    }
+	BMKnowledgeBase kb;
+
+	public ClassMatcher(BMKnowledgeBase kb) {
+		super();
+		this.kb = kb;
+	}
+
+	/**
+	 * Find best match for every class in ont1, where the best match is in ont2
+	 * 
+	 * @param qOnt
+	 * @param tOnt
+	 * @return list of matches
+	 */
+	public List<SimpleClassMatch> matchOntologies(String qOnt, String tOnt) {
+		Set<String> qids = kb.getClassIdsByOntology(qOnt);
+		Set<String> tids = kb.getClassIdsByOntology(tOnt);
+		return matchClassSets(qids, tids);
+	}
+
+	public List<SimpleClassMatch> matchClassSets(Set<String> qids, Set<String> tids) {
+		ArrayList<SimpleClassMatch> matches = new ArrayList<>();
+		for (String q : qids) {
+			matches.add(getBestMatch(q, tids));
+		}
+		return matches;
+	}
 
-    /**
-     * Find best match for every class in ont1, where the best
-     * match is in ont2
-     * 
-     * @param qOnt
-     * @param tOnt
-     * @return list of matches
-     */
-    public List<SimpleClassMatch> matchOntologies(String qOnt, String tOnt) {
-        Set<String> qids = kb.getClassIdsByOntology(qOnt);
-        Set<String> tids = kb.getClassIdsByOntology(tOnt);
-        return matchClassSets(qids, tids);
-    }
+	private SimpleClassMatch getBestMatch(String q, Set<String> tids) {
+		EWAHCompressedBitmap qbm = kb.getSuperClassesBM(q);
+		double bestEqScore = 0.0;
+		String best = null;
+		for (String t : tids) {
+			EWAHCompressedBitmap tbm = kb.getSuperClassesBM(t);
+			int numInQueryAndInTarget = qbm.andCardinality(tbm);
+			int numInQueryOrInTarget = qbm.orCardinality(tbm);
+			double eqScore = numInQueryAndInTarget / (double) numInQueryOrInTarget;
+			if (eqScore > bestEqScore) {
+				bestEqScore = eqScore;
+				best = t;
+			}
+		}
 
-    public List<SimpleClassMatch> matchClassSets(Set<String> qids,
-            Set<String> tids) {
-        ArrayList<SimpleClassMatch> matches = new ArrayList<>();
-        for (String q : qids) {
-            matches.add(getBestMatch(q, tids));
-        }
-        return matches;
-    }
+		EWAHCompressedBitmap tbm = kb.getSuperClassesBM(best);
+		int numInQueryAndInTarget = qbm.andCardinality(tbm);
+		double subClassScore = numInQueryAndInTarget / (double) qbm.cardinality();
+		double superClassScore = numInQueryAndInTarget / (double) tbm.cardinality();
 
-    private SimpleClassMatch getBestMatch(String q, Set<String> tids) {
-        EWAHCompressedBitmap qbm = kb.getSuperClassesBM(q);
-        double bestEqScore = 0.0;
-        String best = null;
-        for (String t : tids) {
-            EWAHCompressedBitmap tbm = kb.getSuperClassesBM(t);
-            int numInQueryAndInTarget = qbm.andCardinality(tbm);
-            int numInQueryOrInTarget = qbm.orCardinality(tbm);
-            double eqScore = numInQueryAndInTarget / (double) numInQueryOrInTarget;
-            if (eqScore > bestEqScore) {
-                bestEqScore = eqScore;
-                best = t;
-            }
-        }
-
-        EWAHCompressedBitmap tbm = kb.getSuperClassesBM(best);
-        int numInQueryAndInTarget = qbm.andCardinality(tbm);
-        double subClassScore = numInQueryAndInTarget / (double) qbm.cardinality();
-        double superClassScore = numInQueryAndInTarget / (double) tbm.cardinality();
-
-        LabelMapper lm = kb.getLabelMapper();
-        return new SimpleClassMatch(q, best,
-                lm.getArbitraryLabel(q),
-                lm.getArbitraryLabel(best),
-                bestEqScore,
-                subClassScore,
-                superClassScore);
-    }
+		LabelMapper lm = kb.getLabelMapper();
+		return new SimpleClassMatch(q, best, lm.getArbitraryLabel(q), lm.getArbitraryLabel(best), bestEqScore,
+				subClassScore, superClassScore);
+	}
 
 }
diff --git a/owlsim-core/src/main/java/org/monarchinitiative/owlsim/compute/classmatch/package-info.java b/owlsim-core/src/main/java/org/monarchinitiative/owlsim/compute/classmatch/package-info.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 /**
  * @author cjm
  *

diff --git a/...a/org/monarchinitiative/owlsim/compute/cpt/SimplePairwiseConditionalProbabilityIndex.java b/...a/org/monarchinitiative/owlsim/compute/cpt/SimplePairwiseConditionalProbabilityIndex.java
@@ -1,7 +1,5 @@
 package org.monarchinitiative.owlsim.compute.cpt;
 
-import java.util.Map;
-
 import org.monarchinitiative.owlsim.kb.BMKnowledgeBase;
 
 /**

diff --git a/owlsim-core/src/main/java/org/monarchinitiative/owlsim/compute/enrich/EnrichmentConfig.java b/owlsim-core/src/main/java/org/monarchinitiative/owlsim/compute/enrich/EnrichmentConfig.java
@@ -1,7 +1,5 @@
 package org.monarchinitiative.owlsim.compute.enrich;
 
-import javax.inject.Inject;
-
 public class EnrichmentConfig {
 
     public enum AnalysisType {OVER, UNDER, BOTH};

diff --git a/...java/org/monarchinitiative/owlsim/compute/enrich/impl/HypergeometricEnrichmentEngine.java b/...java/org/monarchinitiative/owlsim/compute/enrich/impl/HypergeometricEnrichmentEngine.java
@@ -6,16 +6,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
 import org.apache.commons.math3.distribution.HypergeometricDistribution;
 import org.apache.log4j.Logger;
 import org.monarchinitiative.owlsim.compute.enrich.EnrichmentConfig;
+import org.monarchinitiative.owlsim.compute.enrich.EnrichmentConfig.AnalysisType;
 import org.monarchinitiative.owlsim.compute.enrich.EnrichmentEngine;
 import org.monarchinitiative.owlsim.compute.enrich.EnrichmentQuery;
 import org.monarchinitiative.owlsim.compute.enrich.EnrichmentResult;
 import org.monarchinitiative.owlsim.compute.enrich.EnrichmentResultSet;
-import org.monarchinitiative.owlsim.compute.enrich.EnrichmentConfig.AnalysisType;
 import org.monarchinitiative.owlsim.kb.BMKnowledgeBase;
 import org.monarchinitiative.owlsim.kb.ewah.EWAHUtils;
 import org.monarchinitiative.owlsim.kb.filter.Filter;
@@ -44,7 +42,6 @@ public class HypergeometricEnrichmentEngine implements EnrichmentEngine {
 
     protected EnrichmentConfig enrichmentConfig = new EnrichmentConfig();
 
-    @Inject
     public HypergeometricEnrichmentEngine(BMKnowledgeBase kb) {
         super();
         this.kb = kb;