--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/04/30 12:53:01	2147
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/09/12 06:42:29	2214
@@ -2,45 +2,99 @@
 
 import java.io.File;
 import java.io.FileReader;
+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;
 
 public class Lookup {
+
+	static final String CONFIG_FILENAME = "fulddaekning.properties";
+
 	static int max_workers;
 	static boolean verbose;
 	
-	static Properties conf;
+	static boolean rename_tables;
+	static String distributor;
+	
+	static SafeProperties conf;
 	static Logger logger = Logger.getLogger( Lookup.class.toString() );
 	
-
+	int postnr;
 	Database db;
-	WorkSet workset;
+		
+	Adresse daekkedeAdresser[];
+	Queue<Adresse> queue;
 	
 	Map<Integer, LookupWorker> workers = new ConcurrentHashMap<Integer, LookupWorker>();
 
 	
+	static Statistik flestDaekkede = new Statistik();
+	static Statistik flestIkkeDaekkede = new Statistik();
 	
-	public Lookup(WorkSet workset, Database db) {
-		this.db = db;
-		this.workset = workset;
+	
+	static class Statistik {
+		int postnr;
+		int antalDaekkede = 0;
+		int antalIkkeDaekkede = 0;
+		
+		@Override
+		public String toString() {
+			return "postnr=" + postnr + " antalIkkeDaekkede=" + antalIkkeDaekkede + " antalDaekkede="  + antalDaekkede;
+		}
 	}
 	
 	
+	public Lookup(int postnr, Database db) {
+		this.postnr = postnr;
+		this.db = db;
+	}
+	
+	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=" + workset.postnr);		
+		logger.info("Starting for postnr=" + postnr);
 		
+		Statistik stat = new Statistik();
+				
 		long start1 = System.currentTimeMillis();		
 		long start2 = 0;
 		
 		try {
-
-			logger.info("Starter beregning for " + workset.postnr);
+			BoundingBox bbox = db.getBoundingbox(postnr);
+			bbox.validateBbox();
+			
+			logger.info("Bbox=" + bbox);
+			bbox.adjustToMargin();
+			logger.info("Bbox Adjusted=" + bbox);
+			
+			logger.info("Henter daekkede adresser i " + postnr);
+			daekkedeAdresser = db.hentDaekkedeAdresser(bbox);
+			
+			logger.info("Henter _ikke_ daekkede adresser i " + postnr);
+			queue = db.hentIkkedaekkedeAdresser(postnr);
+			
+			stat.postnr = postnr;
+			stat.antalDaekkede = daekkedeAdresser.length;
+			stat.antalIkkeDaekkede = queue.size();
+			
+			saveStatistics(stat);
+						
+			
+			logger.info("Starter beregning for " + postnr);
 			start2 = System.currentTimeMillis();
 						 								
 			for (int i =0; i<max_workers; i++) {
@@ -68,14 +122,18 @@
 		long now = System.currentTimeMillis();
 		
 
-		logger.info("Antal daekkede:" + workset.daekkedeAdresser.size() );
-		logger.info("Antal ikke-daekkede:" + workset.queueSize );
-		logger.info("Done! elapsed=" + (now-start1) + "/" +  (now-start2) );
+		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);
+		LookupWorker key = workers.remove(workerid);
+		
+		if (key == null) {
+			System.out.println("Error removing worker from set");
+			System.exit(0);
+		}
 	}
 	
 	// Getters and setters
@@ -84,11 +142,21 @@
 	public Database getDb() {
 		return db;
 	}
-	
-	public WorkSet getWorkSet() {
-		return workset;
+
+
+
+	public Adresse[] getDaekkedeAdresser() {
+		return daekkedeAdresser;
+	}
+
+	public Queue<Adresse> getQueue() {
+		return queue;
 	}
 
+
+	
+	
+	
 	
 	/////////////////////////////
 	// Static functions
@@ -98,70 +166,88 @@
 	
 	public static void main(String[] args) throws Exception {
 		
-		File confFile = new File("fulddaekning.properties");
+		//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");
+			logger.warning("Config file not found: " + CONFIG_FILENAME);
 			System.exit(1);
 		}
 				
-		conf = new Properties();
+		conf = new SafeProperties();
 		conf.load( new FileReader(confFile) );
 		
-		max_workers = Integer.parseInt( conf.getProperty("MAX_WORKERS") );
+		max_workers = Integer.parseInt( conf.getSafeProperty("MAX_WORKERS") );
 		logger.info("Starting with MAX_WORKERS:" + max_workers);
 		
-		verbose = Boolean.parseBoolean( conf.getProperty("VERBOSE") );
+		verbose = Boolean.parseBoolean( conf.getSafeProperty("VERBOSE") );
 		logger.info("Starting with VERBOSE:" + verbose);
 		
+		rename_tables = Boolean.parseBoolean( conf.getSafeProperty("RENAMETABLES") );
+		logger.info("Starting with RENAMETABLES:" + rename_tables);
+		
+		distributor = conf.getSafeProperty("DISTRIBUTOR");
+		distributor = distributor.toUpperCase();
+		Constants.init(distributor);
+
+		
 		Database db = new Database(conf);
-		db.resetResultTable();
+		
+		
 
 		
-		InputWorker inputWorker = new InputWorker(db);
-		Thread inputThread = new Thread(inputWorker);
-		inputThread.start();
 		
 		
-		long start = System.currentTimeMillis();
-		boolean doContinue = true;
 		
-		while (inputWorker.queue.isEmpty() == true) {
-			Thread.sleep(3); //Vent indtil at første arbejds sæt er på plads
-		}
+		long start = System.currentTimeMillis();
 		
+		logger.info("Finder postnumre");
+		List<Integer> postnumre = db.hentPostnumre();
 		
-		while ( doContinue == true ) {
-			WorkSet set = inputWorker.queue.poll();
-			
-			if (set != null) {
-				Lookup lookup = new Lookup(set, db);
-				lookup.doLookup();				
-			} else {
-				System.out.println("Buffer underrun");
-				Thread.sleep(10);
-			}
-			
-			if ( inputWorker.isDone == true && inputWorker.queue.isEmpty() == true)
-				doContinue = false;
+		// Først validerer vi BBox på alle postnummre, for at undgå fuldt stop midt i beregningen
+		for(Integer postnr : postnumre) { //
+			logger.info("Validerer BBox for " + postnr);
+			BoundingBox bbox = db.getBoundingbox(postnr);
+			bbox.validateBbox();
 		}
 		
-		/*logger.info("Finder postnumre");
-		List<Integer> postnumre = db.hentPostnumre();
+		
+		//pre-check er ok - reset tmp tabel og start søgningen
+		db.resetResultTable();
 		
 		for(Integer postnr : postnumre) {
 			Lookup lookup = new Lookup(postnr, db);
 			lookup.doLookup();			
-		}*/
+		}
 		
-		long now = System.currentTimeMillis();
+		if (rename_tables) {
+			db.renameResultTables();
+		} else {
+			logger.info( "Rename tables is disabled !!!" );
+		}
 		
+		long now = System.currentTimeMillis();
+
+		logger.info("Flest Ikke-dækkede, " + flestIkkeDaekkede);
+		logger.info("Flest Dækkede, " + flestDaekkede);
 		logger.info("Fuld load done : " + (now-start) );
+
 		
-		
-		//Lookup lookup = new Lookup(7400, db);
-		//lookup.doLookup();		
+		/*
+		/// Test
+		db.resetResultTable();
+		Lookup lookup = new Lookup(2750, db);
+		lookup.doLookup();		
+		long now = System.currentTimeMillis();
+		logger.info("Fuld load done : " + (now-start) );*/
 	}
-	
-
-	
+		
 }