changeset 246:cbf51690c78c audiodb-debian

Merge trunk changes -r314:325

Plus new debian/changelog, using epoch for smooth upgrading.

--- a/Makefile	Fri Dec 14 14:41:37 2007 +0000
+++ b/Makefile	Mon Dec 17 16:44:37 2007 +0000
@@ -5,10 +5,17 @@
 GSOAP_INCLUDE=
 
 override CFLAGS+=-O3 -g
+
 ifeq ($(shell uname),Linux)
 override CFLAGS+=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
+ifeq ($(shell uname),Darwin)
+ifeq ($(shell sysctl -n hw.optional.x86_64),1)
+override CFLAGS+=-arch x86_64
+endif
+endif
+
 EXECUTABLE=audioDB
 
 .PHONY: all clean test

--- a/README.txt	Fri Dec 14 14:41:37 2007 +0000
+++ b/README.txt	Mon Dec 17 16:44:37 2007 +0000
@@ -1,8 +1,10 @@
 This is audioDB, a database system specialized towards approximate
 content-based retrieval, developed at Goldsmiths, University of London
-as part of the OMRAS2 research project (funded by EPSRC).
+as part of the OMRAS2 research project (funded by the Engineering and
+Physical Sciences Research Council, grant number: EP/E02274X/1).
 
 Please see INSTALL.txt for build and installation instructions.
 Portions of this work are copyright Michael Casey, Christophe Rhodes,
-and Goldsmiths, University of London; please see LICENCE.txt for
-restrictions on use and redistribution.
+and Goldsmiths, University of London.  The software is released under
+the terms of the GNU General Public Licence, version 2 or greater;
+please see LICENCE.txt for the text of that copyright licence.

--- a/debian/changelog	Fri Dec 14 14:41:37 2007 +0000
+++ b/debian/changelog	Mon Dec 17 16:44:37 2007 +0000
@@ -1,3 +1,17 @@
+audiodb (1:0.8.preview-1) unstable; urgency=low
+  
+  * Updated to svn version #325
+  * version 0.8.preview
+  
+ -- Christophe Rhodes <[e-mail]>  Mon, 17 Dec 2007 16:39:28 +0000
+
+audiodb (1.0-21) unstable; urgency=low
+
+  * Updated to svn version #319
+  * Fixes nan bug.
+
+ -- Christophe Rhodes <[e-mail]>  Fri, 14 Dec 2007 14:42:43 +0000
+
 audiodb (1.0-20) unstable; urgency=low
 
   * Updated to svn version #313

--- a/gengetopt.in	Fri Dec 14 14:41:37 2007 +0000
+++ b/gengetopt.in	Mon Dec 17 16:44:37 2007 +0000
@@ -1,5 +1,5 @@
 package "audioDB"
-version "version 1.0"
+version "version 0.8.preview"
 purpose "A feature vector database management system for content-based retrieval."
 option "help" H "print help on audioDB usage and exit." optional
 option "verbosity" v "level of detail of operational information." int typestr="detail" default="1" optional
@@ -51,4 +51,6 @@
 option "client" c "run as a client using named host service." string typestr="hostname:port" optional
 
 
-text "\nCopyright (C) 2007 Michael Casey, Goldsmiths, University of London\n"
+text "
+Copyright (c) 2007 Michael Casey, Christophe Rhodes
+                   Goldsmiths, University of London"

--- a/reporter.h	Fri Dec 14 14:41:37 2007 +0000
+++ b/reporter.h	Mon Dec 17 16:44:37 2007 +0000
@@ -61,14 +61,16 @@
 }
 
 template <class T> void pointQueryReporter<T>::add_point(unsigned int trackID, unsigned int qpos, unsigned int spos, double dist) {
-  NNresult r;
-  r.trackID = trackID;
-  r.qpos = qpos;
-  r.spos = spos;
-  r.dist = dist;
-  queue->push(r);
-  if(queue->size() > pointNN) {
-    queue->pop();
+  if (!isnan(dist)) {
+    NNresult r;
+    r.trackID = trackID;
+    r.qpos = qpos;
+    r.spos = spos;
+    r.dist = dist;
+    queue->push(r);
+    if(queue->size() > pointNN) {
+      queue->pop();
+    }
   }
 }
 
@@ -133,14 +135,16 @@
 }
 
 template <class T> void trackAveragingReporter<T>::add_point(unsigned int trackID, unsigned int qpos, unsigned int spos, double dist) {
-  NNresult r;
-  r.trackID = trackID;
-  r.qpos = qpos;
-  r.spos = spos;
-  r.dist = dist;
-  queues[trackID].push(r);
-  if(queues[trackID].size() > pointNN) {
-    queues[trackID].pop();
+  if (!isnan(dist)) {
+    NNresult r;
+    r.trackID = trackID;
+    r.qpos = qpos;
+    r.spos = spos;
+    r.dist = dist;
+    queues[trackID].push(r);
+    if(queues[trackID].size() > pointNN) {
+      queues[trackID].pop();
+    }
   }
 }