archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2025-12-08 20:36:05 +00:00
Code Issues Projects Releases Wiki Activity

bugfixed of log and log10 functions

Browse Source
This commit is contained in:
wyq 2022-04-21 22:21:00 +08:00
parent 387b9fce48
commit 0e4757e8fe
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meteoinfo-ndarray/src/main/java/org/meteoinfo/ndarray/math/ArrayMath.java
View File

@ -3364,14 +3364,30 @@ public class ArrayMath {
public static Array log(Array a) {
Array r;
if (isComplex(a)) {
r = Array.factory(DataType.OBJECT, a.getShape());
for (int i = 0; i < a.getSize(); i++) {
r.setObject(i, ((Complex) a.getObject(i)).log());
r = Array.factory(DataType.COMPLEX, a.getShape());
if (a.getIndexPrivate().isFastIterator()) {
for (int i = 0; i < a.getSize(); i++) {
r.setComplex(i, a.getComplex(i).log());
}
} else {
IndexIterator iterA = a.getIndexIterator();
IndexIterator iterR = r.getIndexIterator();
while (iterA.hasNext()) {
iterR.setComplexNext(iterA.getComplexNext().log());
}
}
} else {
r = Array.factory(DataType.DOUBLE, a.getShape());
for (int i = 0; i < a.getSize(); i++) {
r.setDouble(i, Math.log(a.getDouble(i)));
if (a.getIndexPrivate().isFastIterator()) {
for (int i = 0; i < a.getSize(); i++) {
r.setDouble(i, Math.log(a.getDouble(i)));
}
} else {
IndexIterator iterA = a.getIndexIterator();
IndexIterator iterR = r.getIndexIterator();
while (iterA.hasNext()) {
iterR.setDoubleNext(Math.log(iterA.getDoubleNext()));
}
}
}
@ -3386,8 +3402,16 @@ public class ArrayMath {
*/
public static Array log10(Array a) {
Array r = Array.factory(DataType.DOUBLE, a.getShape());
for (int i = 0; i < a.getSize(); i++) {
r.setDouble(i, Math.log10(a.getDouble(i)));
if (a.getIndexPrivate().isFastIterator()) {
for (int i = 0; i < a.getSize(); i++) {
r.setDouble(i, Math.log10(a.getDouble(i)));
}
} else {
IndexIterator iterA = a.getIndexIterator();
IndexIterator iterR = r.getIndexIterator();
while (iterA.hasNext()) {
iterR.setDoubleNext(Math.log10(iterA.getDoubleNext()));
}
}
return r;