Changeset 1871 for trunk/MagicSoft

Timestamp:

03/27/03 13:42:00 (22 years ago)

Author:

hengsteb

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/RanForest.C (modified) (2 diffs)
• manalysis/MRanForest.cc (modified) (1 diff)
• manalysis/MRanTree.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/RanForest.C

@@ -103 +103 @@
 
     MRanForestGrow rfgrow2;
-    rfgrow2.SetNumTrees(50);
+    rfgrow2.SetNumTrees(10);
     rfgrow2.SetNumTry(3);
-    rfgrow2.SetNdSize(1);
+    rfgrow2.SetNdSize(10);
 
     MWriteRootFile rfwrite2("RF.root");
@@ -114 +114 @@
     tlist2.AddToList(&rfwrite2);
     tlist2.AddToList(&fillh2);
+
+    // gRandom is accessed from MRanForest (-> bootstrap aggregating)
+    // and MRanTree (-> random split selection) and should be initialized
+    // here if you want to set a certain random number generator
+    if(gRandom)
+        delete gRandom;
+    gRandom = new TRandom3(0);
 
     //

trunk/MagicSoft/Mars/manalysis/MRanForest.cc

@@ -226 +226 @@
     {
         if(!gRandom)
-            gRandom=new TRandom3(0);
+        {
+            *fLog << err << dbginf << "gRandom not initialized... aborting." << endl;
+            return kFALSE;
+        }
+
         Int_t k=Int_t(fNumData*gRandom->Rndm());
 

trunk/MagicSoft/Mars/manalysis/MRanTree.cc

@@ -41 +41 @@
 #include "MDataArray.h"
 
+#include "MLog.h"
+#include "MLogManip.h"
+
 ClassImp(MRanTree);
 
@@ -178 +181 @@
 
     // random split selection, number of trials = fNumTry
+    if(!gRandom)
+    {
+        *fLog << err << dbginf << "gRandom not initialized... aborting." << endl;
+        return kFALSE;
+    }
     for(Int_t mt=0;mt<fNumTry;mt++)
     {