Changeset 2805

Timestamp:

Oct 25, 2006, 3:45:25 PM (17 years ago)

Author:

Johan Enell

Message:

fixes #407

Location:

branches/2.0.2/src/plugins/core/net/sf/basedb/plugins

Files:

• LowessNormalization.java (modified) (1 diff)
• MedianRatioNormalization.java (modified) (1 diff)

branches/2.0.2/src/plugins/core/net/sf/basedb/plugins/LowessNormalization.java

@@ -248 +248 @@
           query.select(Selects.expression(Aggregations.min(Dynamic.rawData("block")), "min"));
           resultIter = query.iterate(dc);
-          int maxBlock = resultIter.next().getInt(resultIter.getIndex("max"));
-          int minBlock = resultIter.next().getInt(resultIter.getIndex("min"));
+          SqlResult result = resultIter.next();
+          int maxBlock = result.getInt(resultIter.getIndex("max"));
+          int minBlock = result.getInt(resultIter.getIndex("min"));
           resultIter.close();
 
-          for (int i = minBlock; i < maxBlock; i += blockGroupSize)
+          for (int i = minBlock; i <= maxBlock; i += blockGroupSize)
           {
             Restriction blockRestriction = Restrictions.between

branches/2.0.2/src/plugins/core/net/sf/basedb/plugins/MedianRatioNormalization.java

@@ -224 +224 @@
           query.select(Selects.expression(Aggregations.min(Dynamic.rawData("block")), "min"));
           resultIter = query.iterate(dc);
-          int maxBlock = resultIter.next().getInt(resultIter.getIndex("max"));
-          int minBlock = resultIter.next().getInt(resultIter.getIndex("min"));
-
-          for (int i = minBlock; i < maxBlock; i += blockGroupSize)
+          SqlResult result = resultIter.next();
+          int maxBlock = result.getInt(resultIter.getIndex("max"));
+          int minBlock = result.getInt(resultIter.getIndex("min"));
+
+          for (int i = minBlock; i <= maxBlock; i += blockGroupSize)
           {
             Restriction blockRestriction = Restrictions.between