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

Remove scientificNotation preference and use Output.notation instead

Browse Source
This commit is contained in:
serso 2016-05-02 15:37:19 +02:00
parent 7e26b35199
commit 2ac061d8ba
6 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/solovyev/android/calculator/Engine.java
View File

@ -189,10 +189,17 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
migratePreference(preferences, Preferences.numeralBase, "org.solovyev.android.calculator.CalculatorActivity_numeral_bases", editor); migratePreference(preferences, Preferences.numeralBase, "org.solovyev.android.calculator.CalculatorActivity_numeral_bases", editor);
migratePreference(preferences, Preferences.angleUnit, "org.solovyev.android.calculator.CalculatorActivity_angle_units", editor); migratePreference(preferences, Preferences.angleUnit, "org.solovyev.android.calculator.CalculatorActivity_angle_units", editor);
migratePreference(preferences, Preferences.Output.precision, "org.solovyev.android.calculator.CalculatorModel_result_precision", editor); migratePreference(preferences, Preferences.Output.precision, "org.solovyev.android.calculator.CalculatorModel_result_precision", editor);
migratePreference(preferences, Preferences.Output.scientificNotation, "calculation.output.science_notation", editor); if (preferences.contains("engine.output.science_notation")) {
final boolean scientific = preferences.getBoolean("engine.output.science_notation", false);
Preferences.Output.notation.putPreference(editor, scientific ? Notation.sci : Notation.dec);
}
migratePreference(preferences, Preferences.Output.round, "org.solovyev.android.calculator.CalculatorModel_round_result", editor); migratePreference(preferences, Preferences.Output.round, "org.solovyev.android.calculator.CalculatorModel_round_result", editor);
} else if (oldVersion == 1) { } else if (oldVersion == 1) {
migratePreference(preferences, Preferences.Output.separator, "engine.groupingSeparator", editor); migratePreference(preferences, Preferences.Output.separator, "engine.groupingSeparator", editor);
if (preferences.contains("engine.output.scientificNotation")) {
final boolean scientific = preferences.getBoolean("engine.output.scientificNotation", false);
Preferences.Output.notation.putPreference(editor, scientific ? Notation.sci : Notation.dec);
}
} }
Preferences.version.putDefault(editor); Preferences.version.putDefault(editor);
editor.apply(); editor.apply();
@ -220,7 +227,7 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
setMultiplicationSign(Preferences.multiplicationSign.getPreference(preferences)); setMultiplicationSign(Preferences.multiplicationSign.getPreference(preferences));
mathEngine.setPrecision(Preferences.Output.precision.getPreference(preferences)); mathEngine.setPrecision(Preferences.Output.precision.getPreference(preferences));
mathEngine.setScienceNotation(Preferences.Output.scientificNotation.getPreference(preferences)); mathEngine.setNotation(Preferences.Output.notation.getPreference(preferences).id);
mathEngine.setRoundResult(Preferences.Output.round.getPreference(preferences)); mathEngine.setRoundResult(Preferences.Output.round.getPreference(preferences));
mathEngine.setGroupingSeparator(Preferences.Output.separator.getPreference(preferences)); mathEngine.setGroupingSeparator(Preferences.Output.separator.getPreference(preferences));
@ -277,7 +284,6 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
preferenceKeys.add(numeralBase.getKey()); preferenceKeys.add(numeralBase.getKey());
preferenceKeys.add(angleUnit.getKey()); preferenceKeys.add(angleUnit.getKey());
preferenceKeys.add(Output.precision.getKey()); preferenceKeys.add(Output.precision.getKey());
preferenceKeys.add(Output.scientificNotation.getKey());
preferenceKeys.add(Output.round.getKey()); preferenceKeys.add(Output.round.getKey());
preferenceKeys.add(Output.notation.getKey()); preferenceKeys.add(Output.notation.getKey());
preferenceKeys.add(Output.separator.getKey()); preferenceKeys.add(Output.separator.getKey());
@ -290,12 +296,9 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
public static class Output { public static class Output {
public static final StringPreference<Integer> precision = StringPreference.ofTypedValue("engine.output.precision", "5", NumberMapper.of(Integer.class)); public static final StringPreference<Integer> precision = StringPreference.ofTypedValue("engine.output.precision", "5", NumberMapper.of(Integer.class));
// todo serso: remove
public static final BooleanPreference scientificNotation = BooleanPreference.of("engine.output.scientificNotation", false);
public static final BooleanPreference round = BooleanPreference.of("engine.output.round", true); public static final BooleanPreference round = BooleanPreference.of("engine.output.round", true);
public static final StringPreference<Notation> notation = StringPreference.ofEnum("engine.output.notation", Notation.dec, Notation.class); public static final StringPreference<Notation> notation = StringPreference.ofEnum("engine.output.notation", Notation.dec, Notation.class);
public static final CharacterPreference separator = CharacterPreference.of("engine.output.separator", JsclMathEngine.GROUPING_SEPARATOR_DEFAULT); public static final CharacterPreference separator = CharacterPreference.of("engine.output.separator", JsclMathEngine.GROUPING_SEPARATOR_DEFAULT);
} }
} }
} }

8
app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorMode.java
View File

@ -23,12 +23,14 @@
package org.solovyev.android.calculator.wizard; package org.solovyev.android.calculator.wizard;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import jscl.AngleUnit;
import org.solovyev.android.calculator.Engine; import org.solovyev.android.calculator.Engine;
import org.solovyev.android.calculator.Preferences; import org.solovyev.android.calculator.Preferences;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import jscl.AngleUnit;
enum CalculatorMode { enum CalculatorMode {
simple() { simple() {
@ -38,7 +40,7 @@ enum CalculatorMode {
Preferences.Gui.mode.putPreference(editor, Preferences.Gui.Mode.simple); Preferences.Gui.mode.putPreference(editor, Preferences.Gui.Mode.simple);
Engine.Preferences.angleUnit.putPreference(editor, AngleUnit.deg); Engine.Preferences.angleUnit.putPreference(editor, AngleUnit.deg);
Engine.Preferences.Output.scientificNotation.putPreference(editor, false); Engine.Preferences.Output.notation.putPreference(editor, Engine.Notation.dec);
Engine.Preferences.Output.round.putPreference(editor, true); Engine.Preferences.Output.round.putPreference(editor, true);
editor.apply(); editor.apply();
@ -52,7 +54,7 @@ enum CalculatorMode {
Preferences.Gui.mode.putPreference(editor, Preferences.Gui.Mode.engineer); Preferences.Gui.mode.putPreference(editor, Preferences.Gui.Mode.engineer);
Engine.Preferences.angleUnit.putPreference(editor, AngleUnit.rad); Engine.Preferences.angleUnit.putPreference(editor, AngleUnit.rad);
Engine.Preferences.Output.scientificNotation.putPreference(editor, true); Engine.Preferences.Output.notation.putPreference(editor, Engine.Notation.eng);
Engine.Preferences.Output.round.putPreference(editor, false); Engine.Preferences.Output.round.putPreference(editor, false);
editor.apply(); editor.apply();

16
jscl/src/main/java/jscl/JsclMathEngine.java
View File

@ -51,7 +51,7 @@ public class JsclMathEngine implements MathEngine {
}; };
private char groupingSeparator = GROUPING_SEPARATOR_NO; private char groupingSeparator = GROUPING_SEPARATOR_NO;
private boolean roundResult = false; private boolean roundResult = false;
private int numberFormat = FSE_NONE; private int notation = FSE_NONE;
private int precision = 5; private int precision = 5;
@Nonnull @Nonnull
private AngleUnit angleUnits = DEFAULT_ANGLE_UNITS; private AngleUnit angleUnits = DEFAULT_ANGLE_UNITS;
@ -183,7 +183,7 @@ public class JsclMathEngine implements MathEngine {
final NumberFormatter nf = numberFormatter.get(); final NumberFormatter nf = numberFormatter.get();
nf.setGroupingSeparator(hasGroupingSeparator() ? getGroupingSeparatorChar(nb) : NumberFormatter.NO_GROUPING); nf.setGroupingSeparator(hasGroupingSeparator() ? getGroupingSeparatorChar(nb) : NumberFormatter.NO_GROUPING);
nf.setPrecision(roundResult ? precision : NumberFormatter.NO_ROUNDING); nf.setPrecision(roundResult ? precision : NumberFormatter.NO_ROUNDING);
switch (numberFormat) { switch (notation) {
case FSE_ENG: case FSE_ENG:
nf.useEngineeringFormat(NumberFormatter.DEFAULT_MAGNITUDE); nf.useEngineeringFormat(NumberFormatter.DEFAULT_MAGNITUDE);
break; break;
@ -355,15 +355,11 @@ public class JsclMathEngine implements MathEngine {
this.precision = precision; this.precision = precision;
} }
public void setScienceNotation(boolean scienceNotation) { public void setNotation(int notation) {
setNumberFormat(scienceNotation ? FSE_SCI : FSE_NONE); if (notation != FSE_SCI && notation != FSE_ENG && notation != FSE_NONE) {
throw new IllegalArgumentException("Unsupported notation: " + notation);
} }
this.notation = notation;
public void setNumberFormat(int numberFormat) {
if (numberFormat != FSE_SCI && numberFormat != FSE_ENG && numberFormat != FSE_NONE) {
throw new IllegalArgumentException("Unsupported format: " + numberFormat);
}
this.numberFormat = numberFormat;
} }
public char getGroupingSeparator() { public char getGroupingSeparator() {

2
jscl/src/main/java/jscl/MathContext.java
View File

@ -55,5 +55,5 @@ public interface MathContext {
@Nonnull @Nonnull
String addGroupingSeparators(@Nonnull NumeralBase nb, @Nonnull String ungroupedIntValue); String addGroupingSeparators(@Nonnull NumeralBase nb, @Nonnull String ungroupedIntValue);
void setScienceNotation(boolean scienceNotation); void setNotation(int notation);
} }

4
jscl/src/test/java/jscl/JsclMathEngineTest.java
View File

@ -107,7 +107,7 @@ public class JsclMathEngineTest {
@Test @Test
public void testEngineeringNotationWithRounding() throws Exception { public void testEngineeringNotationWithRounding() throws Exception {
me.setNumberFormat(Real.NumberFormat.FSE_ENG); me.setNotation(Real.NumberFormat.FSE_ENG);
me.setRoundResult(true); me.setRoundResult(true);
me.setPrecision(5); me.setPrecision(5);
@ -163,7 +163,7 @@ public class JsclMathEngineTest {
@Test @Test
public void testEngineeringNotationWithoutRounding() throws Exception { public void testEngineeringNotationWithoutRounding() throws Exception {
me.setNumberFormat(Real.NumberFormat.FSE_ENG); me.setNotation(Real.NumberFormat.FSE_ENG);
me.setRoundResult(false); me.setRoundResult(false);
assertEquals("10E6", me.format(10000000d)); assertEquals("10E6", me.format(10000000d));

15
jscl/src/test/java/jscl/math/ExpressionTest.java
View File

@ -21,6 +21,7 @@ import jscl.math.function.Constant;
import jscl.math.function.ExtendedConstant; import jscl.math.function.ExtendedConstant;
import jscl.math.function.IConstant; import jscl.math.function.IConstant;
import jscl.text.ParseException; import jscl.text.ParseException;
import midpcalc.Real;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -797,17 +798,17 @@ public class ExpressionTest {
assertEquals("0.000001222", Expression.valueOf("1222/(10^9)").numeric().toString()); assertEquals("0.000001222", Expression.valueOf("1222/(10^9)").numeric().toString());
assertEquals("12 345", JsclInteger.valueOf(12345L).toString()); assertEquals("12 345", JsclInteger.valueOf(12345L).toString());
me.setScienceNotation(true); me.setNotation(Real.NumberFormat.FSE_SCI);
assertEquals("0", Expression.valueOf("0.0").simplify().toString()); assertEquals("0", Expression.valueOf("0.0").simplify().toString());
assertEquals("1", Expression.valueOf("1.0").simplify().toString()); assertEquals("1", Expression.valueOf("1.0").simplify().toString());
assertEquals("100", Expression.valueOf("100.0").simplify().toString()); assertEquals("100", Expression.valueOf("100.0").simplify().toString());
me.setScienceNotation(false); me.setNotation(Real.NumberFormat.FSE_NONE);
me.setRoundResult(true); me.setRoundResult(true);
me.setPrecision(5); me.setPrecision(5);
assertEquals("0", Expression.valueOf("1222/(10^9)").numeric().toString()); assertEquals("0", Expression.valueOf("1222/(10^9)").numeric().toString());
me.setScienceNotation(true); me.setNotation(Real.NumberFormat.FSE_SCI);
me.setRoundResult(true); me.setRoundResult(true);
me.setPrecision(5); me.setPrecision(5);
assertEquals("1.222E-6", Expression.valueOf("1222/(10^9)").numeric().toString()); assertEquals("1.222E-6", Expression.valueOf("1222/(10^9)").numeric().toString());
@ -819,24 +820,24 @@ public class ExpressionTest {
me.setRoundResult(false); me.setRoundResult(false);
assertEquals("1.222E-6", Expression.valueOf("1222/(10^9)").numeric().toString()); assertEquals("1.222E-6", Expression.valueOf("1222/(10^9)").numeric().toString());
me.setScienceNotation(false); me.setNotation(Real.NumberFormat.FSE_NONE);
assertEquals("0.3333333333333333", Expression.valueOf("1/3").numeric().toString()); assertEquals("0.3333333333333333", Expression.valueOf("1/3").numeric().toString());
me.setScienceNotation(true); me.setNotation(Real.NumberFormat.FSE_SCI);
assertEquals("0.3333333333333333", Expression.valueOf("1/3").numeric().toString()); assertEquals("0.3333333333333333", Expression.valueOf("1/3").numeric().toString());
me.setRoundResult(true); me.setRoundResult(true);
me.setPrecision(10); me.setPrecision(10);
assertEquals("0.3333333333", Expression.valueOf("1/3").numeric().toString()); assertEquals("0.3333333333", Expression.valueOf("1/3").numeric().toString());
me.setScienceNotation(false); me.setNotation(Real.NumberFormat.FSE_NONE);
me.setRoundResult(true); me.setRoundResult(true);
me.setPrecision(10); me.setPrecision(10);
assertEquals("0.3333333333", Expression.valueOf("1/3").numeric().toString()); assertEquals("0.3333333333", Expression.valueOf("1/3").numeric().toString());
} finally { } finally {
me.setGroupingSeparator(JsclMathEngine.GROUPING_SEPARATOR_NO); me.setGroupingSeparator(JsclMathEngine.GROUPING_SEPARATOR_NO);
me.setScienceNotation(false); me.setNotation(Real.NumberFormat.FSE_NONE);
me.setRoundResult(false); me.setRoundResult(false);
} }
} }