Changeset 1593 for trunk/MagicSoft/Mars/mhist/MHMatrix.cc

Timestamp:

11/08/02 10:04:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHMatrix.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -427 +427 @@
     TMath::Sort(dists.GetSize(), dists.GetArray(), idx.GetArray(), kFALSE);
 
-    const Int_t n = TMath::Abs(num)<rows ? TMath::Abs(num) : rows;
+    Int_t from = 0;
+    Int_t to   = TMath::Abs(num)<rows ? TMath::Abs(num) : rows;
+    //
+    // This is a zero-suppression for the case a test- and trainings
+    // sample is identical. This would result in an unwanted leading
+    // zero in the array. To suppress also numerical uncertanties of
+    // zero we cut at 1e-5. Due to Rudy this should be enough. If
+    // you encounter problems we can also use (eg) 1e-25
+    //
+    if (dists[idx[0]]<1e-5)
+    {
+        from++;
+        to ++;
+        if (to>rows)
+            to = rows;
+    }
 
     if (num<0)
@@ -438 +453 @@
 
         Double_t res = 0;
-        for (int i=0; i<n; i++)
+        for (int i=from; i<to; i++)
             res += TMath::Exp(-dists[idx[i]]/hwin);
 
-        return -TMath::Log(res/n);
+        return -TMath::Log(res/(to-from));
     }
     else
@@ -449 +464 @@
         //
         Double_t res = 0;
-        for (int i=0; i<n; i++)
+        for (int i=from; i<to; i++)
             res += dists[idx[i]];
 
-        return TMath::Sqrt(res/n);
+        return TMath::Sqrt(res/(to-from));
     }
 }