Skip to content

Commit

Permalink
0.9.77
Browse files Browse the repository at this point in the history
  • Loading branch information
@landawn
landawn committed Aug 1, 2017
1 parent c9e4467 commit 7839474
Show file tree
Hide file tree
Showing 68 changed files with 301 additions and 716 deletions.
4 changes: 3 additions & 1 deletion CHANGES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

2*, Remove averagingInt2OrGet/averagingInt2OrThrow/averagingLong2OrGet/averagingLong2OrThrow/averagingDouble2OrGet/averagingDouble2OrThrow from Collectors.

3, Improvements and bug fix.
3*, Change the result types of sum(byte[])/sum(short[])/sum(int[])/sum(char[]) from Long to int.

4, Improvements and bug fix.


========Changes in 0.9.76=========================================================================
Expand Down
Binary file renamed lib/abacus-android-0.9.76.jar → lib/abacus-android-0.9.77.jar
View file
Binary file not shown.
Binary file renamed lib/abacus-android-jdk7-0.9.76.jar → lib/abacus-android-jdk7-0.9.77.jar
View file
Binary file not shown.
Binary file renamed lib/abacus-android-se-0.9.76.jar → lib/abacus-android-se-0.9.77.jar
View file
Binary file not shown.
Binary file renamed lib/abacus-android-se-jdk7-0.9.76.jar → lib/abacus-android-se-jdk7-0.9.77.jar
View file
Binary file not shown.
Binary file modified lib/abacus-util-0.9.77.jar
View file
Binary file not shown.
Binary file modified lib/abacus-util-all-0.9.77.jar
View file
Binary file not shown.
Binary file modified lib/abacus-util-all-jdk7-0.9.77.jar
View file
Binary file not shown.
Binary file modified lib/abacus-util-jdk7-0.9.77.jar
View file
Binary file not shown.
36 changes: 0 additions & 36 deletions src/com/landawn/abacus/DataSet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2734,24 +2734,6 @@ DataSet groupBy(Collection<String> columnNames, int fromRowIndex, int toRowIndex
*/
<T> NullabLe<T> kthLargest(String columnName, int fromRowIndex, int toRowIndex, int k, Comparator<? super T> comparator);

// /**
// *
// * @param columnName
// * @param mapper
// * @return
// */
// Long sum(String columnName, ToLongFunction<?> mapper);
//
// /**
// *
// * @param columnName
// * @param fromRowIndex
// * @param toRowIndex
// * @param mapper
// * @return
// */
// Long sum(String columnName, int fromRowIndex, int toRowIndex, ToLongFunction<?> mapper);

/**
* @param columnName
* @return
Expand Down Expand Up @@ -2833,24 +2815,6 @@ DataSet groupBy(Collection<String> columnNames, int fromRowIndex, int toRowIndex
*/
double sumDouble(String columnName, int fromRowIndex, int toRowIndex);

// /**
// *
// * @param columnName
// * @param mapper
// * @return
// */
// long sum(String columnName, ToLongFunction<?> mapper);
//
// /**
// *
// * @param columnName
// * @param fromRowIndex
// * @param toRowIndex
// * @param mapper
// * @return
// */
// long sum(String columnName, int fromRowIndex, int toRowIndex, ToLongFunction<?> mapper);

/**
*
* @param columnName
Expand Down
67 changes: 0 additions & 67 deletions src/com/landawn/abacus/util/BooleanMatrix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,73 +554,6 @@ public void fill(final int fromRowIndex, final int fromColumnIndex, final boolea
}
}

// Replaced by stream and stream2.
// public OptionalBoolean min() {
// if (isEmpty()) {
// return OptionalBoolean.empty();
// }
//
// boolean candicate = Boolean.MAX_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] < candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalBoolean.of(candicate);
// }
//
// public OptionalBoolean max() {
// if (isEmpty()) {
// return OptionalBoolean.empty();
// }
//
// boolean candicate = Boolean.MIN_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] > candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalBoolean.of(candicate);
// }
//
// public Long sum() {
// long sum = 0;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// sum += a[i][j];
// }
// }
//
// return sum;
// }
//
// public OptionalDouble average() {
// if (isEmpty()) {
// return OptionalDouble.empty();
// }
//
// return OptionalDouble.of(sum() / count);
// }
//
// @Override
// public BooleanList row(final int i) {
// return BooleanList.of(a[i].clone());
// }
//
// @Override
// public BooleanList column(final int j) {
// return BooleanList.of(column2(j));
// }

@Override
public BooleanMatrix copy() {
final boolean[][] c = new boolean[rows][];
Expand Down
4 changes: 2 additions & 2 deletions src/com/landawn/abacus/util/ByteList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,11 +840,11 @@ public OptionalByte kthLargest(final int fromIndex, final int toIndex, final int
return toIndex - fromIndex < k ? OptionalByte.empty() : OptionalByte.of(N.kthLargest(elementData, fromIndex, toIndex, k));
}

public Long sum() {
public int sum() {
return sum(0, size());
}

public Long sum(final int fromIndex, final int toIndex) {
public int sum(final int fromIndex, final int toIndex) {
checkFromToIndex(fromIndex, toIndex);

return N.sum(elementData, fromIndex, toIndex);
Expand Down
67 changes: 0 additions & 67 deletions src/com/landawn/abacus/util/ByteMatrix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,73 +569,6 @@ public void fill(final int fromRowIndex, final int fromColumnIndex, final byte[]
}
}

// Replaced by stream and stream2.
// public OptionalByte min() {
// if (isEmpty()) {
// return OptionalByte.empty();
// }
//
// byte candicate = Byte.MAX_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] < candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalByte.of(candicate);
// }
//
// public OptionalByte max() {
// if (isEmpty()) {
// return OptionalByte.empty();
// }
//
// byte candicate = Byte.MIN_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] > candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalByte.of(candicate);
// }
//
// public Long sum() {
// long sum = 0;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// sum += a[i][j];
// }
// }
//
// return sum;
// }
//
// public OptionalDouble average() {
// if (isEmpty()) {
// return OptionalDouble.empty();
// }
//
// return OptionalDouble.of(sum() / count);
// }
//
// @Override
// public ByteList row(final int i) {
// return ByteList.of(a[i].clone());
// }
//
// @Override
// public ByteList column(final int j) {
// return ByteList.of(column2(j));
// }

@Override
public ByteMatrix copy() {
final byte[][] c = new byte[rows][];
Expand Down
4 changes: 2 additions & 2 deletions src/com/landawn/abacus/util/CharList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -866,11 +866,11 @@ public OptionalChar kthLargest(final int fromIndex, final int toIndex, final int
return toIndex - fromIndex < k ? OptionalChar.empty() : OptionalChar.of(N.kthLargest(elementData, fromIndex, toIndex, k));
}

public Long sum() {
public int sum() {
return sum(0, size());
}

public Long sum(final int fromIndex, final int toIndex) {
public int sum(final int fromIndex, final int toIndex) {
checkFromToIndex(fromIndex, toIndex);

return N.sum(elementData, fromIndex, toIndex);
Expand Down
67 changes: 0 additions & 67 deletions src/com/landawn/abacus/util/CharMatrix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,73 +569,6 @@ public void fill(final int fromRowIndex, final int fromColumnIndex, final char[]
}
}

// Replaced by stream and stream2.
// public OptionalChar min() {
// if (isEmpty()) {
// return OptionalChar.empty();
// }
//
// char candicate = Char.MAX_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] < candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalChar.of(candicate);
// }
//
// public OptionalChar max() {
// if (isEmpty()) {
// return OptionalChar.empty();
// }
//
// char candicate = Char.MIN_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] > candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalChar.of(candicate);
// }
//
// public Long sum() {
// long sum = 0;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// sum += a[i][j];
// }
// }
//
// return sum;
// }
//
// public OptionalDouble average() {
// if (isEmpty()) {
// return OptionalDouble.empty();
// }
//
// return OptionalDouble.of(sum() / count);
// }
//
// @Override
// public CharList row(final int i) {
// return CharList.of(a[i].clone());
// }
//
// @Override
// public CharList column(final int j) {
// return CharList.of(column2(j));
// }

@Override
public CharMatrix copy() {
final char[][] c = new char[rows][];
Expand Down
4 changes: 2 additions & 2 deletions src/com/landawn/abacus/util/DoubleList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,11 +838,11 @@ public OptionalDouble kthLargest(final int fromIndex, final int toIndex, final i
return toIndex - fromIndex < k ? OptionalDouble.empty() : OptionalDouble.of(N.kthLargest(elementData, fromIndex, toIndex, k));
}

public Double sum() {
public double sum() {
return sum(0, size());
}

public Double sum(final int fromIndex, final int toIndex) {
public double sum(final int fromIndex, final int toIndex) {
checkFromToIndex(fromIndex, toIndex);

return N.sum(elementData, fromIndex, toIndex);
Expand Down
67 changes: 0 additions & 67 deletions src/com/landawn/abacus/util/DoubleMatrix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,73 +604,6 @@ public void fill(final int fromRowIndex, final int fromColumnIndex, final double
}
}

// Replaced by stream and stream2.
// public OptionalDouble min() {
// if (isEmpty()) {
// return OptionalDouble.empty();
// }
//
// double candicate = Double.MAX_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] < candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalDouble.of(candicate);
// }
//
// public OptionalDouble max() {
// if (isEmpty()) {
// return OptionalDouble.empty();
// }
//
// double candicate = Double.MIN_VALUE;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// if (a[i][j] > candicate) {
// candicate = a[i][j];
// }
// }
// }
//
// return OptionalDouble.of(candicate);
// }
//
// public Long sum() {
// long sum = 0;
//
// for (int i = 0; i < n; i++) {
// for (int j = 0; j < m; j++) {
// sum += a[i][j];
// }
// }
//
// return sum;
// }
//
// public OptionalDouble average() {
// if (isEmpty()) {
// return OptionalDouble.empty();
// }
//
// return OptionalDouble.of(sum() / count);
// }
//
// @Override
// public DoubleList row(final int i) {
// return DoubleList.of(a[i].clone());
// }
//
// @Override
// public DoubleList column(final int j) {
// return DoubleList.of(column2(j));
// }

@Override
public DoubleMatrix copy() {
final double[][] c = new double[rows][];
Expand Down
Loading

0 comments on commit 7839474

Please sign in to comment.