Merge pull request #6 from PankratzLab/headerSearch

jlanej · web-flow · commit 3a4c0cf1eb2b · 2021-11-01T15:27:47.000-05:00
MatchMaker: search for strings that equal rather than contain factorName
diff --git a/src/main/java/org/pankratzlab/internal/gwas/MatchMaker.java b/src/main/java/org/pankratzlab/internal/gwas/MatchMaker.java
@@ -195,7 +195,7 @@ public static HashMap<Integer, Double> getNumericColumnsForClustering(Path sampl
       String[] header = origSamplesFile.readLine().trim().split(PSF.Regex.GREEDY_WHITESPACE);
       for (int i = 0; i < numericFactorNames.size(); i++) {
         for (int j = 0; j < header.length; j++) {
-          if (header[j].contains(numericFactorNames.get(i))) {
+          if (header[j].equals(numericFactorNames.get(i))) {
             columnsToUse.put(j, doubleLoadings.get(i));
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public static HashMap<Integer, Double> getNumericColumnsForClustering(Path sampl`
`195`	`195`	`String[] header = origSamplesFile.readLine().trim().split(PSF.Regex.GREEDY_WHITESPACE);`
`196`	`196`	`for (int i = 0; i < numericFactorNames.size(); i++) {`
`197`	`197`	`for (int j = 0; j < header.length; j++) {`
`198`		`- if (header[j].contains(numericFactorNames.get(i))) {`
	`198`	`+ if (header[j].equals(numericFactorNames.get(i))) {`
`199`	`199`	`columnsToUse.put(j, doubleLoadings.get(i));`
`200`	`200`	`}`
`201`	`201`	`}`