svn commit: r1084125 - in /mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl: model/ model/jdbc/ recommender/

Tue, 22 Mar 2011 03:22:35 -0700 

Author: srowen
Date: Tue Mar 22 10:21:56 2011
New Revision: 1084125

URL: http://svn.apache.org/viewvc?rev=1084125&view=rev
Log:
... more removal of spurious and maybe expensive allocations at scale

Modified:
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLBooleanPrefJDBCDataModel.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLJDBCDataModel.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java?rev=1084125&r1=1084124&r2=1084125&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java
 Tue Mar 22 10:21:56 2011
@@ -35,7 +35,7 @@ public class GenericPreference implement
   private float value;
   
   public GenericPreference(long userID, long itemID, float value) {
-    Preconditions.checkArgument(!Float.isNaN(value), "Invalid value: " + 
value);
+    Preconditions.checkArgument(!Float.isNaN(value), "NaN value");
     this.userID = userID;
     this.itemID = itemID;
     this.value = value;
@@ -58,7 +58,7 @@ public class GenericPreference implement
   
   @Override
   public void setValue(float value) {
-    Preconditions.checkArgument(!Float.isNaN(value), "Invalid value: " + 
value);
+    Preconditions.checkArgument(!Float.isNaN(value), "NaN value");
     this.value = value;
   }
   

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java?rev=1084125&r1=1084124&r2=1084125&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java
 Tue Mar 22 10:21:56 2011
@@ -96,7 +96,7 @@ public abstract class AbstractBooleanPre
   
   @Override
   public void setPreference(long userID, long itemID, float value) throws 
TasteException {
-    Preconditions.checkArgument(!Float.isNaN(value), "Invalid value: " + 
value);
+    Preconditions.checkArgument(!Float.isNaN(value), "NaN value");
     log.debug("Setting preference for user {}, item {}", userID, itemID);
     
     Connection conn = null;

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java?rev=1084125&r1=1084124&r2=1084125&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
 Tue Mar 22 10:21:56 2011
@@ -595,7 +595,7 @@ public abstract class AbstractJDBCDataMo
 
   @Override
   public void setPreference(long userID, long itemID, float value) throws 
TasteException {
-    Preconditions.checkArgument(!Float.isNaN(value), "Invalid value: " + 
value);
+    Preconditions.checkArgument(!Float.isNaN(value), "NaN value");
 
     log.debug("Setting preference for user {}, item {}", userID, itemID);
 

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLBooleanPrefJDBCDataModel.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLBooleanPrefJDBCDataModel.java?rev=1084125&r1=1084124&r2=1084125&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLBooleanPrefJDBCDataModel.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLBooleanPrefJDBCDataModel.java
 Tue Mar 22 10:21:56 2011
@@ -173,7 +173,7 @@ public class PostgreSQLBooleanPrefJDBCDa
    */
   @Override
   public void setPreference(long userID, long itemID, float value) throws 
TasteException {
-    Preconditions.checkArgument(!Float.isNaN(value), "Invalid value: " + 
value);
+    Preconditions.checkArgument(!Float.isNaN(value), "NaN value");
     log.debug("Setting preference for user {}, item {}", userID, itemID);
 
     String setPreferenceSQL = getSetPreferenceSQL();

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLJDBCDataModel.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLJDBCDataModel.java?rev=1084125&r1=1084124&r2=1084125&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLJDBCDataModel.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/PostgreSQLJDBCDataModel.java
 Tue Mar 22 10:21:56 2011
@@ -183,7 +183,7 @@ public class PostgreSQLJDBCDataModel ext
    */
   @Override
   public void setPreference(long userID, long itemID, float value) throws 
TasteException {
-    Preconditions.checkArgument(!Float.isNaN(value), "Invalid value: " + 
value);
+    Preconditions.checkArgument(!Float.isNaN(value), "NaN value");
 
     log.debug("Setting preference for user {}, item {}", userID, itemID);
 

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java?rev=1084125&r1=1084124&r2=1084125&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java
 Tue Mar 22 10:21:56 2011
@@ -74,8 +74,7 @@ public abstract class AbstractRecommende
    */
   @Override
   public void setPreference(long userID, long itemID, float value) throws 
TasteException {
-    Preconditions.checkArgument(!Double.isNaN(value), "Invalid value: " + 
value);
-
+    Preconditions.checkArgument(!Float.isNaN(value), "NaN value");
     log.debug("Setting preference for user {}, item {}", userID, itemID);
     dataModel.setPreference(userID, itemID, value);
   }

Reply via email to