Changeset 7420 for trunk/MagicSoft/Mars/mranforest

Timestamp:

11/22/05 11:06:56 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanForest.cc (modified) (7 diffs)
• MRanForest.h (modified) (2 diffs)
• MRanForestCalc.cc (modified) (5 diffs)
• MRanForestCalc.h (modified) (2 diffs)
• MRanTree.cc (modified) (1 diff)
• MRanTree.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -62 +62 @@
 // Default constructor.
 //
-MRanForest::MRanForest(const char *name, const char *title) : fClassify(1), fNumTrees(100), fNumTry(0), fNdSize(1), fRanTree(NULL), fUserVal(-1)
+MRanForest::MRanForest(const char *name, const char *title)
+    : fClassify(kTRUE), fNumTrees(100), fNumTry(0), fNdSize(1),
+    fRanTree(NULL), fRules(NULL), fMatrix(NULL), fUserVal(-1)
 {
     fName  = name  ? name  : "MRanForest";
@@ -125 +127 @@
 {
     delete fForest;
+    if (fMatrix)
+        delete fMatrix;
+    if (fRules)
+        delete fRules;
 }
 
@@ -152 +158 @@
 void MRanForest::SetWeights(const TArrayF &weights)
 {
-    const int n=weights.GetSize();
-    fWeight.Set(n);
     fWeight=weights;
-
-    return;
 }
 
@@ -175 +177 @@
     //for(int i=0;i<n;i++)
     //    *fLog<<inf<<" "<<i<<") "<<fGrid[i]<<endl;
-
-    return;
 }
 
@@ -227 +227 @@
 }
 
-/*
-Bool_t MRanForest::PreProcess(MParList *plist)
-{
-    if (!fRules)
-    {
-        *fLog << err << dbginf << "MDataArray with rules not initialized... aborting." << endl;
-        return kFALSE;
-    }
-
-    if (!fRules->PreProcess(plist))
-    {
-        *fLog << err << dbginf << "PreProcessing of MDataArray failed... aborting." << endl;
-        return kFALSE;
-    }
-
-    return kTRUE;
-}
-*/
-
 Double_t MRanForest::CalcHadroness()
 {
@@ -285 +266 @@
     // access matrix, copy last column (target) preliminarily
     // into fHadTrue
+    if (fMatrix)
+        delete fMatrix;
     fMatrix = new TMatrix(mat->GetM());
 
@@ -337 +320 @@
     }
 
+    if (fRules)
+        delete fRules;
     fRules = new MDataArray();
     fRules->Reset();

trunk/MagicSoft/Mars/mranforest/MRanForest.h

@@ -30 +30 @@
 {
 private:
-    Int_t fClassify;
+    Bool_t fClassify;
 
     Int_t fNumTrees;       // Number of trees
@@ -83 +83 @@
     void SetNdSize(Int_t n);
 
-    void SetClassify(Int_t n){ fClassify=n; }
+    void SetClassify(Bool_t n){ fClassify=n; }
     void PrepareClasses();
 

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -79 +79 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// ver=0: One yes/no-classification forest is trained for each bin.
+//        the yes/no classification is done using the grid
+// ver=1: One classification forest is trained. The last column contains a
+//        value which is turned into a classifier by rf itself using the grid
+// ver=2: One classification forest is trained. The last column already contains
+//        the classifier
+// ver=3: A regression forest is trained. The last column contains the
+//        classifier
+//
 Int_t MRanForestCalc::Train(const MHMatrix &matrixtrain, const TArrayD &grid, Int_t ver)
 {
@@ -117 +128 @@
 
     MDataArray rules(usedrules);
-    rules.AddEntry(ver<2?"Classification":dcol[ncols-1].GetRule());
+    rules.AddEntry(ver<3?"Classification":dcol[ncols-1].GetRule());
 
     // prepare matrix for current energy bin
@@ -133 +144 @@
         switch (ver)
         {
-        case 0: // Replace Energy Grid by classification
+        case 0: // Replace last column by a classification
             {
                 Int_t irows=0;
@@ -158 +169 @@
             break;
 
-        case 1: // Use Energy as classifier
+        case 1: // Use last column as classifier or for regression
         case 2:
+        case 3:
             for (Int_t j=0; j<nrows; j++)
                 mat(j, ncols-nobs) = matrixtrain.GetM()(j,ncols-1);
@@ -176 +188 @@
         rf.SetNumTry(fNumTry);
         rf.SetNdSize(fNdSize);
-        rf.SetClassify(ver<2 ? 1 : 0);
+        rf.SetClassify(ver<3 ? kTRUE : kFALSE);
         if (ver==1)
             rf.SetGrid(grid);

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h

@@ -65 +65 @@
 
     // Train Interface
-    Int_t Train(const MHMatrix &n, const TArrayD &grid, Int_t ver=2);
+    Int_t Train(const MHMatrix &n, const TArrayD &grid, Int_t ver);
 
 public:
@@ -87 +87 @@
     Int_t TrainMultiRF(const MHMatrix &n, const TArrayD &grid)
     {
+        // One yes/no-classification forest is trained for each bin
         return Train(n, grid, 0);
     }
     Int_t TrainSingleRF(const MHMatrix &n, const TArrayD &grid=TArrayD())
     {
+        // w/o Grid: Last Column contains classifier
+        // w/  Grid: Last Column will be converted by grid into classifier
         return Train(n, grid, grid.GetSize()==0 ? 2 : 1);
+    }
+    Int_t TrainRegression(const MHMatrix &n)
+    {
+        // Use last column for regression
+        return Train(n, TArrayD(), 3);
     }
 

trunk/MagicSoft/Mars/mranforest/MRanTree.cc

@@ -49 +49 @@
 // Default constructor.
 //
-MRanTree::MRanTree(const char *name, const char *title):fClassify(1),fNdSize(0), fNumTry(3)
+MRanTree::MRanTree(const char *name, const char *title):fClassify(kTRUE),fNdSize(0), fNumTry(3)
 {
 

trunk/MagicSoft/Mars/mranforest/MRanTree.h

@@ -22 +22 @@
 {
 private:
-    Int_t fClassify;
+    Bool_t fClassify;
+
     Int_t fNdSize;
     Int_t fNumTry;
@@ -88 +89 @@
     Float_t GetGiniDec(Int_t i)  const { return fGiniDec.At(i); }
 
-    void SetClassify(Int_t n){ fClassify=n; }
+    void SetClassify(Bool_t n){ fClassify=n; }
 
     // functions used in tree growing process