Changeset 7725 for trunk/MagicSoft/Mars

Timestamp:

05/22/06 14:42:06 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mranforest/MRanTree.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/05/22 Thomas Bretz
+
+   * mranforest/MRanTree.cc:
+     - replaced some arbitrary small and large values by FLT_MAX in
+       FindBestSpllit*
+     - replaced in FindBestSpllit* a sanity check for rld and rrd (do
+       not divide by zero) by a check whether the result (crit) is finite
+
+
 
  2006/05/21 Thomas Bretz

trunk/MagicSoft/Mars/mranforest/MRanTree.cc

@@ -207 +207 @@
         MArrayF wr(tclasspop);  // right node//nclass
 
-        Double_t critvar=-1.0e20;
+        Double_t critvar=-FLT_MAX;
         for(Int_t nsp=ndstart;nsp<=ndend-1;nsp++)
         {
@@ -248 +248 @@
 
             // If crit starts to become pretty large do WHAT???
-            if (TMath::Min(rrd,rld)<=1.0e-5) // FIXME: CHECKIT FOR WEIGHTS!
+            //if (TMath::Min(rrd,rld)<=1.0e-5) // FIXME: CHECKIT FOR WEIGHTS!
+            //    continue;
+
+            const Double_t crit=(rln/rld)+(rrn/rrd);
+            if (TMath::Finite(crit))
                 continue;
-
-            const Double_t crit=(rln/rld)+(rrn/rrd);
 
             // Search for the highest value of crit
@@ -320 +322 @@
     // start main loop through variables to find best split,
 
-    Double_t critmin=1.0e40;
+    Double_t critmin=FLT_MAX;
 
     // random split selection, number of trials = fNumTry
@@ -399 +401 @@
                 continue;
 
-            if (TMath::Min(rrd,rld)<=1.0e-5)
+            //if (TMath::Min(rrd,rld)<=1.0e-5)
+            //    continue;
+
+            const Double_t crit=(rln/rld)+(rrn/rrd);
+            if (TMath::Finite(crit))
                 continue;
-
-            const Double_t crit=(rln/rld)+(rrn/rrd);
 
             if (crit>=critvar) continue;