Changeset 7170 for trunk/MagicSoft/Mars/mranforest

Timestamp:

06/27/05 10:45:56 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanForest.cc (modified) (2 diffs)
• MRanForest.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -24 +24 @@
 
 /////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MRanForest                                                              //
-//                                                                         //
-// ParameterContainer for Forest structure                                 //
-//                                                                         //
-// A random forest can be grown by calling GrowForest.                     //
-// In advance SetupGrow must be called in order to initialize arrays and   //
-// do some preprocessing.                                                  //
-// GrowForest() provides the training data for a single tree (bootstrap    //
-// aggregate procedure)                                                    //
-//                                                                         //
-// Essentially two random elements serve to provide a "random" forest,     //
-// namely bootstrap aggregating (which is done in GrowForest()) and random //
-// split selection (which is subject to MRanTree::GrowTree())              //
-//                                                                         //
+//
+// MRanForest
+//
+// ParameterContainer for Forest structure
+//
+// A random forest can be grown by calling GrowForest.
+// In advance SetupGrow must be called in order to initialize arrays and
+// do some preprocessing.
+// GrowForest() provides the training data for a single tree (bootstrap
+// aggregate procedure)
+//
+// Essentially two random elements serve to provide a "random" forest,
+// namely bootstrap aggregating (which is done in GrowForest()) and random
+// split selection (which is subject to MRanTree::GrowTree())
+//
+// Version 2:
+//  + fUserVal
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MRanForest.h"
@@ -59 +62 @@
 // Default constructor.
 //
-MRanForest::MRanForest(const char *name, const char *title) : fNumTrees(100), fRanTree(NULL),fUsePriors(kFALSE)
+MRanForest::MRanForest(const char *name, const char *title) : fNumTrees(100), fRanTree(NULL),fUsePriors(kFALSE), fUserVal(-1)
 {
     fName  = name  ? name  : "MRanForest";

trunk/MagicSoft/Mars/mranforest/MRanForest.h

@@ -70 +70 @@
     TArrayD fTreeHad;   //
 
+    Double_t fUserVal;
+
     void InitHadEst(Int_t from, Int_t to, const TMatrix &m, TArrayI &jinbag);
 
@@ -91 +93 @@
     void SetCurTree(MRanTree *rantree) { fRanTree=rantree; }
     Bool_t AddTree(MRanTree *rantree);
+    void SetUserVal(Double_t d) { fUserVal = d; }
 
     // getter methods
@@ -98 +101 @@
     MDataArray *GetRules() { return ((MRanTree*)(fForest->At(0)))->GetRules(); }
 
-
     Int_t      GetNumTrees() const { return fNumTrees; }
     Int_t      GetNumData()  const;
     Int_t      GetNumDim()   const;
     Double_t   GetTreeHad(Int_t i) const { return fTreeHad.At(i); }
+    Double_t   GetUserVal() const { return fUserVal; }
  
     // use forest to calculate hadronness of event
@@ -109 +112 @@
     Bool_t AsciiWrite(ostream &out) const;
 
-    ClassDef(MRanForest, 1) // Storage container for tree structure
+    ClassDef(MRanForest, 2) // Storage container for tree structure
 };