Author: srowen
Date: Sat Jan 10 10:15:42 2009
New Revision: 733309
URL: http://svn.apache.org/viewvc?rev=733309&view=rev
Log:
More updates, mostly to use foreach syntax now that I am convinced there is no
actual speed advantage to avoiding it and writing out what would just be
generated otherwise.
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
Sat Jan 10 10:15:42 2009
@@ -267,8 +267,7 @@
public int intersectionSize(FastSet<?> other) {
int count = 0;
K[] otherKeys = (K[]) other.keys;
- for (int i = 0; i < otherKeys.length; i++) {
- K key = otherKeys[i];
+ for (K key : otherKeys) {
if (key != null && key != REMOVED && keys[find(key)] != null) {
count++;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java
Sat Jan 10 10:15:42 2009
@@ -101,8 +101,7 @@
List<Preference> trainingPrefs = new ArrayList<Preference>();
List<Preference> testPrefs = new ArrayList<Preference>();
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- Preference pref = prefs[i];
+ for (Preference pref : prefs) {
Item itemCopy = new
GenericItem<String>(pref.getItem().getID().toString());
Preference newPref = new GenericPreference(null, itemCopy,
pref.getValue());
if (random.nextDouble() < trainingPercentage) {
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
Sat Jan 10 10:15:42 2009
@@ -108,8 +108,7 @@
} else {
theRelevanceThreshold = relevanceThreshold;
}
- for (int i = 0; i < prefs.length; i++) {
- Preference pref = prefs[i];
+ for (Preference pref : prefs) {
if (pref.getValue() >= theRelevanceThreshold) {
relevantItems.add(pref.getItem());
}
@@ -163,8 +162,7 @@
if (id.equals(user2.getID())) {
List<Preference> trainingPrefs = new ArrayList<Preference>();
Preference[] prefs2 = user2.getPreferencesAsArray();
- for (int i = 0; i < prefs2.length; i++) {
- Preference pref = prefs2[i];
+ for (Preference pref : prefs2) {
if (!relevantItems.contains(pref.getItem())) {
trainingPrefs.add(pref);
}
@@ -184,8 +182,8 @@
return Double.NEGATIVE_INFINITY;
}
RunningAverageAndStdDev stdDev = new FullRunningAverageAndStdDev();
- for (int i = 0; i < prefs.length; i++) {
- stdDev.addDatum(prefs[i].getValue());
+ for (Preference pref : prefs) {
+ stdDev.addDatum(pref.getValue());
}
return stdDev.getAverage() + stdDev.getStandardDeviation();
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
Sat Jan 10 10:15:42 2009
@@ -74,8 +74,7 @@
for (User user : users) {
userMap.put(user.getID(), user);
Preference[] prefsArray = user.getPreferencesAsArray();
- for (int i = 0; i < prefsArray.length; i++) {
- Preference preference = prefsArray[i];
+ for (Preference preference : prefsArray) {
Item item = preference.getItem();
Object itemID = item.getID();
itemMap.put(itemID, item);
@@ -193,12 +192,12 @@
return 0;
}
Set<Object> users1 = new FastSet<Object>(prefs1.length);
- for (int i = 0; i < prefs1.length; i++) {
- users1.add(prefs1[i].getUser().getID());
+ for (Preference aPrefs1 : prefs1) {
+ users1.add(aPrefs1.getUser().getID());
}
Set<Object> users2 = new FastSet<Object>(prefs2.length);
- for (int i = 0; i < prefs2.length; i++) {
- users2.add(prefs2[i].getUser().getID());
+ for (Preference aPrefs2 : prefs2) {
+ users2.add(aPrefs2.getUser().getID());
}
users1.retainAll(users2);
return users1.size();
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
Sat Jan 10 10:15:42 2009
@@ -176,8 +176,8 @@
Collection<Item> allUserItems = new FastSet<Item>();
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- allUserItems.add(prefs[i].getItem());
+ for (Preference pref : prefs) {
+ allUserItems.add(pref.getItem());
}
allUserItems.remove(recommendedItem);
@@ -201,8 +201,7 @@
double preference = 0.0;
double totalSimilarity = 0.0;
Preference[] prefs = theUser.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- Preference pref = prefs[i];
+ for (Preference pref : prefs) {
double theSimilarity = similarity.itemSimilarity(item, pref.getItem());
if (!Double.isNaN(theSimilarity)) {
// Why + 1.0? similarity ranges from -1.0 to 1.0, and we want to use
it as a simple
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
Sat Jan 10 10:15:42 2009
@@ -158,8 +158,8 @@
Set<Item> allItems = new FastSet<Item>();
for (User user : theNeighborhood) {
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- Item item = prefs[i].getItem();
+ for (Preference pref : prefs) {
+ Item item = pref.getItem();
// If not already preferred by the user, add it
if (theUser.getPreferenceFor(item.getID()) == null) {
allItems.add(item);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java
Sat Jan 10 10:15:42 2009
@@ -127,8 +127,7 @@
DataModel dataModel = getDataModel();
for (User user : dataModel.getUsers()) {
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- Preference pref = prefs[i];
+ for (Preference pref : prefs) {
Object itemID = pref.getItem().getID();
RunningAverage average = itemAverages.get(itemID);
if (average == null) {
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java
Sat Jan 10 10:15:42 2009
@@ -141,8 +141,7 @@
for (User user : dataModel.getUsers()) {
Object userID = user.getID();
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- Preference pref = prefs[i];
+ for (Preference pref : prefs) {
Object itemID = pref.getItem().getID();
double value = pref.getValue();
addDatumAndCrateIfNeeded(itemID, value, itemAverages);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
Sat Jan 10 10:15:42 2009
@@ -384,8 +384,8 @@
Collection<Item> allItems = new FastSet<Item>();
for (User user : cluster) {
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- allItems.add(prefs[i].getItem());
+ for (Preference pref : prefs) {
+ allItems.add(pref.getItem());
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
Sat Jan 10 10:15:42 2009
@@ -467,8 +467,8 @@
Collection<Item> allItems = new FastSet<Item>();
for (User user : cluster) {
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- allItems.add(prefs[i].getItem());
+ for (Preference pref : prefs) {
+ allItems.add(pref.getItem());
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java
Sat Jan 10 10:15:42 2009
@@ -70,8 +70,8 @@
if (prefs.length == 0) {
return ZERO;
}
- for (int i = 0; i < prefs.length; i++) {
- average.addDatum(prefs[i].getValue());
+ for (Preference pref : prefs) {
+ average.addDatum(pref.getValue());
}
return average.getAverage();
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
Sat Jan 10 10:15:42 2009
@@ -105,8 +105,8 @@
int numUsers = 0;
for (User user : dataModel.getUsers()) {
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- itemPreferenceCounts.increment(prefs[i].getItem());
+ for (Preference pref : prefs) {
+ itemPreferenceCounts.increment(pref.getItem());
}
numUsers++;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java
Sat Jan 10 10:15:42 2009
@@ -77,8 +77,8 @@
public RunningAverageAndStdDev get(User user) throws TasteException {
RunningAverageAndStdDev running = new FullRunningAverageAndStdDev();
Preference[] prefs = user.getPreferencesAsArray();
- for (int i = 0; i < prefs.length; i++) {
- running.addDatum(prefs[i].getValue());
+ for (Preference pref : prefs) {
+ running.addDatum(pref.getValue());
}
return running;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java
Sat Jan 10 10:15:42 2009
@@ -94,8 +94,9 @@
public String asFormatString() {
StringBuilder out = new StringBuilder();
out.append("[, ");
- for (int i = 0; i < values.length; i++)
- out.append(values[i]).append(", ");
+ for (double value : values) {
+ out.append(value).append(", ");
+ }
out.append("] ");
return out.toString();
}
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
Sat Jan 10 10:15:42 2009
@@ -24,7 +24,6 @@
import org.apache.mahout.cf.taste.model.Item;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
Sat Jan 10 10:15:42 2009
@@ -97,8 +97,6 @@
parser.setGroup(group);
CommandLine cmdLine = parser.parse(args);
-
- SequenceFileModelReader reader = new SequenceFileModelReader();
JobConf conf = new JobConf(TestClassifier.class);
Map<String, Path> modelPaths = new HashMap<String, Path>();
@@ -130,7 +128,7 @@
throw new IllegalArgumentException("Unrecognized classifier type: " +
classifierType);
}
- reader.loadModel(model, fs, modelPaths, conf);
+ SequenceFileModelReader.loadModel(model, fs, modelPaths, conf);
log.info("Done loading model: # labels: {}", model.getLabels().size());
@@ -168,30 +166,33 @@
ResultAnalyzer resultAnalyzer = new ResultAnalyzer(model.getLabels(),
defaultCat);
if (subdirs != null) {
- for (int loop = 0; loop < subdirs.length; loop++) {
+ for (File subdir : subdirs) {
- String correctLabel = subdirs[loop].getName().split(".txt")[0];
+ String correctLabel = subdir.getName().split(".txt")[0];
BufferedReader fileReader = new BufferedReader(new InputStreamReader(
- new FileInputStream(subdirs[loop].getPath()), encoding));
- String line;
- while ((line = fileReader.readLine()) != null) {
-
- Map<String, List<String>> document = Model.generateNGrams(line,
gramSize);
- for (Map.Entry<String, List<String>> stringListEntry :
document.entrySet()) {
- List<String> strings = stringListEntry.getValue();
- ClassifierResult classifiedLabel = classifier.classify(model,
- strings.toArray(new String[strings.size()]),
- defaultCat);
- resultAnalyzer.addInstance(correctLabel, classifiedLabel);
+ new FileInputStream(subdir.getPath()), encoding));
+ try {
+ String line;
+ while ((line = fileReader.readLine()) != null) {
+
+ Map<String, List<String>> document = Model.generateNGrams(line,
gramSize);
+ for (Map.Entry<String, List<String>> stringListEntry :
document.entrySet()) {
+ List<String> strings = stringListEntry.getValue();
+ ClassifierResult classifiedLabel = classifier.classify(model,
+ strings.toArray(new String[strings.size()]),
+ defaultCat);
+ resultAnalyzer.addInstance(correctLabel, classifiedLabel);
+ }
}
- }
- log.info("{}\t{}\t{}/{}", new Object[] {
- correctLabel,
- resultAnalyzer.getConfusionMatrix().getAccuracy(correctLabel),
- resultAnalyzer.getConfusionMatrix().getCorrect(correctLabel),
- resultAnalyzer.getConfusionMatrix().getTotal(correctLabel)
+ log.info("{}\t{}\t{}/{}", new Object[]{
+ correctLabel,
+ resultAnalyzer.getConfusionMatrix().getAccuracy(correctLabel),
+ resultAnalyzer.getConfusionMatrix().getCorrect(correctLabel),
+ resultAnalyzer.getConfusionMatrix().getTotal(correctLabel)
});
-
+ } finally {
+ fileReader.close();
+ }
}
}
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java
Sat Jan 10 10:15:42 2009
@@ -39,8 +39,7 @@
String[] numbers = values.toString().split(" ");
// sometimes there are multiple separator spaces
List<Double> doubles = new ArrayList<Double>();
- for (int i = 0; i < numbers.length; i++) {
- String value = numbers[i];
+ for (String value : numbers) {
if (value.length() > 0)
doubles.add(Double.valueOf(value));
}
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java?rev=733309&r1=733308&r2=733309&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java
Sat Jan 10 10:15:42 2009
@@ -40,8 +40,7 @@
String[] numbers = values.toString().split(" ");
// sometimes there are multiple separator spaces
List<Double> doubles = new ArrayList<Double>();
- for (int i = 0; i < numbers.length; i++) {
- String value = numbers[i];
+ for (String value : numbers) {
if (value.length() > 0)
doubles.add(Double.valueOf(value));
}
