Changeset 7685 for trunk

Timestamp:

05/03/06 11:54:00 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MTaskList.cc (modified) (2 diffs)
• mbase/MTaskList.h (modified) (1 diff)
• mranforest/MRanForest.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -318 +318 @@
 // for one of the tasks
 //
-Bool_t MTaskList::AddToList(const TList &list)
+Bool_t MTaskList::AddToList(const TList &list, const char *tType)
 {
     TIter Next(&list);
@@ -330 +330 @@
         }
 
-        if (!AddToList(obj))
+        if (!AddToList(static_cast<MTask*>(obj), tType))
             return kFALSE;
     }

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -47 +47 @@
     Bool_t AddToListAfter(MTask *task, const MTask *where, const char *tType="All");
     Bool_t AddToList(MTask *task, const char *tType="All");
-    Bool_t AddToList(const TList &list);
+    Bool_t AddToList(const TList &list, const char *tType="All");
 
     void SetSerialNumber(Byte_t num);

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -331 +331 @@
     fDataRang.Reset(0);
 
-    if(fWeight.GetSize()!=numdata)
+    Bool_t useweights = fWeight.GetSize()==numdata;
+    if (!useweights)
     {
         fWeight.Set(numdata);
@@ -390 +391 @@
     *fLog << inf << endl;
     *fLog << "Following input for the tree growing are used:"<<endl;
+    *fLog << " Forest type     : "<<(fClassify?"classification":"regression")<<endl;
     *fLog << " Number of Trees : "<<fNumTrees<<endl;
     *fLog << " Number of Trials: "<<(fNumTry==0?tryest:fNumTry)<<(fNumTry==0?" (auto)":"")<<endl;
     *fLog << " Final Node size : "<<fNdSize<<endl;
     *fLog << " Using Grid      : "<<(fGrid.GetSize()>0?"Yes":"No")<<endl;
-    *fLog << " Using Weights   : "<<(fWeight.GetSize()>0?"Yes":"No")<<endl;
+    *fLog << " Using Weights   : "<<(useweights?"Yes":"No")<<endl;
     *fLog << " Number of Events: "<<numdata<<endl;
     *fLog << " Number of Params: "<<dim<<endl;