--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java 2016/02/05 11:01:48 2927 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java 2016/02/13 15:56:00 2948 @@ -42,12 +42,10 @@ ThreadPoolExecutor threadPool; boolean isIncremental; - String type; public AfstandAndenRuteTask(String distributor, String type) { this.distributor = distributor; - this.type = type; type = type.toUpperCase(); switch(type) { @@ -90,7 +88,7 @@ try (Connection conn = DBConnection.getConnection() ) { - Database db = new Database(conn, isIncremental); + DatabaseRouteDistance db = new DatabaseRouteDistance(conn, isIncremental); db.prepareIncrementalSearch(); @@ -179,9 +177,9 @@ - } else { + } /*else { /// Test - /* + db.resetResultTable(); @@ -190,8 +188,8 @@ short post = (short) 2700; Lookup lookup = new Lookup(post, db, threadPool); - lookup.doLookup();*/ - } + lookup.doLookup(); + } */ long now = System.currentTimeMillis(); @@ -206,8 +204,6 @@ logger.info("Heraf, antal fundne : " + antalFundne ); logger.info( String.format("Fandt adresser til : %.2f %%", (antalFundne.get() *100.0)/antalIkkeDaekkede ) ); - //logger.info("Fandt adresser til : " + (antalFundne*100.0)/ikkeDaekkede.length + "%" ); - } }