You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2010/04/06 19:09:46 UTC
svn commit: r931230 - in /lucene/mahout/trunk:
core/src/main/java/org/apache/mahout/clustering/
core/src/main/java/org/apache/mahout/clustering/dirichlet/models/
core/src/main/java/org/apache/mahout/df/mapred/inmem/
core/src/main/java/org/apache/mahout...
Author: srowen
Date: Tue Apr 6 17:09:46 2010
New Revision: 931230
URL: http://svn.apache.org/viewvc?rev=931230&view=rev
Log:
Make String.format() calls, aside from those used in log statements, specify a Locale for consistent behavior.
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/Split.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java Tue Apr 6 17:09:46 2010
@@ -22,6 +22,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.Iterator;
+import java.util.Locale;
import org.apache.hadoop.io.Writable;
import org.apache.mahout.math.JsonVectorAdapter;
@@ -152,13 +153,13 @@ public abstract class ClusterBase implem
} else {
buf.append(i).append(':');
}
- buf.append(String.format("%.3f", elem)).append(", ");
+ buf.append(String.format(Locale.ENGLISH, "%.3f", elem)).append(", ");
}
} else {
buf.append('[');
for (int i = 0; i < v.size(); i++) {
double elem = v.get(i);
- buf.append(String.format("%.3f", elem)).append(", ");
+ buf.append(String.format(Locale.ENGLISH, "%.3f", elem)).append(", ");
}
}
buf.setLength(buf.length() - 2);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java Tue Apr 6 17:09:46 2010
@@ -21,6 +21,7 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Type;
+import java.util.Locale;
import org.apache.mahout.clustering.ClusterBase;
import org.apache.mahout.clustering.dirichlet.JsonModelAdapter;
@@ -138,7 +139,7 @@ public class NormalModel implements Mode
if (mean != null) {
buf.append(ClusterBase.formatVector(mean, bindings));
}
- buf.append(" sd=").append(String.format("%.2f", stdDev)).append('}');
+ buf.append(" sd=").append(String.format(Locale.ENGLISH, "%.2f", stdDev)).append('}');
return buf.toString();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalModel.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalModel.java Tue Apr 6 17:09:46 2010
@@ -17,6 +17,8 @@
package org.apache.mahout.clustering.dirichlet.models;
+import java.util.Locale;
+
import org.apache.mahout.clustering.ClusterBase;
import org.apache.mahout.math.Vector;
@@ -52,7 +54,7 @@ public class SampledNormalModel extends
if (getMean() != null) {
buf.append(ClusterBase.formatVector(getMean(), bindings));
}
- buf.append(" sd=").append(String.format("%.2f", getStdDev())).append('}');
+ buf.append(" sd=").append(String.format(Locale.ENGLISH, "%.2f", getStdDev())).append('}');
return buf.toString();
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java Tue Apr 6 17:09:46 2010
@@ -20,6 +20,7 @@ package org.apache.mahout.df.mapred.inme
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.util.Locale;
import java.util.Random;
import org.apache.hadoop.conf.Configuration;
@@ -250,7 +251,7 @@ public class InMemInputFormat implements
@Override
public String toString() {
- return String.format("[firstId:%d, nbTrees:%d, seed:%d]", firstId,
+ return String.format(Locale.ENGLISH, "[firstId:%d, nbTrees:%d, seed:%d]", firstId,
nbTrees, seed);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java Tue Apr 6 17:09:46 2010
@@ -22,6 +22,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.Random;
import org.apache.hadoop.conf.Configuration;
@@ -258,7 +259,7 @@ public class InMemInputFormat extends In
@Override
public String toString() {
- return String.format("[firstId:%d, nbTrees:%d, seed:%d]", firstId, nbTrees, seed);
+ return String.format(Locale.ENGLISH, "[firstId:%d, nbTrees:%d, seed:%d]", firstId, nbTrees, seed);
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/Split.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/Split.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/Split.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/Split.java Tue Apr 6 17:09:46 2010
@@ -17,6 +17,8 @@
package org.apache.mahout.df.split;
+import java.util.Locale;
+
/**
* Contains enough information to identify each split
*/
@@ -43,6 +45,6 @@ public class Split {
@Override
public String toString() {
- return String.format("attr: %d, ig: %f, split: %f", attr, ig, split);
+ return String.format(Locale.ENGLISH, "attr: %d, ig: %f, split: %f", attr, ig, split);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java Tue Apr 6 17:09:46 2010
@@ -19,6 +19,7 @@ package org.apache.mahout.df.tools;
import java.io.File;
import java.io.IOException;
+import java.util.Locale;
import java.util.Random;
import java.util.Scanner;
@@ -138,7 +139,7 @@ public class UDistrib {
Path[] partPaths = new Path[numPartitions];
FSDataOutputStream[] files = new FSDataOutputStream[numPartitions];
for (int p = 0; p < numPartitions; p++) {
- partPaths[p] = new Path(partsPath, String.format("part.%03d", p));
+ partPaths[p] = new Path(partsPath, String.format(Locale.ENGLISH, "part.%03d", p));
files[p] = pfs.create(partPaths[p]);
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java Tue Apr 6 17:09:46 2010
@@ -20,6 +20,7 @@ package org.apache.mahout.df.mapred.part
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.util.Locale;
import java.util.Random;
import org.apache.hadoop.fs.FileSystem;
@@ -113,7 +114,7 @@ public class PartitionBugTest extends Ma
return;
}
- assertEquals(String.format("treeId: %d, InstanceId: %d, Prediction: %d",
+ assertEquals(String.format(Locale.ENGLISH, "treeId: %d, InstanceId: %d, Prediction: %d",
treeId, instanceId, prediction), data.get(instanceId).label, prediction);
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java Tue Apr 6 17:09:46 2010
@@ -20,6 +20,7 @@ package org.apache.mahout.df.mapreduce.p
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.util.Locale;
import java.util.Random;
import org.apache.hadoop.conf.Configuration;
@@ -110,7 +111,7 @@ public class PartitionBugTest extends Ma
return;
}
- assertEquals(String.format("treeId: %d, InstanceId: %d, Prediction: %d",
+ assertEquals(String.format(Locale.ENGLISH, "treeId: %d, InstanceId: %d, Prediction: %d",
treeId, instanceId, prediction), data.get(instanceId).label, prediction);
}
Modified: lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java?rev=931230&r1=931229&r2=931230&view=diff
==============================================================================
--- lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java (original)
+++ lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java Tue Apr 6 17:09:46 2010
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import junit.framework.Assert;
@@ -164,7 +165,7 @@ public class TestL1ModelClustering exten
if (i > nextIx) {
buf.append("..{").append(i).append("}=");
}
- buf.append(String.format("%.2f", elem)).append(", ");
+ buf.append(String.format(Locale.ENGLISH, "%.2f", elem)).append(", ");
nextIx = i + 1;
}
buf.append(']');