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

Load functions in a smart way

Browse Source
This commit is contained in:
serso 2016-04-02 19:39:18 +02:00
parent f12aea8495
commit 2a0da6403b
1 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/src/main/java/org/solovyev/android/calculator/functions/FunctionsRegistry.java
View File

@ -44,9 +44,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.*;
import java.util.Collections;
import java.util.List;
import static android.text.TextUtils.isEmpty; import static android.text.TextUtils.isEmpty;
@ -102,29 +100,59 @@ public class FunctionsRegistry extends BaseEntitiesRegistry<Function> {
try { try {
migrateOldFunctions(); migrateOldFunctions();
addSafely(new CustomFunction.Builder(true, "log", Arrays.asList("base", "x"), "ln(x)/ln(base)")); final List<CustomFunction.Builder> functions = new ArrayList<>();
addSafely(new CustomFunction.Builder(true, "√3", Collections.singletonList("x"), "x^(1/3)")); functions.add(new CustomFunction.Builder(true, "log", Arrays.asList("base", "x"), "ln(x)/ln(base)"));
addSafely(new CustomFunction.Builder(true, "√4", Collections.singletonList("x"), "x^(1/4)")); functions.add(new CustomFunction.Builder(true, "√3", Collections.singletonList("x"), "x^(1/3)"));
addSafely(new CustomFunction.Builder(true, "√n", Arrays.asList("x", "n"), "x^(1/n)")); functions.add(new CustomFunction.Builder(true, "√4", Collections.singletonList("x"), "x^(1/4)"));
addSafely(new CustomFunction.Builder(true, "re", Collections.singletonList("x"), "(x+conjugate(x))/2")); functions.add(new CustomFunction.Builder(true, "√n", Arrays.asList("x", "n"), "x^(1/n)"));
addSafely(new CustomFunction.Builder(true, "im", Collections.singletonList("x"), "(x-conjugate(x))/(2*i)")); functions.add(new CustomFunction.Builder(true, "re", Collections.singletonList("x"), "(x+conjugate(x))/2"));
functions.add(new CustomFunction.Builder(true, "im", Collections.singletonList("x"), "(x-conjugate(x))/(2*i)"));
for (CppFunction function : loadEntities(CppFunction.JSON_CREATOR)) { for (CppFunction function : loadEntities(CppFunction.JSON_CREATOR)) {
addSafely(function.toJsclBuilder()); functions.add(function.toJsclBuilder());
} }
addSafely(functions);
} finally { } finally {
setInitialized(); setInitialized();
} }
} }
@Nullable /**
protected Function addSafely(@Nonnull CustomFunction.Builder builder) { * As some functions might depend on not-yet-loaded functions we need to try to add all functions first and then
try { * re-run again if there are functions left. This process should continue until we can't add more functions
return addSafely(builder.create()); * @param functions functions to add
} catch (Exception e) { */
errorReporter.onException(e); private void addSafely(@Nonnull List<CustomFunction.Builder> functions) {
final List<Exception> exceptions = new ArrayList<>();
while (functions.size() > 0) {
final int sizeBefore = functions.size();
// prepare exceptions list for new round
exceptions.clear();
addSafely(functions, exceptions);
final int sizeAfter = functions.size();
if (sizeBefore == sizeAfter) {
break;
}
}
if (functions.size() > 0) {
// report exceptions
for (Exception exception : exceptions) {
errorReporter.onException(exception);
}
}
}
private void addSafely(@Nonnull List<CustomFunction.Builder> functions, @Nonnull List<Exception> exceptions) {
for (Iterator<CustomFunction.Builder> iterator = functions.iterator(); iterator.hasNext(); ) {
final CustomFunction.Builder function = iterator.next();
try {
addSafely(function.create());
iterator.remove();
} catch (Exception e) {
exceptions.add(e);
}
} }
return null;
} }
@Override @Override
@ -152,7 +180,6 @@ public class FunctionsRegistry extends BaseEntitiesRegistry<Function> {
final OldFunctions oldFunctions = serializer.read(OldFunctions.class, xml); final OldFunctions oldFunctions = serializer.read(OldFunctions.class, xml);
if (oldFunctions != null) { if (oldFunctions != null) {
List<CppFunction> functions = OldFunctions.toCppFunctions(oldFunctions); List<CppFunction> functions = OldFunctions.toCppFunctions(oldFunctions);
// todo serso: fix multiplication sign issue
FileSaver.save(getEntitiesFile(), Json.toJson(functions).toString()); FileSaver.save(getEntitiesFile(), Json.toJson(functions).toString());
} }
preferences.edit().remove(OldFunctions.PREFS_KEY).apply(); preferences.edit().remove(OldFunctions.PREFS_KEY).apply();