--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java 2014/09/11 15:09:03 2205 +++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java 2014/09/12 14:05:10 2217 @@ -2,14 +2,14 @@ import java.io.File; import java.io.FileReader; -import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Queue; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.FileHandler; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.logging.SimpleFormatter; import dk.daoas.fulddaekning.BoundingBox.BoundingBoxException; @@ -29,7 +29,7 @@ int postnr; Database db; - ArrayList daekkedeAdresser; + Adresse daekkedeAdresser[]; Queue queue; Map workers = new ConcurrentHashMap(); @@ -88,7 +88,7 @@ queue = db.hentIkkedaekkedeAdresser(postnr); stat.postnr = postnr; - stat.antalDaekkede = daekkedeAdresser.size(); + stat.antalDaekkede = daekkedeAdresser.length; stat.antalIkkeDaekkede = queue.size(); saveStatistics(stat); @@ -145,7 +145,7 @@ - public ArrayList getDaekkedeAdresser() { + public Adresse[] getDaekkedeAdresser() { return daekkedeAdresser; } @@ -166,6 +166,16 @@ public static void main(String[] args) throws Exception { + //Setup j.u.l Logger + Logger root = Logger.getLogger(""); + FileHandler fhandler = new FileHandler("fulddaekning.log"); // Ingen max størrelse, ingen rotation og ingen append + fhandler.setFormatter( new SimpleFormatter() ); + root.addHandler( fhandler ); + + + + + File confFile = new File( CONFIG_FILENAME ); if (! confFile.exists() ) { logger.warning("Config file not found: " + CONFIG_FILENAME); @@ -225,15 +235,30 @@ } long now = System.currentTimeMillis(); + long elapsed = now - start ; logger.info("Flest Ikke-dækkede, " + flestIkkeDaekkede); logger.info("Flest Dækkede, " + flestDaekkede); - logger.info("Fuld load done : " + (now-start) ); + logger.info("Fuld load done : " + formatMilliSeconds(elapsed) ); + /* + /// Test + db.resetResultTable(); + Lookup lookup = new Lookup(2750, db); + lookup.doLookup(); + long now = System.currentTimeMillis(); + long elapsed = now - start ; + logger.info("Fuld load done : " + formatMilliSeconds(elapsed) );*/ + } + + static String formatMilliSeconds(long milliseconds) { + int mseconds = (int) milliseconds % 1000; + int seconds = (int) (milliseconds / 1000) % 60 ; + int minutes = (int) ((milliseconds / (1000*60)) % 60); + int hours = (int) ((milliseconds / (1000*60*60)) % 24); - //Lookup lookup = new Lookup(7400, db); - //lookup.doLookup(); + return String.format("%02d:%02d:%02d.%03d", hours, minutes, seconds, mseconds); } }