Changeset 7424 for trunk

Timestamp:

11/22/05 16:42:11 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mranforest/MRanForest.cc (modified) (3 diffs)
• mranforest/MRanForest.h (modified) (2 diffs)
• mranforest/MRanForestCalc.cc (modified) (1 diff)
• mranforest/MRanTree.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
      - improved handling of allocated memory (still to be checked
        further)
+     - added Print function
 
    * mranforest/MRanForestCalc.[h,cc]:
@@ -44 +45 @@
      - set version number to 1 to allow writing it to ganymed output
      - added Print function
+     - Use GetEntriesFast and UncheckedAt in Process for
+       single tree forests
 
    * mranforest/MRanTree.[h,cc]:
      - replaced type of fClassify by Bool_t
+     - added Getter for fClassify
 
    * mjtrain/MJTrainDisp.cc, mjtrain/MJTrainEnegry.cc:

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -133 +133 @@
 }
 
-MRanTree *MRanForest::GetTree(Int_t i)
-{
-    return (MRanTree*)(fForest->At(i));
+void MRanForest::Print(Option_t *o) const
+{
+    *fLog << inf << GetDescriptor() << ": " << endl;
+    MRanTree *t = GetTree(0);
+    if (t)
+    {
+        *fLog << "Setting up RF for training on target:" << endl;
+        *fLog << " " << t->GetTitle() << endl;
+    }
+    if (fRules)
+    {
+        *fLog << "Following rules are used as input to RF:" << endl;
+        for (Int_t i=0;i<fRules->GetNumEntries();i++)
+            *fLog << " " << i << ") " << (*fRules)[i].GetRule() << endl;
+    }
+    *fLog << "Random forest parameters:" << endl;
+    if (t)
+    {
+        *fLog << " - " << (t->IsClassify()?"classification":"regression") << " tree" << endl;
+        *fLog << " - Number of trys: " << t->GetNumTry() << endl;
+        *fLog << " - Node size: " << t->GetNdSize() << endl;
+    }
+    *fLog << " - Number of trees: " << fNumTrees << endl;
+    *fLog << " - User value: " << fUserVal << endl;
+    *fLog << endl;
 }
 
@@ -335 +357 @@
     for (Int_t i=0;i<dim;i++)
         *fLog << " " << i << ") " << (*fRules)[i].GetRule() << endl;
-
     *fLog << endl;
 
@@ -351 +372 @@
         return kFALSE;
     }
+    fRanTree->SetName(target_rule);
 
     const Int_t tryest = TMath::Nint(TMath::Sqrt(dim));

trunk/MagicSoft/Mars/mranforest/MRanForest.h

@@ -73 +73 @@
     MRanForest(const char *name=NULL, const char *title=NULL);
     MRanForest(const MRanForest &rf);
+    ~MRanForest();
 
-    ~MRanForest();
+    void Print(Option_t *o="") const; //*MENU*
 
     void SetGrid(const TArrayD &grid);
@@ -94 +95 @@
 
     // getter methods
-    TObjArray  *GetForest()      { return fForest; }
-    MRanTree   *GetCurTree()     { return fRanTree; }
-    MRanTree   *GetTree(Int_t i);
-    MDataArray *GetRules()       { return fRules; }
+    TObjArray  *GetForest() const      { return fForest; }
+    MRanTree   *GetCurTree() const     { return fRanTree; }
+    MRanTree   *GetTree(Int_t i) const { return static_cast<MRanTree*>(fForest->UncheckedAt(i)); }
+    MDataArray *GetRules() const       { return fRules; }
 
 

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -309 +309 @@
 
     // --------------- Single Tree RF -------------------
-    if (fEForests.GetEntries()==1)
-    {
-        MRanForest *rf = (MRanForest*)fEForests[0];
+    if (fEForests.GetEntriesFast()==1)
+    {
+        MRanForest *rf = static_cast<MRanForest*>fEForests.UncheckedAt(0);
         fRFOut->SetVal(rf->CalcHadroness(event));
         fRFOut->SetReadyToSave();

trunk/MagicSoft/Mars/mranforest/MRanTree.h

@@ -78 +78 @@
     Int_t GetNumNodes()          const { return fNumNodes; }
     Int_t GetNumEndNodes()       const { return fNumEndNodes; }
+    Int_t IsClassify() const { return fClassify; }
     Float_t GetError() const { return fError; }