Changeset 7697 for trunk/MagicSoft/Mars/mranforest

Timestamp:

05/05/06 10:53:03 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanTree.cc (modified) (10 diffs)
• MRanTree.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mranforest/MRanTree.cc

@@ -99 +99 @@
 
 void MRanTree::GrowTree(TMatrix *mat, const MArrayF &hadtrue, const MArrayI &idclass,
-                        MArrayI &datasort, const MArrayI &datarang, MArrayF &tclasspop,
+                        MArrayI &datasort, const MArrayI &datarang, const MArrayF &tclasspop,
                         const Float_t &mean, const Float_t &square, const MArrayI &jinbag, const MArrayF &winbag,
                         const int nclass)
@@ -192 +192 @@
     for (Int_t mt=0; mt<fNumTry; mt++)
     {
-        const Int_t mvar=Int_t(gRandom->Rndm()*mdim);
+        const Int_t mvar= gRandom->Integer(mdim);
         const Int_t mn  = mvar*numdata;
 
@@ -201 +201 @@
         Double_t rld=0;
 
-        MArrayF wl(nclass); // left node //nclass
+        MArrayF wl(nclass);     // left node //nclass
         MArrayF wr(tclasspop);  // right node//nclass
 
@@ -212 +212 @@
 
             // do classification, Gini index as split rule
-            rln+=u*(2*wl[k]+u);
+            rln+=u*( 2*wl[k]+u);
             rrn+=u*(-2*wr[k]+u);
 
@@ -445 +445 @@
 void MRanTree::BuildTree(MArrayI &datasort,const MArrayI &datarang, const MArrayF &hadtrue,
                          const MArrayI &idclass, MArrayI &bestsplit, MArrayI &bestsplitnext,
-                         MArrayF &tclasspop, const Float_t &tmean, const Float_t &tsquare, const MArrayF &winbag,
+                         const MArrayF &tclasspop, const Float_t &tmean, const Float_t &tsquare, const MArrayF &winbag,
                          Int_t ninbag, const int nclass)
 {
@@ -481 +481 @@
     MArrayF mean(nrnodes);
     MArrayF square(nrnodes);
+    MArrayF lclasspop(tclasspop);
 
     mean[0]=tmean;
@@ -502 +503 @@
 
           for (Int_t j=0;j<nclass;j++)
-              tclasspop[j]=classpop[j*nrnodes+kbuild];
+              lclasspop[j]=classpop[j*nrnodes+kbuild];
 
           Int_t msplit, nbest;
@@ -508 +509 @@
 
           if ((this->*FindBestSplit)(datasort,datarang,hadtrue,idclass,ndstart,
-                                     ndend, tclasspop,mean[kbuild],square[kbuild],msplit,decsplit,
+                                     ndend, lclasspop,mean[kbuild],square[kbuild],msplit,decsplit,
                                      nbest,winbag,nclass))
           {
@@ -621 +622 @@
 }
 
-Double_t MRanTree::TreeHad(const TVector &event)
-{
-    Int_t kt=0;
+Double_t MRanTree::TreeHad(const Float_t *evt)
+{
     // to optimize on storage space node status and node class
     // are coded into fBestVar:
@@ -631 +631 @@
     // hadronness assigned to node kt = fBestSplit[kt]
 
-    for (Int_t k=0;k<fNumNodes;k++)
-    {
-        if (fBestVar[kt]<0)
+    // To get rid of the range check of the root classes
+    const Float_t *split = fBestSplit.GetArray();
+    const Int_t   *map1  = fTreeMap1.GetArray();
+    const Int_t   *map2  = fTreeMap2.GetArray();
+    const Int_t   *best  = fBestVar.GetArray();
+
+    Int_t kt=0;
+    for (Int_t k=0; k<fNumNodes; k++)
+    {
+        if (best[kt]<0)
             break;
 
-        const Int_t m=fBestVar[kt];
-        kt = event(m)<=fBestSplit[kt] ? fTreeMap1[kt] : fTreeMap2[kt];
-    }
-
-    return fBestSplit[kt];
+        const Int_t m=best[kt];
+        kt = evt[m]<=split[kt] ? map1[kt] : map2[kt];
+    }
+
+    return split[kt];
+}
+
+Double_t MRanTree::TreeHad(const TVector &event)
+{
+    return TreeHad(event.GetMatrixArray());
 }
 
 Double_t MRanTree::TreeHad(const TMatrixRow &event)
 {
-    Int_t kt=0;
-    // to optimize on storage space node status and node class
-    // are coded into fBestVar:
-    // status of node kt = TMath::Sign(1,fBestVar[kt])
-    // class  of node kt = fBestVar[kt]+2 (class defined by larger
-    //  node population, actually not used)
-    // hadronness assigned to node kt = fBestSplit[kt]
-
-    for (Int_t k=0;k<fNumNodes;k++)
-    {
-        if (fBestVar[kt]<0)
-            break;
-
-        const Int_t m=fBestVar[kt];
-        kt = event(m)<=fBestSplit[kt] ? fTreeMap1[kt] : fTreeMap2[kt];
-    }
-
-    return fBestSplit[kt];
+    return TreeHad(event.GetPtr());
 }
 

trunk/MagicSoft/Mars/mranforest/MRanTree.h

@@ -45 +45 @@
          Int_t &, const MArrayF &, const int); //!
 
+    Double_t TreeHad(const Float_t *evt);
 
     int FindBestSplitGini(const MArrayI &datasort, const MArrayI &datarang,
@@ -66 +67 @@
     void BuildTree(MArrayI &datasort, const MArrayI &datarang, const MArrayF &hadtrue,
                    const MArrayI &idclass,MArrayI &bestsplit,MArrayI &bestsplitnext,
-                   MArrayF &tclasspop, const Float_t &tmean, const Float_t &tsquare, const MArrayF &winbag,
+                   const MArrayF &tclasspop, const Float_t &tmean, const Float_t &tsquare, const MArrayF &winbag,
                    Int_t ninbag, const int nclass);
 
@@ -97 +98 @@
     // functions used in tree growing process
     void GrowTree(TMatrix *mat, const MArrayF &hadtrue, const MArrayI &idclass,
-                  MArrayI &datasort, const MArrayI &datarang,MArrayF &tclasspop,
+                  MArrayI &datasort, const MArrayI &datarang,const MArrayF &tclasspop,
                   const Float_t &mean, const Float_t &square, const MArrayI &jinbag, const MArrayF &winbag,
                   const int nclass);