--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/05/08 09:01:43	2154
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2015/02/20 08:52:52	2330
@@ -1,107 +1,92 @@
 package dk.daoas.fulddaekning;
 
-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.concurrent.CyclicBarrier;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import dk.daoas.fulddaekning.BoundingBox.BoundingBoxException;
 
 public class Lookup {
-	static int max_workers;
-	static boolean verbose;
+
+	
 	
-	static Properties conf;
-	static Logger logger = Logger.getLogger( Lookup.class.toString() );
+	final static Logger logger = Logger.getLogger( Lookup.class.toString() );
 	
 	int postnr;
 	Database db;
 		
-	ArrayList<Adresse> daekkedeAdresser;
+	Adresse daekkedeAdresser[];
 	Queue<Adresse> queue;
 	
 	Map<Integer, LookupWorker> workers = new ConcurrentHashMap<Integer, LookupWorker>();
 
+	ThreadPoolExecutor threadPool;	
 	
-	static Statistik flestDaekkede = new Statistik();
-	static Statistik flestIkkeDaekkede = new Statistik();
-	
-	
-	static class Statistik {
-		int postnr;
-		int antalDaekkede = 0;
-		int antalIkkeDaekkede = 0;
-		
-		@Override
-		public String toString() {
-			return "postnr=" + postnr + " antalIkkeDaekkede=" + antalIkkeDaekkede + " antalDaekkede="  + antalDaekkede;
-		}
-	}
-	
+	CyclicBarrier barrier;
+
+		
 	
-	public Lookup(int postnr, Database db) {
+	public Lookup(int postnr, Database db, ThreadPoolExecutor threadPool) {
 		this.postnr = postnr;
 		this.db = db;
+		this.threadPool = threadPool;
 	}
 	
-	public static void saveStatistics(Statistik stat) {
-		if (stat.antalDaekkede > flestDaekkede.antalDaekkede) {
-			flestDaekkede = stat;
-		}
-		if (stat.antalIkkeDaekkede > flestIkkeDaekkede.antalIkkeDaekkede) {
-			flestIkkeDaekkede = stat;
-		}		
-	}
+
 	
 	public void doLookup() throws BoundingBoxException {
 		logger.info("Starting for postnr=" + postnr);
 		
 		Statistik stat = new Statistik();
+		
+		Constants consts = Constants.getInstance();
 				
 		long start1 = System.currentTimeMillis();		
 		long start2 = 0;
 		
+		barrier = new CyclicBarrier(LookupMain.max_workers + 1);
+		
 		try {
+			
+			logger.info("Henter _ikke_ daekkede adresser i " + postnr);
+			queue = db.hentIkkedaekkedeAdresserCache(postnr);
+			if (queue.size() == 0) {
+				logger.info("Fandt ikke nogen _ikke_ daekkede adresser i " + postnr);
+				return;
+			}
+			
 			BoundingBox bbox = db.getBoundingbox(postnr);
 			bbox.validateBbox();
 			
 			logger.info("Bbox=" + bbox);
-			bbox.adjustToMargin();
+			bbox.adjustToMargin( consts.getKmMargin() );
 			logger.info("Bbox Adjusted=" + bbox);
 			
 			logger.info("Henter daekkede adresser i " + postnr);
-			daekkedeAdresser = db.hentDaekkedeAdresser(bbox);
+			daekkedeAdresser = db.hentDaekkedeAdresserCache(bbox);
 			
-			logger.info("Henter _ikke_ daekkede adresser i " + postnr);
-			queue = db.hentIkkedaekkedeAdresser(postnr);
 			
 			stat.postnr = postnr;
-			stat.antalDaekkede = daekkedeAdresser.size();
+			stat.antalDaekkede = daekkedeAdresser.length;
 			stat.antalIkkeDaekkede = queue.size();
-			
-			saveStatistics(stat);
-						
+			stat.totalDataset = stat.antalDaekkede * stat.antalIkkeDaekkede;
+									
 			
 			logger.info("Starter beregning for " + postnr);
 			start2 = System.currentTimeMillis();
 						 								
-			for (int i =0; i<max_workers; i++) {
-				LookupWorker worker = new LookupWorker(i, this);
-				Thread t = new Thread(worker);
-				t.start();
-				
-				workers.put(i, worker);
+			for (int i =0; i < LookupMain.max_workers; i++) {
+				LookupWorker worker = new LookupWorker(i, this, barrier);
+				threadPool.submit(worker);
 			}
 			
-			while (workers.size() > 0) {
-				Thread.sleep(10);//wait for worker threads
-			}
+			barrier.await();
+			
+			db.saveBatch();//Save any unsaved rows
 			
 			
 		} catch(Exception e) {
@@ -115,15 +100,13 @@
 		}
 		long now = System.currentTimeMillis();
 		
+		stat.forbrugtTid = (now-start1);
+		LookupMain.saveStatistics(stat);
 
 		logger.info( stat.toString() );
 		logger.info("Done! elapsed=" + (now-start1) + "/" +  (now-start2) + "  postnr=" + postnr);
 	}
 	
-	public void shutdownWorker(int workerid) {
-		logger.info("Shutting down worker: " + workerid);
-		workers.remove(workerid);
-	}
 	
 	// Getters and setters
 		
@@ -134,7 +117,7 @@
 
 
 
-	public ArrayList<Adresse> getDaekkedeAdresser() {
+	public Adresse[] getDaekkedeAdresser() {
 		return daekkedeAdresser;
 	}
 
@@ -143,60 +126,4 @@
 	}
 
 
-	
-	
-	
-	
-	/////////////////////////////
-	// Static functions
-
-
-
-	
-	public static void main(String[] args) throws Exception {
-		
-		File confFile = new File("fulddaekning.properties");
-		if (! confFile.exists() ) {
-			logger.warning("Config file not found");
-			System.exit(1);
-		}
-				
-		conf = new Properties();
-		conf.load( new FileReader(confFile) );
-		
-		max_workers = Integer.parseInt( conf.getProperty("MAX_WORKERS") );
-		logger.info("Starting with MAX_WORKERS:" + max_workers);
-		
-		verbose = Boolean.parseBoolean( conf.getProperty("VERBOSE") );
-		logger.info("Starting with VERBOSE:" + verbose);
-		
-		Database db = new Database(conf);
-		
-		db.resetResultTable();
-
-		
-		
-		
-		
-		long start = System.currentTimeMillis();
-		
-		logger.info("Finder postnumre");
-		List<Integer> postnumre = db.hentPostnumre();
-		
-		for(Integer postnr : postnumre) {
-			Lookup lookup = new Lookup(postnr, db);
-			lookup.doLookup();			
-		}
-		
-		long now = System.currentTimeMillis();
-				
-		logger.info("Fuld load done : " + (now-start) );
-		logger.info("Flest Ikke-dækkede, " + flestIkkeDaekkede);
-		logger.info("Flest Dækkede, " + flestDaekkede);
-		
-		
-		//Lookup lookup = new Lookup(7400, db);
-		//lookup.doLookup();		
-	}
-		
 }