Changeset 2307 for trunk/MagicSoft/Mars/mranforest

Timestamp:

08/20/03 11:37:37 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanTree.cc (modified) (4 diffs)
• MRanTree.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mranforest/MRanTree.cc

@@ -140 +140 @@
                               const TArrayF &winbag)
 {
-    if(!gRandom)
-    {
-        *fLog << err << dbginf << "gRandom not initialized... aborting." << endl;
-        return kFALSE;
-    }
-
     const Int_t nrnodes = fBestSplit.GetSize();
     const Int_t numdata = (nrnodes-1)/2;
@@ -182 +176 @@
     for(Int_t mt=0;mt<fNumTry;mt++)
     {
-        Int_t mvar=Int_t(gRandom->Rndm()*mdim);
+        const Int_t mvar=Int_t(gRandom->Rndm()*mdim);
+        const Int_t mn  = mvar*numdata;
 
         // Gini index = rrn/rrd+rln/rld
@@ -197 +192 @@
         for(Int_t nsp=ndstart;nsp<=ndend-1;nsp++)
         {
-            const Int_t &nc=datasort[mvar*numdata+nsp];
+            const Int_t &nc=datasort[mn+nsp];
             const Int_t &k=hadtrue[nc];
 
@@ -210 +205 @@
             wr[k]-=u;
 
-            if (datarang[mvar*numdata+nc]>=datarang[mvar*numdata+datasort[mvar*numdata+nsp+1]])
+            if (datarang[mn+nc]>=datarang[mn+datasort[mn+nsp+1]])
                 continue;
             if (TMath::Min(rrd,rld)<=1.0e-5)

trunk/MagicSoft/Mars/mranforest/MRanTree.h

@@ -37 +37 @@
     TArrayF fGiniDec;
 
+    Int_t FindBestSplit(const TArrayI &datasort, const TArrayI &datarang,
+                        const TArrayI &hadtrue,
+                        Int_t ndstart, Int_t ndend, TArrayF &tclasspop,
+                        Int_t &msplit, Float_t &decsplit, Int_t &nbest,
+                        const TArrayF &winbag);
+
+    void MoveData(TArrayI &datasort, Int_t ndstart, Int_t ndend,
+                  TArrayI &idmove, TArrayI &ncase, Int_t msplit,
+                  Int_t nbest, Int_t &ndendl);
+
+    void BuildTree(TArrayI &datasort, const TArrayI &datarang,
+                   const TArrayI &hadtrue,
+                   TArrayI &bestsplit,TArrayI &bestsplitnext,
+                   TArrayF &tclasspop,
+                   const TArrayF &winbag,
+                   Int_t ninbag);
+
 public:
     MRanTree(const char *name=NULL, const char *title=NULL);
@@ -66 +83 @@
                   TArrayF &tclasspop, TArrayI &jinbag, const TArrayF &winbag);
 
-    Int_t FindBestSplit(const TArrayI &datasort, const TArrayI &datarang,
-                        const TArrayI &hadtrue,
-                        Int_t ndstart, Int_t ndend, TArrayF &tclasspop,
-                        Int_t &msplit, Float_t &decsplit, Int_t &nbest,
-                        const TArrayF &winbag);
-
-    void MoveData(TArrayI &datasort, Int_t ndstart, Int_t ndend,
-                  TArrayI &idmove, TArrayI &ncase, Int_t msplit,
-                  Int_t nbest, Int_t &ndendl);
-
-    void BuildTree(TArrayI &datasort, const TArrayI &datarang,
-                   const TArrayI &hadtrue,
-                   TArrayI &bestsplit,TArrayI &bestsplitnext,
-                   TArrayF &tclasspop,
-                   const TArrayF &winbag,
-                   Int_t ninbag);
-
     Double_t TreeHad(const TVector &event);
     Double_t TreeHad(const TMatrixRow &event);