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

plotting

Browse Source
This commit is contained in:
Sergey Solovyev 2011-12-05 19:08:56 +04:00
parent 2be48cf7e3
commit 7484d8b1b6
2 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/java/org/solovyev/android/calculator/CalculatorPlotActivity.java
View File

@ -10,6 +10,7 @@ import android.app.Activity;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.util.Log;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.widget.Toast; import android.widget.Toast;
@ -21,6 +22,7 @@ import jscl.math.function.Constant;
import jscl.math.numeric.Complex; import jscl.math.numeric.Complex;
import jscl.math.numeric.Numeric; import jscl.math.numeric.Numeric;
import jscl.math.numeric.Real; import jscl.math.numeric.Real;
import jscl.text.MutableInt;
import jscl.text.ParseException; import jscl.text.ParseException;
import org.achartengine.ChartFactory; import org.achartengine.ChartFactory;
import org.achartengine.GraphicalView; import org.achartengine.GraphicalView;
@ -130,13 +132,26 @@ public class CalculatorPlotActivity extends Activity {
double maxY = Double.MIN_VALUE; double maxY = Double.MIN_VALUE;
for (XYSeries series : chart.getDataset().getSeries()) { for (XYSeries series : chart.getDataset().getSeries()) {
minX = Math.min(minX, series.getMinX()); if (checkMinMaxValue(series.getMinX())) {
minY = Math.min(minY, series.getMinY()); minX = Math.min(minX, series.getMinX());
maxX = Math.max(maxX, series.getMaxX()); }
maxY = Math.max(maxY, series.getMaxY());
if (checkMinMaxValue(series.getMinY())) {
minY = Math.min(minY, series.getMinY());
}
if (checkMinMaxValue(series.getMaxX())) {
maxX = Math.max(maxX, series.getMaxX());
}
if (checkMinMaxValue(series.getMaxY())) {
maxY = Math.max(maxY, series.getMaxY());
}
} }
//Log.d(CalculatorPlotActivity.class.getName(), "min x: " +minX +", min y: " + minY + ", max x: " + maxX + ", max y: " + maxY); Log.d(CalculatorPlotActivity.class.getName(), "min x: " + minX + ", min y: " + minY + ", max x: " + maxX + ", max y: " + maxY);
Log.d(CalculatorPlotActivity.class.getName(), "Plot boundaries are " + plotBoundaries);
if (plotBoundaries == null) { if (plotBoundaries == null) {
chart.getRenderer().setXAxisMin(Math.max(minX, minValue)); chart.getRenderer().setXAxisMin(Math.max(minX, minValue));
@ -175,6 +190,10 @@ public class CalculatorPlotActivity extends Activity {
updateDataSets(chart); updateDataSets(chart);
} }
private boolean checkMinMaxValue(@NotNull Double value) {
return !value.equals(MathHelper.NULL_VALUE);
}
private void updateDataSets(@NotNull final XYChart chart) { private void updateDataSets(@NotNull final XYChart chart) {
pendingOperation.setObject(new Runnable() { pendingOperation.setObject(new Runnable() {
@Override @Override
@ -279,18 +298,22 @@ public class CalculatorPlotActivity extends Activity {
} }
final int numberOfSteps = DEFAULT_NUMBER_OF_STEPS; final int numberOfSteps = DEFAULT_NUMBER_OF_STEPS;
final double step = Math.max((max - min) / numberOfSteps, 0.000000001); final double step = Math.max( dist / numberOfSteps, 0.000000001);
double x = min;
Double prevRealY = null; Double prevRealY = null;
Double prevX = null; Double prevX = null;
Double prevImagY = null; Double prevImagY = null;
final MutableInt realSeriesI = new MutableInt(0);
final MutableInt imagSeriesI = new MutableInt(0);
double x = min;
while (x <= max) { while (x <= max) {
boolean needToCalculateRealY = needToCalculate(realSeries, step, x); boolean needToCalculateRealY = needToCalculate(realSeries, step, x, realSeriesI);
if (needToCalculateRealY) { if (needToCalculateRealY) {
Generic numeric = expression.substitute(variable, Expression.valueOf(x)).numeric(); final Complex c = calculatorExpression(expression, variable, x);
final Complex c = unwrap(numeric);
Double y = prepareY(c.realPart()); Double y = prepareY(c.realPart());
if (y != null) { if (y != null) {
addSingularityPoint(realSeries, prevX, x, prevRealY, y); addSingularityPoint(realSeries, prevX, x, prevRealY, y);
@ -299,7 +322,7 @@ public class CalculatorPlotActivity extends Activity {
prevX = x; prevX = x;
} }
boolean needToCalculateImagY = needToCalculate(imagSeries, step, x); boolean needToCalculateImagY = needToCalculate(imagSeries, step, x, imagSeriesI);
if (needToCalculateImagY) { if (needToCalculateImagY) {
y = prepareY(c.imaginaryPart()); y = prepareY(c.imaginaryPart());
if (y != null) { if (y != null) {
@ -313,10 +336,9 @@ public class CalculatorPlotActivity extends Activity {
} }
} }
} else { } else {
boolean needToCalculateImagY = needToCalculate(imagSeries, step, x); boolean needToCalculateImagY = needToCalculate(imagSeries, step, x, imagSeriesI);
if (needToCalculateImagY) { if (needToCalculateImagY) {
Generic numeric = expression.substitute(variable, Expression.valueOf(x)).numeric(); final Complex c = calculatorExpression(expression, variable, x);
final Complex c = unwrap(numeric);
Double y = prepareY(c.imaginaryPart()); Double y = prepareY(c.imaginaryPart());
if (y != null) { if (y != null) {
addSingularityPoint(imagSeries, prevX, x, prevImagY, y); addSingularityPoint(imagSeries, prevX, x, prevImagY, y);
@ -341,6 +363,11 @@ public class CalculatorPlotActivity extends Activity {
return imagExists; return imagExists;
} }
@NotNull
private static Complex calculatorExpression(@NotNull Generic expression, @NotNull Constant variable, double x) {
return unwrap(expression.substitute(variable, Expression.valueOf(x)).numeric());
}
// todo serso: UNABLE TO PLOT i/ln(t)!!! // todo serso: UNABLE TO PLOT i/ln(t)!!!
private static void addSingularityPoint(@NotNull XYSeries series, @Nullable Double prevX, @NotNull Double x, @Nullable Double prevY, @NotNull Double y) { private static void addSingularityPoint(@NotNull XYSeries series, @Nullable Double prevX, @NotNull Double x, @Nullable Double prevY, @NotNull Double y) {
@ -353,10 +380,10 @@ public class CalculatorPlotActivity extends Activity {
} }
} }
private static boolean needToCalculate(@NotNull XYSeries series, double step, double x) { private static boolean needToCalculate(@NotNull XYSeries series, double step, double x, @NotNull MutableInt i) {
boolean needToCalculateY = true; boolean needToCalculateY = true;
for ( int i = 0; i < series.getItemCount(); i++ ){ for ( ; i.intValue() < series.getItemCount(); i.increment() ){
if ( Math.abs(x - series.getX(i)) < step ) { if ( Math.abs(x - series.getX(i.intValue())) < step ) {
needToCalculateY = false; needToCalculateY = false;
break; break;
} }
@ -390,6 +417,16 @@ public class CalculatorPlotActivity extends Activity {
this.xMax = renderer.getXAxisMax(); this.xMax = renderer.getXAxisMax();
this.yMax = renderer.getYAxisMax(); this.yMax = renderer.getYAxisMax();
} }
@Override
public String toString() {
return "PlotBoundaries{" +
"yMax=" + yMax +
", yMin=" + yMin +
", xMax=" + xMax +
", xMin=" + xMin +
'}';
}
} }
private static final class Point implements Serializable { private static final class Point implements Serializable {
@ -440,9 +477,12 @@ public class CalculatorPlotActivity extends Activity {
return Double.compare(point.getX(), point1.getX()); return Double.compare(point.getX(), point1.getX());
} }
}); });
Log.d(CalculatorPlotActivity.class.getName(), "Points for " + series.getTitle());
series.clear(); series.clear();
for (Point value : values) { for (Point value : values) {
series.add(value.getX(), value.getY()); series.add(value.getX(), value.getY());
Log.d(CalculatorPlotActivity.class.getName(), "x = " + value.getX() + ", y = " + value.getY());
} }
} }

1
src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
View File

@ -153,6 +153,7 @@ public class CalculatorEngineTest {
try { try {
cm.getEngine().setDefaultAngleUnit(AngleUnit.rad); cm.getEngine().setDefaultAngleUnit(AngleUnit.rad);
Assert.assertEquals("0.451", cm.evaluate(JsclOperation.numeric, "acos(0.8999999999999811)").getResult());
Assert.assertEquals("-0.959", cm.evaluate(JsclOperation.numeric, "sin(5)").getResult()); Assert.assertEquals("-0.959", cm.evaluate(JsclOperation.numeric, "sin(5)").getResult());
Assert.assertEquals("-4.795", cm.evaluate(JsclOperation.numeric, "sin(5)si").getResult()); Assert.assertEquals("-4.795", cm.evaluate(JsclOperation.numeric, "sin(5)si").getResult());
Assert.assertEquals("-23.973", cm.evaluate(JsclOperation.numeric, "sisin(5)si").getResult()); Assert.assertEquals("-23.973", cm.evaluate(JsclOperation.numeric, "sisin(5)si").getResult());