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 2009/03/20 09:34:38 UTC
svn commit: r756371 - in /lucene/mahout/trunk: core/
core/src/main/java/org/apache/mahout/classifier/bayes/
core/src/main/java/org/apache/mahout/classifier/cbayes/
core/src/main/java/org/apache/mahout/ga/watchmaker/ taste-web/
Author: srowen
Date: Fri Mar 20 08:34:30 2009
New Revision: 756371
URL: http://svn.apache.org/viewvc?rev=756371&view=rev
Log:
Fixed deprecation / unchecked warnings and old references to SLF4J 1.5.5
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java
lucene/mahout/trunk/core/taste-build.xml
lucene/mahout/trunk/taste-web/pom.xml
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java?rev=756371&r1=756370&r2=756371&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java Fri Mar 20 08:34:30 2009
@@ -48,7 +48,7 @@
public Collection<ClassifierResult> classify(Model model, String[] document, String defaultCategory, int numResults) {
Collection<String> categories = model.getLabels();
- PriorityQueue pq = new ClassifierResultPriorityQueue(numResults);
+ PriorityQueue<ClassifierResult> pq = new ClassifierResultPriorityQueue(numResults);
ClassifierResult tmp;
for (String category : categories){
double prob = documentWeight(model, category, document);
@@ -59,7 +59,7 @@
}
Deque<ClassifierResult> result = new LinkedList<ClassifierResult>();
- while ((tmp = (ClassifierResult) pq.pop()) != null) {
+ while ((tmp = pq.pop()) != null) {
result.addLast(tmp);
}
if (result.isEmpty()){
@@ -125,7 +125,7 @@
}
- private static class ClassifierResultPriorityQueue extends PriorityQueue {
+ private static class ClassifierResultPriorityQueue extends PriorityQueue<ClassifierResult> {
private ClassifierResultPriorityQueue(int numResults) {
initialize(numResults);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java?rev=756371&r1=756370&r2=756371&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java Fri Mar 20 08:34:30 2009
@@ -46,7 +46,7 @@
@Override
public Collection<ClassifierResult> classify(Model model, String[] document, String defaultCategory, int numResults) {
Collection<String> categories = model.getLabels();
- PriorityQueue pq = new ClassifierResultPriorityQueue(numResults);
+ PriorityQueue<ClassifierResult> pq = new ClassifierResultPriorityQueue(numResults);
ClassifierResult tmp;
for (String category : categories){
double prob = documentWeight(model, category, document);
@@ -57,7 +57,7 @@
}
Deque<ClassifierResult> result = new LinkedList<ClassifierResult>();
- while ((tmp = (ClassifierResult) pq.pop()) != null) {
+ while ((tmp = pq.pop()) != null) {
result.addLast(tmp);
}
if (result.isEmpty()){
@@ -123,7 +123,7 @@
}
- private static class ClassifierResultPriorityQueue extends PriorityQueue {
+ private static class ClassifierResultPriorityQueue extends PriorityQueue<ClassifierResult> {
private ClassifierResultPriorityQueue(int numResults) {
initialize(numResults);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java?rev=756371&r1=756370&r2=756371&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java Fri Mar 20 08:34:30 2009
@@ -87,7 +87,7 @@
// Delete the input if it already exists
if (fs.exists(inpath)) {
- FileUtil.fullyDelete(fs, inpath);
+ fs.delete(inpath, true);
}
fs.mkdirs(inpath);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java?rev=756371&r1=756370&r2=756371&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java Fri Mar 20 08:34:30 2009
@@ -52,7 +52,7 @@
Path outpath = new Path(fs.getWorkingDirectory(), "output");
if (fs.exists(outpath)) {
- FileUtil.fullyDelete(fs, outpath);
+ fs.delete(outpath, true);
}
return outpath;
Modified: lucene/mahout/trunk/core/taste-build.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/taste-build.xml?rev=756371&r1=756370&r2=756371&view=diff
==============================================================================
--- lucene/mahout/trunk/core/taste-build.xml (original)
+++ lucene/mahout/trunk/core/taste-build.xml Fri Mar 20 08:34:30 2009
@@ -30,8 +30,8 @@
<property name="pool.jar" location="lib/commons-pool-1.4.jar"/>
<property name="servlet.jar" location="lib/servlet-api.jar"/>
<property name="hadoop.jar" location="lib/hadoop-0.19.1-core.jar"/>
- <property name="slf4j-api.jar" location="lib/slf4j-api-1.5.5.jar"/>
- <property name="slf4j.jar" location="lib/slf4j-jcl-1.5.5.jar"/>
+ <property name="slf4j-api.jar" location="lib/slf4j-api-1.5.6.jar"/>
+ <property name="slf4j.jar" location="lib/slf4j-jcl-1.5.6.jar"/>
<property name="commons-logging.jar" location="lib/commons-logging-1.1.1.jar"/>
<property name="uncommons-math.jar" location="lib/uncommons-maths-1.0.2.jar"/>
Modified: lucene/mahout/trunk/taste-web/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/taste-web/pom.xml?rev=756371&r1=756370&r2=756371&view=diff
==============================================================================
--- lucene/mahout/trunk/taste-web/pom.xml (original)
+++ lucene/mahout/trunk/taste-web/pom.xml Fri Mar 20 08:34:30 2009
@@ -206,13 +206,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>