You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by td...@apache.org on 2012/10/11 10:45:01 UTC
svn commit: r1396948 - in /mahout/trunk/math/src/main:
java-templates/org/apache/mahout/math/map/ java/org/apache/mahout/math/map/
Author: tdunning
Date: Thu Oct 11 08:45:00 2012
New Revision: 1396948
URL: http://svn.apache.org/viewvc?rev=1396948&view=rev
Log:
MAHOUT-1096 - More tiny style fixes in templates
Modified:
mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMap.java.t
mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMap.java.t
mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMap.java.t
mahout/trunk/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
Modified: mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMap.java.t
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMap.java.t?rev=1396948&r1=1396947&r2=1396948&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMap.java.t (original)
+++ mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMap.java.t Thu Oct 11 08:45:00 2012
@@ -158,10 +158,8 @@ public class Open${keyTypeCap}ObjectHash
@Override
public boolean forEachKey(${keyTypeCap}Procedure procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply(table[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply(table[i])) {
+ return false;
}
}
return true;
@@ -178,10 +176,8 @@ public class Open${keyTypeCap}ObjectHash
@Override
public boolean forEachPair(${keyTypeCap}ObjectProcedure<T> procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply(table[i], values[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply(table[i], values[i])) {
+ return false;
}
}
return true;
Modified: mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMap.java.t
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMap.java.t?rev=1396948&r1=1396947&r2=1396948&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMap.java.t (original)
+++ mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMap.java.t Thu Oct 11 08:45:00 2012
@@ -168,10 +168,8 @@ public class Open${keyTypeCap}${valueTyp
@Override
public boolean forEachKey(${keyTypeCap}Procedure procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply(table[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply(table[i])) {
+ return false;
}
}
return true;
@@ -188,10 +186,8 @@ public class Open${keyTypeCap}${valueTyp
@Override
public boolean forEachPair(${keyTypeCap}${valueTypeCap}Procedure procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply(table[i], values[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply(table[i], values[i])) {
+ return false;
}
}
return true;
Modified: mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMap.java.t
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMap.java.t?rev=1396948&r1=1396947&r2=1396948&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMap.java.t (original)
+++ mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMap.java.t Thu Oct 11 08:45:00 2012
@@ -161,10 +161,8 @@ public class OpenObject${valueTypeCap}Ha
@SuppressWarnings("unchecked")
public boolean forEachKey(ObjectProcedure<T> procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply((T)table[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply((T)table[i])) {
+ return false;
}
}
return true;
@@ -182,10 +180,8 @@ public class OpenObject${valueTypeCap}Ha
@SuppressWarnings("unchecked")
public boolean forEachPair(Object${valueTypeCap}Procedure<T> procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply((T)table[i], values[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply((T)table[i], values[i])) {
+ return false;
}
}
return true;
Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java?rev=1396948&r1=1396947&r2=1396948&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java Thu Oct 11 08:45:00 2012
@@ -171,10 +171,8 @@ public class OpenHashMap<K,V> extends Ab
@SuppressWarnings("unchecked")
public boolean forEachKey(ObjectProcedure<K> procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply((K)table[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply((K)table[i])) {
+ return false;
}
}
return true;
@@ -191,10 +189,8 @@ public class OpenHashMap<K,V> extends Ab
@SuppressWarnings("unchecked")
public boolean forEachPair(ObjectObjectProcedure<K,V> procedure) {
for (int i = table.length; i-- > 0;) {
- if (state[i] == FULL) {
- if (!procedure.apply((K)table[i], (V)values[i])) {
- return false;
- }
+ if (state[i] == FULL && !procedure.apply((K)table[i], (V)values[i])) {
+ return false;
}
}
return true;