Author: srowen
Date: Thu Aug 7 18:34:56 2008
New Revision: 683790
URL: http://svn.apache.org/viewvc?rev=683790&view=rev
Log:
Remove some unneeded unboxing, unneeded methods, made some stuff private that
can be
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutFitnessEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
Thu Aug 7 18:34:56 2008
@@ -115,7 +115,7 @@
checkNotNullAndLog("getItemSQL", getItemSQL);
checkNotNullAndLog("getPrefsForItemSQL", getPrefsForItemSQL);
checkNotNullAndLog("getNumPreferenceForItemSQL",
getNumPreferenceForItemSQL);
- checkNotNullAndLog("getgetNumPreferenceForItemsSQL",
getNumPreferenceForItemsSQL);
+ checkNotNullAndLog("getNumPreferenceForItemsSQL",
getNumPreferenceForItemsSQL);
if (!(dataSource instanceof ConnectionPoolDataSource)) {
log.warn("You are not using ConnectionPoolDataSource. Make sure your
DataSource pools connections " +
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutFitnessEvaluator.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutFitnessEvaluator.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutFitnessEvaluator.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutFitnessEvaluator.java
Thu Aug 7 18:34:56 2008
@@ -39,7 +39,7 @@
try {
MahoutEvaluator.evaluate(evaluator, population, evaluations);
} catch (IOException e) {
- new RuntimeException("Exception while evaluating the population", e);
+ throw new RuntimeException("Exception while evaluating the population",
e);
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
Thu Aug 7 18:34:56 2008
@@ -63,7 +63,7 @@
for (int i = 0; i < pts.length; i++) {
String pt = pts[i].trim();
if (pt.startsWith("[s")) {
- int c = new Integer(pts[i].substring(2));
+ int c = Integer.parseInt(pts[i].substring(2));
result = new SparseVector(c);
} else if (!pt.startsWith("]")) {
int ix = pt.indexOf(':');
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
Thu Aug 7 18:34:56 2008
@@ -37,9 +37,9 @@
*/
public abstract class WeightedDistanceMeasure implements DistanceMeasure {
- protected List<Parameter> parameters;
- protected Parameter<Path> weightsFile;
- protected Parameter<Class> vectorClass;
+ private List<Parameter> parameters;
+ private Parameter<Path> weightsFile;
+ private Parameter<Class> vectorClass;
protected Vector weights;
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java
Thu Aug 7 18:34:56 2008
@@ -26,13 +26,6 @@
public class WeightedEuclideanDistanceMeasure extends WeightedDistanceMeasure {
/* (non-Javadoc)
- * @see
org.apache.hadoop.mapred.JobConfigurable#configure(org.apache.hadoop.mapred.JobConf)
- */
- public void configure(JobConf job) {
- super.configure(job);
- }
-
- /* (non-Javadoc)
* @see
org.apache.mahout.utils.DistanceMeasure#distance(org.apache.mahout.matrix.Vector,
org.apache.mahout.matrix.Vector)
*/
public double distance(Vector p1, Vector p2) {
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java
Thu Aug 7 18:34:56 2008
@@ -48,13 +48,4 @@
return result;
}
- /*
- * (non-Javadoc)
- *
- * @see
org.apache.hadoop.mapred.JobConfigurable#configure(org.apache.hadoop.mapred.JobConf)
- */
- public void configure(JobConf job) {
- super.configure(job);
- }
-
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java
Thu Aug 7 18:34:56 2008
@@ -25,11 +25,11 @@
public abstract class AbstractParameter<T> implements Parameter<T> {
protected T value;
- protected final String prefix;
- protected final String name;
- protected final String description;
- protected final Class<T> type;
- protected final String defaultValue;
+ private final String prefix;
+ private final String name;
+ private final String description;
+ private final Class<T> type;
+ private final String defaultValue;
public void configure(JobConf jobConf) {
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java
Thu Aug 7 18:34:56 2008
@@ -26,7 +26,7 @@
}
public void setStringValue(String stringValue) {
- set(Double.parseDouble(stringValue));
+ set(Double.valueOf(stringValue));
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java?rev=683790&r1=683789&r2=683790&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java
Thu Aug 7 18:34:56 2008
@@ -9,7 +9,7 @@
}
public void setStringValue(String stringValue) {
- set(Integer.parseInt(stringValue));
+ set(Integer.valueOf(stringValue));
}
}
