Changeset 7420 for trunk/MagicSoft/Mars/mranforest/MRanForest.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mranforest/MRanForest.cc (modified) (7 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();