DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2024-12-23 16:00:09 -08:00
Code Issues Releases Wiki Activity

Optimize log.

Browse Source
This commit is contained in:
Arthur Drobot 2017-07-31 12:39:56 -07:00
parent 5bb7c1dc6b
commit 0172b178de
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
View File

@ -203,11 +203,12 @@ public class StandardPlugin extends Plugin {
private NumberInterface getLogPartialSum(NumberInterface x) { private NumberInterface getLogPartialSum(NumberInterface x) {
NumberInterface maxError = getMaxError(x); NumberInterface maxError = getMaxError(x);
x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1). x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1).
NumberInterface currentTerm = x, sum = x; NumberInterface currentNumerator = x, currentTerm = x, sum = x;
int n = 1; int n = 1;
while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0) { while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0) {
n++; n++;
currentTerm = currentTerm.multiply(x).multiply((new NaiveNumber(n - 1)).promoteTo(x.getClass())).divide((new NaiveNumber(n)).promoteTo(x.getClass())).negate(); currentNumerator = currentNumerator.multiply(x).negate();
currentTerm = currentNumerator.divide(new NaiveNumber(n).promoteTo(x.getClass()));
sum = sum.add(currentTerm); sum = sum.add(currentTerm);
} }
return sum; return sum;
@ -273,7 +274,7 @@ public class StandardPlugin extends Plugin {
* *
* @param maxError Maximum error permissible (This should probably be positive.) * @param maxError Maximum error permissible (This should probably be positive.)
* @param x where the function is evaluated. * @param x where the function is evaluated.
* @return the number of terms needed to evaluated the exponential function. * @return the number of terms needed to evaluate the exponential function.
*/ */
private static int getNTermsExp(NumberInterface maxError, NumberInterface x) { private static int getNTermsExp(NumberInterface maxError, NumberInterface x) {
//We need n such that |x^(n+1)| <= (n+1)! * maxError //We need n such that |x^(n+1)| <= (n+1)! * maxError