Author: srowen
Date: Mon Nov 7 08:44:59 2011
New Revision: 1198651
URL: http://svn.apache.org/viewvc?rev=1198651&view=rev
Log:
Guard expensive debug statements with a check
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/BuildForest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/cdbw/CDbwEvaluator.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
Mon Nov 7 08:44:59 2011
@@ -152,13 +152,17 @@ public class CanopyClusterer {
for (Canopy canopy : canopies) {
double dist = measure.distance(canopy.getCenter().getLengthSquared(),
canopy.getCenter(), point);
if (dist < t1) {
- log.debug("Added point: {} to canopy: {}",
AbstractCluster.formatVector(point, null), canopy.getIdentifier());
+ if (log.isDebugEnabled()) {
+ log.debug("Added point: {} to canopy: {}",
AbstractCluster.formatVector(point, null), canopy.getIdentifier());
+ }
canopy.observe(point);
}
pointStronglyBound = pointStronglyBound || dist < t2;
}
if (!pointStronglyBound) {
- log.debug("Created new Canopy:{} at center:{}", nextCanopyId,
AbstractCluster.formatVector(point, null));
+ if (log.isDebugEnabled()) {
+ log.debug("Created new Canopy:{} at center:{}", nextCanopyId,
AbstractCluster.formatVector(point, null));
+ }
canopies.add(new Canopy(point, nextCanopyId++, measure));
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
Mon Nov 7 08:44:59 2011
@@ -276,11 +276,13 @@ public class CanopyDriver extends Abstra
try {
for (Canopy canopy : canopies) {
canopy.computeParameters();
- log.debug("Writing Canopy:{} center:{} numPoints:{} radius:{}",
- new Object[] { canopy.getIdentifier(),
- AbstractCluster.formatVector(canopy.getCenter(), null),
- canopy.getNumPoints(),
- AbstractCluster.formatVector(canopy.getRadius(), null) });
+ if (log.isDebugEnabled()) {
+ log.debug("Writing Canopy:{} center:{} numPoints:{} radius:{}",
+ new Object[] { canopy.getIdentifier(),
+ AbstractCluster.formatVector(canopy.getCenter(), null),
+ canopy.getNumPoints(),
+ AbstractCluster.formatVector(canopy.getRadius(), null) });
+ }
if (canopy.getNumPoints() > clusterFilter) {
writer.append(new Text(canopy.getIdentifier()), canopy);
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
Mon Nov 7 08:44:59 2011
@@ -382,14 +382,16 @@ public class FuzzyKMeansDriver extends A
SoftCluster.class);
try {
for (SoftCluster cluster : clusters) {
- log.debug("Writing Cluster:{} center:{} numPoints:{} radius:{} to:
{}",
- new Object[] {
- cluster.getId(),
- AbstractCluster.formatVector(cluster.getCenter(),
null),
- cluster.getNumPoints(),
- AbstractCluster.formatVector(cluster.getRadius(),
null),
- clustersOut.getName()
- });
+ if (log.isDebugEnabled()) {
+ log.debug("Writing Cluster:{} center:{} numPoints:{} radius:{} to:
{}",
+ new Object[] {
+ cluster.getId(),
+ AbstractCluster.formatVector(cluster.getCenter(),
null),
+ cluster.getNumPoints(),
+ AbstractCluster.formatVector(cluster.getRadius(),
null),
+ clustersOut.getName()
+ });
+ }
writer.append(new Text(cluster.getIdentifier()), cluster);
}
} finally {
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
Mon Nov 7 08:44:59 2011
@@ -277,13 +277,15 @@ public class KMeansDriver extends Abstra
Cluster.class);
try {
for (Cluster cluster : clusters) {
- log.debug("Writing Cluster:{} center:{} numPoints:{} radius:{} to:
{}",
- new Object[] {
- cluster.getId(),
- AbstractCluster.formatVector(cluster.getCenter(),
null),
- cluster.getNumPoints(),
- AbstractCluster.formatVector(cluster.getRadius(),
null), clustersOut.getName()
- });
+ if (log.isDebugEnabled()) {
+ log.debug("Writing Cluster:{} center:{} numPoints:{} radius:{} to:
{}",
+ new Object[] {
+ cluster.getId(),
+ AbstractCluster.formatVector(cluster.getCenter(),
null),
+ cluster.getNumPoints(),
+ AbstractCluster.formatVector(cluster.getRadius(),
null), clustersOut.getName()
+ });
+ }
writer.append(new Text(cluster.getIdentifier()), cluster);
}
} finally {
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
Mon Nov 7 08:44:59 2011
@@ -316,14 +316,16 @@ public class MeanShiftCanopyDriver exten
clustersOut, "part-r-00000"), Text.class, MeanShiftCanopy.class);
try {
for (MeanShiftCanopy cluster : clusters) {
- log.debug(
- "Writing Cluster:{} center:{} numPoints:{} radius:{} to: {}",
- new Object[] { cluster.getId(),
- AbstractCluster.formatVector(cluster.getCenter(), null),
- cluster.getNumPoints(),
- AbstractCluster.formatVector(cluster.getRadius(), null),
- clustersOut.getName() });
- writer.append(new Text(cluster.getIdentifier()), cluster);
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "Writing Cluster:{} center:{} numPoints:{} radius:{} to: {}",
+ new Object[] { cluster.getId(),
+ AbstractCluster.formatVector(cluster.getCenter(), null),
+ cluster.getNumPoints(),
+ AbstractCluster.formatVector(cluster.getRadius(), null),
+ clustersOut.getName() });
+ writer.append(new Text(cluster.getIdentifier()), cluster);
+ }
}
} finally {
Closeables.closeQuietly(writer);
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
Mon Nov 7 08:44:59 2011
@@ -206,12 +206,14 @@ public final class TransactionTree imple
node += ctree.addPattern(p.getFirst(), p.getSecond());
size += p.getFirst().size() + 2;
}
-
- log.debug("Nodes in UnCompressed Tree: {} ", nodes);
- log.debug("UnCompressed Tree Size: {}", (this.nodes * 4 * 4 +
this.childCount() * 4) / 1000000.0);
- log.debug("Nodes in Compressed Tree: {} ", node);
- log.debug("Compressed Tree Size: {}", (node * 4 * 4 + ctree.childCount() *
4) / 1000000.0);
- log.debug("TransactionSet Size: {}", size * 4 / 1000000.0);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Nodes in UnCompressed Tree: {} ", nodes);
+ log.debug("UnCompressed Tree Size: {}", (this.nodes * 4 * 4 +
this.childCount() * 4) / 1000000.0);
+ log.debug("Nodes in Compressed Tree: {} ", node);
+ log.debug("Compressed Tree Size: {}", (node * 4 * 4 + ctree.childCount()
* 4) / 1000000.0);
+ log.debug("TransactionSet Size: {}", size * 4 / 1000000.0);
+ }
if (node * 4 * 4 + ctree.childCount() * 4 <= size * 4) {
return ctree;
} else {
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/BuildForest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/BuildForest.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/BuildForest.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/BuildForest.java
Mon Nov 7 08:44:59 2011
@@ -126,14 +126,16 @@ public class BuildForest extends Configu
if (cmdLine.hasOption(seedOpt)) {
seed = Long.valueOf(cmdLine.getValue(seedOpt).toString());
}
-
- log.debug("data : {}", dataName);
- log.debug("dataset : {}", datasetName);
- log.debug("output : {}", outputName);
- log.debug("m : {}", m);
- log.debug("seed : {}", seed);
- log.debug("nbtrees : {}", nbTrees);
- log.debug("isPartial : {}", isPartial);
+
+ if (log.isDebugEnabled()) {
+ log.debug("data : {}", dataName);
+ log.debug("dataset : {}", datasetName);
+ log.debug("output : {}", outputName);
+ log.debug("m : {}", m);
+ log.debug("seed : {}", seed);
+ log.debug("nbtrees : {}", nbTrees);
+ log.debug("isPartial : {}", isPartial);
+ }
dataPath = new Path(dataName);
datasetPath = new Path(datasetName);
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java
Mon Nov 7 08:44:59 2011
@@ -118,12 +118,14 @@ public class TestForest extends Configur
analyze = cmdLine.hasOption(analyzeOpt);
useMapreduce = cmdLine.hasOption(mrOpt);
- log.debug("inout : {}", dataName);
- log.debug("dataset : {}", datasetName);
- log.debug("model : {}", modelName);
- log.debug("output : {}", outputName);
- log.debug("analyze : {}", analyze);
- log.debug("mapreduce : {}", useMapreduce);
+ if (log.isDebugEnabled()) {
+ log.debug("inout : {}", dataName);
+ log.debug("dataset : {}", datasetName);
+ log.debug("model : {}", modelName);
+ log.debug("output : {}", outputName);
+ log.debug("analyze : {}", analyze);
+ log.debug("mapreduce : {}", useMapreduce);
+ }
dataPath = new Path(dataName);
datasetPath = new Path(datasetName);
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/cdbw/CDbwEvaluator.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/cdbw/CDbwEvaluator.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/cdbw/CDbwEvaluator.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/cdbw/CDbwEvaluator.java
Mon Nov 7 08:44:59 2011
@@ -321,11 +321,13 @@ public class CDbwEvaluator {
density = minDistance * interDensity / stdSum;
}
- log.debug("minDistance[{},{}]={}", new Object[] {cI, cJ, minDistance});
- log.debug("stDev[{}]={}", cI, stDevI);
- log.debug("stDev[{}]={}", cJ, stDevJ);
- log.debug("interDensity[{},{}]={}", new Object[] {cI, cJ,
interDensity});
- log.debug("density[{},{}]={}", new Object[] {cI, cJ, density});
+ if (log.isDebugEnabled()) {
+ log.debug("minDistance[{},{}]={}", new Object[] {cI, cJ,
minDistance});
+ log.debug("stDev[{}]={}", cI, stDevI);
+ log.debug("stDev[{}]={}", cJ, stDevJ);
+ log.debug("interDensity[{},{}]={}", new Object[] {cI, cJ,
interDensity});
+ log.debug("density[{},{}]={}", new Object[] {cI, cJ, density});
+ }
sum += density;
}
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java?rev=1198651&r1=1198650&r2=1198651&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java
Mon Nov 7 08:44:59 2011
@@ -124,7 +124,9 @@ public final class RepresentativePointsD
SequenceFile.Writer writer = new SequenceFile.Writer(fs, conf, path,
IntWritable.class, VectorWritable.class);
try {
for (Cluster value : new SequenceFileValueIterable<Cluster>(inPart,
true, conf)) {
- log.debug("C-{}: {}", value.getId(),
AbstractCluster.formatVector(value.getCenter(), null));
+ if (log.isDebugEnabled()) {
+ log.debug("C-{}: {}", value.getId(),
AbstractCluster.formatVector(value.getCenter(), null));
+ }
writer.append(new IntWritable(value.getId()), new
VectorWritable(value.getCenter()));
}
} finally {
