Changeset 2213

Timestamp:

06/24/08 09:53:55 (4 years ago)

Author:

leo

Message:

 

Location:

sandbox/trunk/AdaBoost/src/org/xerial

Files:

• mining/adaboost/AdaBoost.java (modified) (4 diffs)
• mining/adaboost/WeakClassifier.java (modified) (2 diffs)
• util/log/Logger.java (modified) (1 diff)

sandbox/trunk/AdaBoost/src/org/xerial/mining/adaboost/AdaBoost.java

@@ -168 +168 @@
         List<Classifier> classifierList = prepareWeakClassifier(trainingDataFile);
 
-        _logger.trace("num learner:" + classifierList.size());
-        _logger.trace("learner:" + classifierList);
+        _logger.trace("# of classifiers:" + classifierList.size());
+        _logger.trace("classifiers:" + classifierList);
 
         // read the test data
@@ -194 +194 @@
             }
 
-            _logger.trace("sample: " + i + "\tfinal=" + finalPrediction + "\tlowerBound =" + lowerBound);
+            _logger.trace(String.format("sample %2d: finalPrediction=%2.3f, lowerBound=%2.3f", i, finalPrediction,
+                    lowerBound));
 
             // if the final prediction value is greater than or equal to the lower bound, use the 
@@ -203 +204 @@
         }
 
-        _logger.trace(prediction);
+        _logger.trace("prediction result: " + prediction);
 
         // report the prediction
@@ -211 +212 @@
         }
     }
-
 }

sandbox/trunk/AdaBoost/src/org/xerial/mining/adaboost/WeakClassifier.java

@@ -133 +133 @@
         bestClassifier.isValid = true;
 
-        _logger.trace("classifier: " + bestClassifier.toString() + " error= " + bestClassifier.getErrorRatio()
+        _logger.trace("best classifier: " + bestClassifier.toString() + " error= " + bestClassifier.getErrorRatio()
                 + ", beta= " + bestClassifier.getBetaValue());
 
@@ -187 +187 @@
     public String toString()
     {
-        return "col=" + testColumnIndex + " on " + returnsTrueWhenTestIsTrue;
+        return String.format("(col=%d is %s => true)", testColumnIndex, returnsTrueWhenTestIsTrue);
     }
 }

sandbox/trunk/AdaBoost/src/org/xerial/util/log/Logger.java

@@ -259 +259 @@
         try
         {
-            logOut.write("[");
-            logOut.write(logLevel.toString());
-            logOut.write("]");
-            logOut.write("<");
-            logOut.write(_loggerShortName);
-            logOut.write(">\t");
+            logOut.write("[" + _loggerShortName + "]\t");
+            //logOut.write(String.format("%5s", logLevel.toString()));
+            //logOut.write(" [");
+            //logOut.write(_loggerShortName);
+            //logOut.write("]\t");
             if (message != null)
                 logOut.write(message.toString());