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/08/17 18:55:11 UTC
svn commit: r805038 - in
/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl:
common/ model/ model/jdbc/ similarity/
Author: srowen
Date: Mon Aug 17 16:55:10 2009
New Revision: 805038
URL: http://svn.apache.org/viewvc?rev=805038&view=rev
Log:
Misc cleanup in my CF code
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java
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/cf/taste/impl/similarity/GenericItemSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericUserSimilarity.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorUtils.java?rev=805038&r1=805037&r2=805038&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorUtils.java Mon Aug 17 16:55:10 2009
@@ -42,7 +42,7 @@
int size = 0;
while (iterator.hasNext()) {
if (size == result.length) {
- long[] newResult = new long[result.length * 2];
+ long[] newResult = new long[(result.length << 1)];
System.arraycopy(result, 0, newResult, 0, result.length);
result = newResult;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java?rev=805038&r1=805037&r2=805038&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java Mon Aug 17 16:55:10 2009
@@ -24,6 +24,7 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
/**
* <p>Like {@link BooleanUserPreferenceArray} but stores preferences for one item (all item IDs the same)
@@ -45,6 +46,7 @@
this.IDs = new long[size];
}
+ @Override
public int length() {
return IDs.length;
}
@@ -116,6 +118,7 @@
public void sortByValueReversed() {
}
+ @Override
public GenericItemPreferenceArray clone() {
try {
return (GenericItemPreferenceArray) super.clone();
@@ -137,6 +140,9 @@
}
@Override
public Preference next() {
+ if (i >= length()) {
+ throw new NoSuchElementException();
+ }
return new PreferenceView(i++);
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java?rev=805038&r1=805037&r2=805038&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java Mon Aug 17 16:55:10 2009
@@ -24,6 +24,7 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
/**
* <p>Like {@link GenericUserPreferenceArray} but stores, conceptually, {@link BooleanPreference} objects
@@ -45,6 +46,7 @@
this.IDs = new long[size];
}
+ @Override
public int length() {
return IDs.length;
}
@@ -116,6 +118,7 @@
public void sortByValueReversed() {
}
+ @Override
public GenericItemPreferenceArray clone() {
try {
return (GenericItemPreferenceArray) super.clone();
@@ -137,6 +140,9 @@
}
@Override
public Preference next() {
+ if (i >= length()) {
+ throw new NoSuchElementException();
+ }
return new PreferenceView(i++);
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java?rev=805038&r1=805037&r2=805038&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java Mon Aug 17 16:55:10 2009
@@ -23,6 +23,7 @@
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
/**
* <p>Like {@link GenericUserPreferenceArray} but stores preferences for one item (all item IDs the same)
@@ -50,6 +51,7 @@
values = new float[size];
}
+ @Override
public int length() {
return IDs.length;
}
@@ -163,6 +165,7 @@
values[j] = temp2;
}
+ @Override
public GenericItemPreferenceArray clone() {
try {
return (GenericItemPreferenceArray) super.clone();
@@ -184,6 +187,9 @@
}
@Override
public Preference next() {
+ if (i >= length()) {
+ throw new NoSuchElementException();
+ }
return new PreferenceView(i++);
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java?rev=805038&r1=805037&r2=805038&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java Mon Aug 17 16:55:10 2009
@@ -23,6 +23,7 @@
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
/**
* <p>This implementation maintains two parallel arrays, of user IDs and values. The idea is to save
@@ -51,6 +52,7 @@
values = new float[size];
}
+ @Override
public int length() {
return IDs.length;
}
@@ -164,6 +166,7 @@
values[j] = temp2;
}
+ @Override
public GenericUserPreferenceArray clone() {
try {
return (GenericUserPreferenceArray) super.clone();
@@ -185,6 +188,9 @@
}
@Override
public Preference next() {
+ if (i >= length()) {
+ throw new NoSuchElementException();
+ }
return new PreferenceView(i++);
}
@Override
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=805038&r1=805037&r2=805038&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 Mon Aug 17 16:55:10 2009
@@ -370,7 +370,7 @@
ResultSet rs = null;
try {
- conn = getDataSource().getConnection();
+ conn = dataSource.getConnection();
stmt = conn.prepareStatement(getUserSQL, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setFetchDirection(ResultSet.FETCH_FORWARD);
stmt.setFetchSize(getFetchSize());
@@ -641,6 +641,7 @@
return nextExists;
}
+ @Override
public Long next() {
return nextLong();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java?rev=805038&r1=805037&r2=805038&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java Mon Aug 17 16:55:10 2009
@@ -29,7 +29,6 @@
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import java.util.NoSuchElementException;
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericUserSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericUserSimilarity.java?rev=805038&r1=805037&r2=805038&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericUserSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericUserSimilarity.java Mon Aug 17 16:55:10 2009
@@ -30,7 +30,6 @@
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import java.util.NoSuchElementException;
public final class GenericUserSimilarity implements UserSimilarity {