Strains and experiment bug fixed.

antalbalint · Dec 15, 2015 · d7c8ae7 · d7c8ae7
1 parent b8cd35f
commit d7c8ae7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/org/mineotaur/importer/DatabaseGeneratorFromOmero.java b/src/main/java/org/mineotaur/importer/DatabaseGeneratorFromOmero.java
@@ -385,7 +385,8 @@ else if ("reference".equals(colName) || "name".equals(colName) || "alternativeNa
         for (int i = 0; i < cols.length; i++) {
             columnsToRead[i] = i;
         }
-
+        Map<Long, Node> images = new HashMap<>();
+        Map<String, Node> strains = new HashMap<>();
         for (int currentBatch = 0; currentBatch < tableLength; currentBatch += rowsToFetch) {
 
             int batchSize = Math.min(rowsToFetch, tableLength - currentBatch);
@@ -396,12 +397,11 @@ else if ("reference".equals(colName) || "name".equals(colName) || "alternativeNa
             table = entry.sharedResources().openTable(file);
             Data data = table.slice(columnsToRead, rowSubset); // read the data.
             cols = data.columns;
-            Map<Long, Node> images = new HashMap<>();
-            Map<String, Node> strains = new HashMap<>();
+
             String[] strainColumn = ((StringColumn) cols[strainID]).values;
             long[] experimentColumn = ((ImageColumn) cols[experimentID]).values;
             double[][] descriptiveColumn = ((DoubleArrayColumn) cols[descriptiveID]).values;
-            double[] filterColumn = descriptiveColumn[filter];
+//            double[] filterColumn = descriptiveColumn[filter];
             if (!filterProps.contains(descriptiveHeader[filter])) {
                 filterProps.add(descriptiveHeader[filter]);
             }
@@ -450,7 +450,7 @@ else if ("reference".equals(colName) || "name".equals(colName) || "alternativeNa
                     }
 
                 }
-
+            Mineotaur.LOGGER.info("Number of strains: " + String.valueOf(strains.size()));
 
             } finally {
                 tx.success();