TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plotter improvements

Browse Source
This commit is contained in:
serso 2012-10-04 18:15:25 +04:00
parent ae6bb0a383
commit d8015e48c7
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calculatorpp/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
View File

@ -65,7 +65,7 @@ public final class PlotUtils {
while (x <= max) { while (x <= max) {
boolean needToCalculateRealY = realSeries.needToAdd(defaultStep, x); boolean needToCalculateRealY = realSeries.needToAdd(step, x);
if (needToCalculateRealY) { if (needToCalculateRealY) {
final Complex c = calculatorExpression(expression, variable, x); final Complex c = calculatorExpression(expression, variable, x);
@ -77,7 +77,7 @@ public final class PlotUtils {
realSeries.add(x, y); realSeries.add(x, y);
} }
boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(defaultStep, x); boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(step, x);
if (needToCalculateImagY) { if (needToCalculateImagY) {
y = prepareY(c.imaginaryPart()); y = prepareY(c.imaginaryPart());
if (y != null) { if (y != null) {
@ -90,7 +90,7 @@ public final class PlotUtils {
} }
} }
} else { } else {
boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(defaultStep, x); boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(step, x);
if (needToCalculateImagY) { if (needToCalculateImagY) {
final Complex c = calculatorExpression(expression, variable, x); final Complex c = calculatorExpression(expression, variable, x);
Double y = prepareY(c.imaginaryPart()); Double y = prepareY(c.imaginaryPart());
@ -107,11 +107,7 @@ public final class PlotUtils {
step = updateStep(real, step, defaultStep / 2); step = updateStep(real, step, defaultStep / 2);
if (real.isX2Defined()) { x += step;
x = real.getX2() + step;
} else {
x += step;
}
} }
return imagExists; return imagExists;