Changeset 7693 for trunk/MagicSoft/Mars/mranforest/MRanTree.h

Timestamp:

05/05/06 07:46:50 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mranforest/MRanTree.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mranforest/MRanTree.h

@@ -19 +19 @@
 class TRandom;
 
+class MArrayI;
+class MArrayF;
+
 class MRanTree : public MParContainer
 {
@@ -38 +41 @@
 
     int (MRanTree::*FindBestSplit)
-        (const TArrayI &, const TArrayI &, const TArrayF &, const TArrayI &,
-         Int_t, Int_t , TArrayF &, float &, float &, Int_t &, Float_t &,
-         Int_t &, const TArrayF &, const int); //!
+        (const MArrayI &, const MArrayI &, const MArrayF &, const MArrayI &,
+         Int_t, Int_t , const MArrayF &, const Float_t &, const Float_t &, Int_t &, Float_t &,
+         Int_t &, const MArrayF &, const int); //!
 
 
-    int FindBestSplitGini(const TArrayI &datasort, const TArrayI &datarang,
-                          const TArrayF &hadtrue, const TArrayI &idclass,
-                          Int_t ndstart, Int_t ndend, TArrayF &tclasspop,
-                          float &mean, float &square, Int_t &msplit,
-                          Float_t &decsplit, Int_t &nbest, const TArrayF &winbag,
+    int FindBestSplitGini(const MArrayI &datasort, const MArrayI &datarang,
+                          const MArrayF &hadtrue, const MArrayI &idclass,
+                          Int_t ndstart, Int_t ndend, const MArrayF &tclasspop,
+                          const Float_t &mean, const Float_t &square, Int_t &msplit,
+                          Float_t &decsplit, Int_t &nbest, const MArrayF &winbag,
                           const int nclass);
 
-    int FindBestSplitSigma(const TArrayI &datasort, const TArrayI &datarang,
-                           const TArrayF &hadtrue, const TArrayI &idclass,
-                           Int_t ndstart, Int_t ndend, TArrayF &tclasspop,
-                           float &mean, float &square, Int_t &msplit,
-                           Float_t &decsplit, Int_t &nbest, const TArrayF &winbag,
+    int FindBestSplitSigma(const MArrayI &datasort, const MArrayI &datarang,
+                           const MArrayF &hadtrue, const MArrayI &idclass,
+                           Int_t ndstart, Int_t ndend, const MArrayF &tclasspop,
+                           const Float_t &mean, const Float_t &square, Int_t &msplit,
+                           Float_t &decsplit, Int_t &nbest, const MArrayF &winbag,
                            const int nclass);
 
-    void MoveData(TArrayI &datasort, Int_t ndstart, Int_t ndend,
-                  TArrayI &idmove, TArrayI &ncase, Int_t msplit,
+    void MoveData(MArrayI &datasort, Int_t ndstart, Int_t ndend,
+                  MArrayI &idmove, MArrayI &ncase, Int_t msplit,
                   Int_t nbest, Int_t &ndendl);
 
-    void BuildTree(TArrayI &datasort, const TArrayI &datarang, const TArrayF &hadtrue,
-                   const TArrayI &idclass,TArrayI &bestsplit,TArrayI &bestsplitnext,
-                   TArrayF &tclasspop, float &tmean, float &tsquare, const TArrayF &winbag,
+    void BuildTree(MArrayI &datasort, const MArrayI &datarang, const MArrayF &hadtrue,
+                   const MArrayI &idclass,MArrayI &bestsplit,MArrayI &bestsplitnext,
+                   MArrayF &tclasspop, const Float_t &tmean, const Float_t &tsquare, const MArrayF &winbag,
                    Int_t ninbag, const int nclass);
 
@@ -93 +96 @@
 
     // functions used in tree growing process
-    void GrowTree(TMatrix *mat, const TArrayF &hadtrue, const TArrayI &idclass,
-                  TArrayI &datasort, const TArrayI &datarang,TArrayF &tclasspop,
-                  float &mean, float &square, TArrayI &jinbag, const TArrayF &winbag,
+    void GrowTree(TMatrix *mat, const MArrayF &hadtrue, const MArrayI &idclass,
+                  MArrayI &datasort, const MArrayI &datarang,MArrayF &tclasspop,
+                  const Float_t &mean, const Float_t &square, const MArrayI &jinbag, const MArrayF &winbag,
                   const int nclass);