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 2011/02/15 08:57:39 UTC
svn commit: r1070798 -
/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
Author: srowen
Date: Tue Feb 15 07:57:39 2011
New Revision: 1070798
URL: http://svn.apache.org/viewvc?rev=1070798&view=rev
Log:
MAHOUT-604 avoid an NPE by updating Preconditions check
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java?rev=1070798&r1=1070797&r2=1070798&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java Tue Feb 15 07:57:39 2011
@@ -91,20 +91,20 @@ public class ConfusionMatrix implements
}
public int getCount(String correctLabel, String classifiedLabel) {
- Preconditions.checkArgument(!labelMap.containsKey(correctLabel)
- || labelMap.containsKey(classifiedLabel)
- || defaultLabel.equals(classifiedLabel),
- "Label not found " + correctLabel + ' ' + classifiedLabel);
+ Preconditions.checkArgument(labelMap.containsKey(correctLabel),
+ "Label not found: " + correctLabel);
+ Preconditions.checkArgument(labelMap.containsKey(classifiedLabel),
+ "Label not found: " + classifiedLabel);
int correctId = labelMap.get(correctLabel);
int classifiedId = labelMap.get(classifiedLabel);
return confusionMatrix[correctId][classifiedId];
}
public void putCount(String correctLabel, String classifiedLabel, int count) {
- Preconditions.checkArgument(!labelMap.containsKey(correctLabel)
- || labelMap.containsKey(classifiedLabel)
- || defaultLabel.equals(classifiedLabel),
- "Label not found " + correctLabel + ' ' + classifiedLabel);
+ Preconditions.checkArgument(labelMap.containsKey(correctLabel),
+ "Label not found: " + correctLabel);
+ Preconditions.checkArgument(labelMap.containsKey(classifiedLabel),
+ "Label not found: " + classifiedLabel);
int correctId = labelMap.get(correctLabel);
int classifiedId = labelMap.get(classifiedLabel);
confusionMatrix[correctId][classifiedId] = count;