Changeset 7535 for trunk/MagicSoft/Mars/mranforest

Timestamp:

02/27/06 11:44:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanForest.cc (modified) (5 diffs)
• MRanForest.h (modified) (1 diff)
• MRanForestGrow.h (modified) (1 diff)

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -164 +164 @@
     //at least 1 tree
     fNumTrees=TMath::Max(n,1);
-    fTreeHad.Set(fNumTrees);
-    fTreeHad.Reset();
 }
 
@@ -250 +248 @@
         // classes directly given
         for (Int_t j=0;j<numdata;j++)
-            fClass[j] = int(fHadTrue[j]+0.5);
+            fClass[j] = TMath::Nint(fHadTrue[j]);
     }
 }
@@ -264 +262 @@
 Double_t MRanForest::CalcHadroness(const TVector &event)
 {
+    fTreeHad.Set(fNumTrees);
+
     Double_t hadroness=0;
-    Int_t ntree=0;
+    Int_t    ntree    =0;
 
     TIter Next(fForest);
@@ -341 +341 @@
     // setup rules to be used for classification/regression
     const MDataArray *allrules=(MDataArray*)mat->GetColumns();
-    if(allrules==NULL)
+    if (allrules==NULL)
     {
         *fLog << err <<"Rules of matrix == null, exiting"<< endl;
@@ -347 +347 @@
     }
 
+    if (allrules->GetNumEntries()!=dim+1)
+    {
+        *fLog << err <<"Rules of matrix " << allrules->GetNumEntries() << " mismatch dimension+1 " << dim+1 << "...exiting."<< endl;
+        return kFALSE;
+    }
+
     if (fRules)
         delete fRules;
+
     fRules = new MDataArray();
     fRules->Reset();

trunk/MagicSoft/Mars/mranforest/MRanForest.h

@@ -61 +61 @@
 
     // estimates for classification error of growing forest
-    TArrayD fTreeHad;      // Hadronness values
+    TArrayD fTreeHad;      //! Hadronness values (buffer for MHRanForest)
 
     Double_t fUserVal;     // A user value describing this tree (eg E-mc)

trunk/MagicSoft/Mars/mranforest/MRanForestGrow.h

@@ -34 +34 @@
     MRanForestGrow(const char *name=NULL, const char *title=NULL);
 
+    MRanForest *GetForest() const { return fRanForest; }
+
     //     void SetNumTrees(Int_t n=-1) { fNumTrees=n>0?n:100; }
     //     void SetNumTry(Int_t   n=-1) { fNumTry  =n>0?n:  3; }