added remaining time estimate to loadSMILESFile

(also chagned to update for every ten molecules instead of 100. Converting SMILES is not a quick thing...)
bioclipse · Apr 27, 2012 · f19802f · f19802f
1 parent 4327ae8
commit f19802f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java b/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java
@@ -52,6 +52,7 @@
 import net.bioclipse.core.domain.RecordableList;
 import net.bioclipse.core.domain.SMILESMolecule;
 import net.bioclipse.core.util.LogUtils;
+import net.bioclipse.core.util.TimeCalculator;
 import net.bioclipse.jobs.IReturner;
 import net.bioclipse.managers.business.IBioclipseManager;
 import nu.xom.Element;
@@ -1863,6 +1864,7 @@ public List<ICDKMolecule> loadSMILESFile( InputStream contents,
 
               //Read subsequent lines until end
               int lineno=2;
+              long before = System.currentTimeMillis();
               for (String line : lines) {
 
                   if (monitor.isCanceled())
@@ -1918,10 +1920,13 @@ public List<ICDKMolecule> loadSMILESFile( InputStream contents,
                   lineno++;
 
                   monitor.worked(1);
-                  if (lineno%100==0){
+                  if (lineno%10==0){
                       if (monitor.isCanceled())
                           return null;
-                      monitor.subTask("Processed: " + lineno + "/" + noLines);
+                      monitor.subTask("Processed: " + lineno + "/" + noLines 
+                                      + " (" + 
+                                      TimeCalculator.generateTimeRemainEst( 
+                                           before, lineno, noLines ) + ")" );
                   }
               }
           } catch (IOException e) {