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

Timestamp:

07/29/03 13:18:57 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mranforest/MRanForest.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -103 +103 @@
     Int_t ntree=0;
 
-    TIter forest(fForest);
+    TIter Next(fForest);
 
     MRanTree *tree;
-    while ((tree=(MRanTree*)forest.Next()))
+    while ((tree=(MRanTree*)Next()))
     {
         fTreeHad[ntree]=tree->TreeHad(event);
@@ -112 +112 @@
         ntree++;
     }
-    return hadroness/Double_t(ntree);
+    return hadroness/ntree;
 }
 
@@ -190 +190 @@
 Bool_t MRanForest::GrowForest()
 {
-    Int_t ninbag=0;
-    TArrayI datsortinbag;
-    TArrayF classpopw;
-    TArrayI jinbag;
-    TArrayF winbag;
-
-    jinbag.Set(fNumData);
-    winbag.Set(fNumData);
-    classpopw.Set(2);
-
-    TMatrix hadrons=fHadrons->GetM();
-    TMatrix gammas=fGammas->GetM();
+    if(!gRandom)
+    {
+        *fLog << err << dbginf << "gRandom not initialized... aborting." << endl;
+        return kFALSE;
+    }
 
     fTreeNo++;
 
     // initialize running output
-    if(fTreeNo==1)
-    {
-        cout<<endl<<endl<<"1st col.: no. of tree"<<endl;
-        cout<<"2nd col.: error in % (calulated using oob-data -> overestim. of error)"<<endl;
-    }
-
-    jinbag.Reset();
-    classpopw.Reset();
-    winbag.Reset();
+    if (fTreeNo==1)
+    {
+        *fLog << inf << endl;
+        *fLog << underline; // << "1st col        2nd col" << endl;
+        *fLog << "no. of tree    error in % (calulated using oob-data -> overestim. of error)" << endl;
+    }
+
+    TArrayF classpopw(2);
+    TArrayI jinbag(fNumData); // Initialization includes filling with 0
+    TArrayF winbag(fNumData); // Initialization includes filling with 0
 
     // bootstrap aggregating (bagging) -> sampling with replacement:
@@ -221 +215 @@
     // {0,1,...,fNumData-1}, which is the set of the index numbers of
     // all events in the training sample
-
-    for (Int_t n=0;n<fNumData;n++)
-    {
-        if(!gRandom)
-        {
-            *fLog << err << dbginf << "gRandom not initialized... aborting." << endl;
-            return kFALSE;
-        }
-
-        Int_t k=Int_t(fNumData*gRandom->Rndm());
+    for (Int_t n=0; n<fNumData; n++)
+    {
+        const Int_t k = Int_t(gRandom->Rndm()*fNumData);
 
         classpopw[fHadTrue[k]]+=fWeight[k];
@@ -241 +228 @@
     // In bagging procedure ca. 2/3 of all elements in the original
     // training sample are used to build the in-bag data
-    datsortinbag=fDataSort;
-
-    ModifyDataSort(datsortinbag,ninbag,jinbag);
+    TArrayI datsortinbag=fDataSort;
+    Int_t ninbag=0;
+
+    ModifyDataSort(datsortinbag, ninbag, jinbag);
+
+    const TMatrix &hadrons=fHadrons->GetM();
+    const TMatrix &gammas =fGammas->GetM();
 
     // growing single tree
@@ -258 +249 @@
     // determined from oob-data is underestimated, but can still be taken as upper limit.
 
-    TVector event(fNumDim);
-    for(Int_t ievt=0;ievt<fNumHad;ievt++)
-    {
-        if(jinbag[ievt]>0)continue;
-        event=TMatrixRow(hadrons,ievt);
-        fHadEst[ievt]+=fRanTree->TreeHad(event);
+    for (Int_t ievt=0;ievt<fNumHad;ievt++)
+    {
+        if (jinbag[ievt]>0)
+            continue;
+        fHadEst[ievt] += fRanTree->TreeHad(hadrons, ievt);
         fNTimesOutBag[ievt]++;
     }
-    for(Int_t ievt=0;ievt<fNumGam;ievt++)
-    {
-        if(jinbag[fNumHad+ievt]>0)continue;
-        event=TMatrixRow(gammas,ievt);
-        fHadEst[fNumHad+ievt]+=fRanTree->TreeHad(event);
+    for (Int_t ievt=0;ievt<fNumGam;ievt++)
+    {
+        if (jinbag[fNumHad+ievt]>0)
+            continue;
+        fHadEst[fNumHad+ievt] += fRanTree->TreeHad(gammas, ievt);
         fNTimesOutBag[fNumHad+ievt]++;
     }
 
     Int_t n=0;
-    fErr=0;
-    for(Int_t ievt=0;ievt<fNumData;ievt++)
-        if(fNTimesOutBag[ievt]!=0)
+    Double_t ferr=0;
+    for (Int_t ievt=0;ievt<fNumData;ievt++)
+        if (fNTimesOutBag[ievt]!=0)
         {
-            fErr+=TMath::Power(fHadEst[ievt]/fNTimesOutBag[ievt]-fHadTrue[ievt],2.);
+            const Double_t val = fHadEst[ievt]/fNTimesOutBag[ievt]-fHadTrue[ievt];
+            ferr += val*val;
             n++;
         }
 
-    fErr/=Float_t(n);
-    fErr=TMath::Sqrt(fErr);
+    ferr = TMath::Sqrt(ferr/n);
 
     // give running output
-    cout << setw(5) << fTreeNo << setw(15) << Form("%.2f",100.*fErr) << endl;
+    *fLog << inf << setw(5) << fTreeNo << Form("%15.2f", ferr*100) << endl;
 
     // adding tree to forest
     AddTree();
 
-    return(fTreeNo<fNumTrees);
+    return fTreeNo<fNumTrees;
 }
 
@@ -315 +305 @@
     TArrayI isort(fNumData);
 
-    TMatrix hadrons=fHadrons->GetM();
-    TMatrix gammas=fGammas->GetM();
+    const TMatrix &hadrons=fHadrons->GetM();
+    const TMatrix &gammas=fGammas->GetM();
 
     for (Int_t j=0;j<fNumHad;j++)
@@ -346 +336 @@
         for(Int_t n=0;n<fNumData-1;n++)
         {
-            Int_t n1=isort[n];
-            Int_t n2=isort[n+1];
+            const Int_t n1=isort[n];
+            const Int_t n2=isort[n+1];
+
             fDataSort[mvar*fNumData+n]=n1;
             if(n==0) fDataRang[mvar*fNumData+n1]=0;
@@ -359 +350 @@
         fDataSort[(mvar+1)*fNumData-1]=isort[fNumData-1];
     }
-
-    return;
-}
-
-void MRanForest::ModifyDataSort(TArrayI &datsortinbag,Int_t ninbag,TArrayI &jinbag)
+}
+
+void MRanForest::ModifyDataSort(TArrayI &datsortinbag, Int_t ninbag, const TArrayI &jinbag)
 {
     ninbag=0;
@@ -394 +383 @@
         }
     }
-    return;
 }