Changeset 1582 for trunk/MagicSoft

Timestamp:

11/06/02 16:40:41 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -45 +45 @@
 #include "MHMatrix.h"
 
-#include <math.h>   // abs for Alphas
-#include <stdlib.h> // abs for some Linux machines
-
 #include <fstream.h>
 
@@ -384 +381 @@
 // represented by the covariance metrix m.
 //  - If n<0 the kernel method is applied and
-//    sum(epx(-d)/n is returned.
-//  - For n>=0 the n nearest neighbors are summed and
-//    sqrt(sum(d))/n is returned.
+//    -log(sum(epx(-d/h))/n) is returned.
+//  - For n>0 the n nearest neighbors are summed and
+//    sqrt(sum(d)/n) is returned.
 //  - if n==0 all distances are summed
 //
@@ -395 +392 @@
         TVector d = evt;
         d *= m;
-        return sqrt(d*evt); 
+        return TMath::Sqrt(d*evt);
     }
 
@@ -430 +427 @@
     TMath::Sort(dists.GetSize(), dists.GetArray(), idx.GetArray(), kFALSE);
 
-    const Int_t n = abs(num)<rows ? abs(num) : rows;
+    const Int_t n = TMath::Abs(num)<rows ? TMath::Abs(num) : rows;
 
     if (num<0)
     {
         //
-        // Kernel function sum
+        // Kernel function sum (window size h set according to literature)
         //
-        const Double_t h = 1;
+        const Double_t h    = TMath::Power(rows, -1./(cols+4));
+        const Double_t hwin = h*h*2;
 
         Double_t res = 0;
         for (int i=0; i<n; i++)
-            res += exp(-dists[idx[i]]/h);
-
-        return -log(res/n);
+            res += TMath::Exp(-dists[idx[i]]/hwin);
+
+        return -TMath::Log(res/n);
     }
     else
@@ -454 +452 @@
             res += dists[idx[i]];
 
-        return sqrt(res/n);
+        return TMath::Sqrt(res/n);
     }
 }