changeset 212:1292c2e37734 refactoring

Trivial cleanups of UnitNorm() (Side-effect: now query.cpp is under 1000 lines!)
author mas01cr
date Fri, 30 Nov 2007 10:30:01 +0000
parents 50da444004fe
children 78a144448bda
files query.cpp
diffstat 1 files changed, 9 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/query.cpp	Fri Nov 30 10:19:26 2007 +0000
+++ b/query.cpp	Fri Nov 30 10:30:01 2007 +0000
@@ -974,25 +974,18 @@
   if(verbosity>2) {
     std::cerr << "norming " << n << " vectors...";std::cerr.flush();
   }
-  while(n--){
-    p=X;
-    L2=0.0;
-    d=dim;
-    while(d--){
-      L2+=*p**p;
+  while(n--) {
+    p = X;
+    L2 = 0.0;
+    d = dim;
+    while(d--) {
+      L2 += *p * *p;
       p++;
     }
-    /*    L2=sqrt(L2);*/
-    if(qNorm)
+    if(qNorm) {
       *qNorm++=L2;
-    /*
-    oneOverL2 = 1.0/L2;
-    d=dim;
-    while(d--){
-      *X*=oneOverL2;
-      X++;
-    */
-    X+=dim;
+    }
+    X += dim;
   }
   if(verbosity>2) {
     std::cerr << "done..." << std::endl;