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

FunctionsRegistry refactor

Browse Source
This commit is contained in:
serso 2016-01-20 21:51:21 +01:00
parent 591cfa4648
commit 3a879b0de8
25 changed files with 689 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/solovyev/android/calculator/AppModule.java
View File

@ -6,22 +6,19 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.squareup.otto.Bus; import com.squareup.otto.Bus;
import dagger.Module;
import dagger.Provides;
import jscl.JsclMathEngine;
import org.solovyev.android.UiThreadExecutor; import org.solovyev.android.UiThreadExecutor;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.inject.Named; import javax.inject.Named;
import javax.inject.Singleton; import javax.inject.Singleton;
import java.util.concurrent.Executor;
import dagger.Module; import java.util.concurrent.Executors;
import dagger.Provides; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
@Module @Module
public class AppModule { public class AppModule {
@ -89,6 +86,7 @@ public class AppModule {
return Executors.newFixedThreadPool(5, new ThreadFactory() { return Executors.newFixedThreadPool(5, new ThreadFactory() {
@NonNull @NonNull
private final AtomicInteger counter = new AtomicInteger(); private final AtomicInteger counter = new AtomicInteger();
@Override @Override
public Thread newThread(@Nonnull Runnable r) { public Thread newThread(@Nonnull Runnable r) {
return new Thread(r, "Background #" + counter.getAndIncrement()); return new Thread(r, "Background #" + counter.getAndIncrement());
@ -109,6 +107,12 @@ public class AppModule {
return new UiThreadExecutor(); return new UiThreadExecutor();
} }
@Provides
@Singleton
JsclMathEngine provideJsclMathEngine() {
return JsclMathEngine.getInstance();
}
private static class AppBus extends Bus { private static class AppBus extends Bus {
@NonNull @NonNull

41
app/src/main/java/org/solovyev/android/calculator/BaseEntitiesRegistry.java
View File

@ -22,18 +22,20 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.content.Context;
import android.content.res.Resources;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.model.EntityDao; import org.solovyev.android.calculator.model.EntityDao;
import org.solovyev.common.JBuilder; import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathEntity; import org.solovyev.common.math.MathEntity;
import org.solovyev.common.math.MathRegistry; import org.solovyev.common.math.MathRegistry;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public abstract class BaseEntitiesRegistry<T extends MathEntity, P extends PersistedEntity> implements EntitiesRegistry<T> { public abstract class BaseEntitiesRegistry<T extends MathEntity, P extends PersistedEntity> implements EntitiesRegistry<T> {
@Nonnull @Nonnull
@ -42,12 +44,12 @@ public abstract class BaseEntitiesRegistry<T extends MathEntity, P extends Persi
@Nonnull @Nonnull
private final String prefix; private final String prefix;
@Nonnull @Nullable
private final EntityDao<P> entityDao; protected final EntityDao<P> entityDao;
protected BaseEntitiesRegistry(@Nonnull MathRegistry<T> mathRegistry, protected BaseEntitiesRegistry(@Nonnull MathRegistry<T> mathRegistry,
@Nonnull String prefix, @Nonnull String prefix,
@Nonnull EntityDao<P> entityDao) { @Nullable EntityDao<P> entityDao) {
this.mathRegistry = mathRegistry; this.mathRegistry = mathRegistry;
this.prefix = prefix; this.prefix = prefix;
this.entityDao = entityDao; this.entityDao = entityDao;
@ -70,10 +72,28 @@ public abstract class BaseEntitiesRegistry<T extends MathEntity, P extends Persi
stringName = prefix + substitute; stringName = prefix + substitute;
} }
return entityDao.getDescription(stringName); return getDescription(App.getApplication(), stringName);
} }
public synchronized void load() {
@Nullable
public String getDescription(@Nonnull Context context, @Nonnull String descriptionId) {
final Resources resources = context.getResources();
final int stringId = resources.getIdentifier(descriptionId, "string", CalculatorApplication.class.getPackage().getName());
try {
return resources.getString(stringId);
} catch (Resources.NotFoundException e) {
return null;
}
}
public synchronized void init() {
Check.isNotMainThread();
if (entityDao == null) {
return;
}
final PersistedEntitiesContainer<P> persistenceContainer = entityDao.load(); final PersistedEntitiesContainer<P> persistenceContainer = entityDao.load();
final List<P> notCreatedEntities = new ArrayList<P>(); final List<P> notCreatedEntities = new ArrayList<P>();
@ -112,6 +132,9 @@ public abstract class BaseEntitiesRegistry<T extends MathEntity, P extends Persi
@Override @Override
public synchronized void save() { public synchronized void save() {
if (entityDao == null) {
return;
}
final PersistedEntitiesContainer<P> container = createPersistenceContainer(); final PersistedEntitiesContainer<P> container = createPersistenceContainer();
for (T entity : this.getEntities()) { for (T entity : this.getEntities()) {
@ -123,7 +146,7 @@ public abstract class BaseEntitiesRegistry<T extends MathEntity, P extends Persi
} }
} }
this.entityDao.save(container); entityDao.save(container);
} }
@Nullable @Nullable

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

@ -22,13 +22,15 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.app.Application;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import com.squareup.otto.Bus; import com.squareup.otto.Bus;
import jscl.AngleUnit;
import jscl.JsclMathEngine;
import jscl.MathEngine;
import jscl.NumeralBase;
import jscl.math.function.IConstant;
import jscl.math.operator.Operator;
import org.solovyev.android.calculator.model.EntityDao; import org.solovyev.android.calculator.model.EntityDao;
import org.solovyev.android.calculator.model.Functions;
import org.solovyev.android.calculator.model.Vars; import org.solovyev.android.calculator.model.Vars;
import org.solovyev.android.prefs.BooleanPreference; import org.solovyev.android.prefs.BooleanPreference;
import org.solovyev.android.prefs.IntegerPreference; import org.solovyev.android.prefs.IntegerPreference;
@ -38,23 +40,14 @@ import org.solovyev.common.text.EnumMapper;
import org.solovyev.common.text.NumberMapper; import org.solovyev.common.text.NumberMapper;
import org.solovyev.common.text.Strings; import org.solovyev.common.text.Strings;
import javax.annotation.Nonnull;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import javax.annotation.Nonnull;
import javax.inject.Inject;
import javax.inject.Singleton;
import jscl.AngleUnit;
import jscl.JsclMathEngine;
import jscl.MathEngine;
import jscl.NumeralBase;
import jscl.math.function.Function;
import jscl.math.function.IConstant;
import jscl.math.operator.Operator;
@Singleton @Singleton
public class Engine implements SharedPreferences.OnSharedPreferenceChangeListener { public class Engine implements SharedPreferences.OnSharedPreferenceChangeListener {
@ -62,8 +55,7 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
private final MathEngine mathEngine; private final MathEngine mathEngine;
@Nonnull @Nonnull
private final EntitiesRegistry<IConstant> varsRegistry; private final EntitiesRegistry<IConstant> varsRegistry;
@Nonnull
private final EntitiesRegistry<Function> functionsRegistry;
@Nonnull @Nonnull
private final EntitiesRegistry<Operator> operatorsRegistry; private final EntitiesRegistry<Operator> operatorsRegistry;
@Nonnull @Nonnull
@ -74,10 +66,12 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
Bus bus; Bus bus;
@Inject @Inject
ErrorReporter errorReporter; ErrorReporter errorReporter;
@Inject
FunctionsRegistry functionsRegistry;
@Nonnull @Nonnull
private String multiplicationSign = Preferences.multiplicationSign.getDefaultValue(); private String multiplicationSign = Preferences.multiplicationSign.getDefaultValue();
public Engine(@Nonnull MathEngine mathEngine, @Nonnull EntitiesRegistry<IConstant> varsRegistry, @Nonnull EntitiesRegistry<Function> functionsRegistry, @Nonnull EntitiesRegistry<Operator> operatorsRegistry, @Nonnull EntitiesRegistry<Operator> postfixFunctionsRegistry) { public Engine(@Nonnull MathEngine mathEngine, @Nonnull EntitiesRegistry<IConstant> varsRegistry, @Nonnull FunctionsRegistry functionsRegistry, @Nonnull EntitiesRegistry<Operator> operatorsRegistry, @Nonnull EntitiesRegistry<Operator> postfixFunctionsRegistry) {
this.mathEngine = mathEngine; this.mathEngine = mathEngine;
this.varsRegistry = varsRegistry; this.varsRegistry = varsRegistry;
this.functionsRegistry = functionsRegistry; this.functionsRegistry = functionsRegistry;
@ -86,16 +80,15 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
} }
@Inject @Inject
public Engine(@Nonnull Application application) { public Engine(@Nonnull SharedPreferences preferences, @Nonnull JsclMathEngine mathEngine) {
this.mathEngine = JsclMathEngine.getInstance(); this.mathEngine = mathEngine;
this.mathEngine.setRoundResult(true); this.mathEngine.setRoundResult(true);
this.mathEngine.setUseGroupingSeparator(true); this.mathEngine.setUseGroupingSeparator(true);
this.varsRegistry = new VarsRegistry(mathEngine.getConstantsRegistry(), new EntityDao<>("org.solovyev.android.calculator.CalculatorModel_vars", application, Vars.class)); this.varsRegistry = new VarsRegistry(mathEngine.getConstantsRegistry(), new EntityDao<>("org.solovyev.android.calculator.CalculatorModel_vars", Vars.class, preferences));
this.functionsRegistry = new FunctionsRegistry(mathEngine.getFunctionsRegistry(), new EntityDao<>("org.solovyev.android.calculator.CalculatorModel_functions", application, Functions.class)); this.operatorsRegistry = new OperatorsRegistry(mathEngine.getOperatorsRegistry());
this.operatorsRegistry = new OperatorsRegistry(mathEngine.getOperatorsRegistry(), new EntityDao<>(null, application, null)); this.postfixFunctionsRegistry = new PostfixFunctionsRegistry(mathEngine.getPostfixFunctionsRegistry());
this.postfixFunctionsRegistry = new PostfixFunctionsRegistry(mathEngine.getPostfixFunctionsRegistry(), new EntityDao<>(null, application, null));
} }
private static void migratePreference(@Nonnull SharedPreferences preferences, @Nonnull BooleanPreference preference, @Nonnull String oldKey, @Nonnull SharedPreferences.Editor editor) { private static void migratePreference(@Nonnull SharedPreferences preferences, @Nonnull BooleanPreference preference, @Nonnull String oldKey, @Nonnull SharedPreferences.Editor editor) {
@ -118,7 +111,7 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
} }
@Nonnull @Nonnull
public EntitiesRegistry<Function> getFunctionsRegistry() { public FunctionsRegistry getFunctionsRegistry() {
return functionsRegistry; return functionsRegistry;
} }
@ -175,15 +168,15 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
} }
private void initAsync() { private void initAsync() {
safeLoadRegistry(varsRegistry); init(varsRegistry);
safeLoadRegistry(functionsRegistry); init(functionsRegistry);
safeLoadRegistry(operatorsRegistry); init(operatorsRegistry);
safeLoadRegistry(postfixFunctionsRegistry); init(postfixFunctionsRegistry);
} }
private void safeLoadRegistry(@Nonnull EntitiesRegistry<?> registry) { private void init(@Nonnull EntitiesRegistry<?> registry) {
try { try {
registry.load(); registry.init();
} catch (Exception e) { } catch (Exception e) {
errorReporter.onException(e); errorReporter.onException(e);
} }

2
app/src/main/java/org/solovyev/android/calculator/EntitiesRegistry.java
View File

@ -36,7 +36,7 @@ public interface EntitiesRegistry<E extends MathEntity> extends MathRegistry<E>
@Nullable @Nullable
String getCategory(@Nonnull E entity); String getCategory(@Nonnull E entity);
void load(); void init();
void save(); void save();
} }

14
app/src/main/java/org/solovyev/android/calculator/FunctionCategory.java
View File

@ -22,18 +22,14 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import org.solovyev.common.collections.Collections;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import javax.annotation.Nonnull;
import jscl.math.function.ArcTrigonometric; import jscl.math.function.ArcTrigonometric;
import jscl.math.function.Comparison; import jscl.math.function.Comparison;
import jscl.math.function.Function; import jscl.math.function.Function;
import jscl.math.function.Trigonometric; import jscl.math.function.Trigonometric;
import org.solovyev.common.collections.Collections;
import javax.annotation.Nonnull;
import java.util.*;
/** /**
* User: serso * User: serso
@ -51,7 +47,7 @@ public enum FunctionCategory {
hyperbolic_trigonometric(300) { hyperbolic_trigonometric(300) {
private final List<String> names = Arrays.asList("sinh", "cosh", "tanh", "coth", "asinh", "acosh", "atanh", "acoth"); private final Set<String> names = new HashSet<>(Arrays.asList("sinh", "cosh", "tanh", "coth", "asinh", "acosh", "atanh", "acoth"));
@Override @Override
public boolean isInCategory(@Nonnull Function function) { public boolean isInCategory(@Nonnull Function function) {

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

@ -22,32 +22,45 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import org.solovyev.android.calculator.function.FunctionBuilderAdapter; import android.app.Application;
import org.solovyev.android.calculator.model.AFunction; import android.content.SharedPreferences;
import org.solovyev.android.calculator.model.Functions; import android.os.Handler;
import org.solovyev.android.calculator.model.MathEntityBuilder; import android.support.annotation.NonNull;
import org.solovyev.android.calculator.model.EntityDao; import jscl.JsclMathEngine;
import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathRegistry;
import org.solovyev.common.text.Strings;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.CustomFunctionCalculationException;
import jscl.math.function.CustomFunction; import jscl.math.function.CustomFunction;
import jscl.math.function.Function; import jscl.math.function.Function;
import jscl.math.function.IFunction; import jscl.math.function.IFunction;
import org.json.JSONArray;
import org.json.JSONException;
import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.core.Persister;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.function.CppFunction;
import org.solovyev.android.calculator.function.FunctionBuilderAdapter;
import org.solovyev.android.calculator.json.Json;
import org.solovyev.android.calculator.model.OldFunction;
import org.solovyev.android.calculator.model.OldFunctions;
import org.solovyev.android.io.FileSaver;
import org.solovyev.common.JBuilder;
import org.solovyev.common.text.Strings;
public class FunctionsRegistry extends BaseEntitiesRegistry<Function, AFunction> { import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.Executor;
import static android.text.TextUtils.isEmpty;
@Singleton
public class FunctionsRegistry extends BaseEntitiesRegistry<Function, OldFunction> {
@Nonnull @Nonnull
private static final Map<String, String> substitutes = new HashMap<String, String>(); private static final Map<String, String> substitutes = new HashMap<>();
@Nonnull @Nonnull
private static final String FUNCTION_DESCRIPTION_PREFIX = "c_fun_description_"; private static final String FUNCTION_DESCRIPTION_PREFIX = "c_fun_description_";
@ -55,30 +68,42 @@ public class FunctionsRegistry extends BaseEntitiesRegistry<Function, AFunction>
substitutes.put("√", "sqrt"); substitutes.put("√", "sqrt");
} }
public FunctionsRegistry(@Nonnull MathRegistry<Function> functionsRegistry, @NonNull
@Nonnull EntityDao<AFunction> entityDao) { private final WriteTask writeTask = new WriteTask();
super(functionsRegistry, FUNCTION_DESCRIPTION_PREFIX, entityDao); @Inject
} @Named(AppModule.THREAD_BACKGROUND)
Executor backgroundThread;
public static void saveFunction(@Nonnull EntitiesRegistry<Function> registry, @Inject
@Nonnull MathEntityBuilder<? extends Function> builder, Handler handler;
@Nullable IFunction editedInstance, @Inject
@Nonnull Object source, boolean save) throws CustomFunctionCalculationException, AFunction.Builder.CreationException { ErrorReporter errorReporter;
final Function addedFunction = registry.add(builder); @Inject
Calculator calculator;
if (save) { @Inject
registry.save(); SharedPreferences preferences;
@Inject
Application application;
@Inject
public FunctionsRegistry(@Nonnull JsclMathEngine mathEngine) {
super(mathEngine.getFunctionsRegistry(), FUNCTION_DESCRIPTION_PREFIX, null);
} }
public void add(@NonNull FunctionBuilderAdapter builder, @Nullable IFunction editedInstance, Object source) {
final Function function = add(builder);
save();
if (editedInstance == null) { if (editedInstance == null) {
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.function_added, addedFunction, source); calculator.fireCalculatorEvent(CalculatorEventType.function_added, function, source);
} else { } else {
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.function_changed, ChangeImpl.newInstance(editedInstance, addedFunction), source); calculator.fireCalculatorEvent(CalculatorEventType.function_changed, ChangeImpl.newInstance(editedInstance, function), source);
} }
} }
@Override @Override
public void load() { public void init() {
Check.isNotMainThread();
migrateOldFunctions();
add(new CustomFunction.Builder(true, "log", Arrays.asList("base", "x"), "ln(x)/ln(base)")); add(new CustomFunction.Builder(true, "log", Arrays.asList("base", "x"), "ln(x)/ln(base)"));
add(new CustomFunction.Builder(true, "√3", Collections.singletonList("x"), "x^(1/3)")); add(new CustomFunction.Builder(true, "√3", Collections.singletonList("x"), "x^(1/3)"));
add(new CustomFunction.Builder(true, "√4", Collections.singletonList("x"), "x^(1/4)")); add(new CustomFunction.Builder(true, "√4", Collections.singletonList("x"), "x^(1/4)"));
@ -86,7 +111,50 @@ public class FunctionsRegistry extends BaseEntitiesRegistry<Function, AFunction>
add(new CustomFunction.Builder(true, "re", Collections.singletonList("x"), "(x+conjugate(x))/2")); add(new CustomFunction.Builder(true, "re", Collections.singletonList("x"), "(x+conjugate(x))/2"));
add(new CustomFunction.Builder(true, "im", Collections.singletonList("x"), "(x-conjugate(x))/(2*i)")); add(new CustomFunction.Builder(true, "im", Collections.singletonList("x"), "(x-conjugate(x))/(2*i)"));
super.load(); for (CppFunction function : loadFunctions()) {
final CustomFunction.Builder builder = new CustomFunction.Builder(function.getName(), function.getParameters(), function.getBody());
builder.setDescription(function.getDescription());
add(builder);
}
}
@NonNull
private List<CppFunction> loadFunctions() {
try {
return Json.load(getFunctionsFile(), CppFunction.JSON_CREATOR);
} catch (IOException | JSONException e) {
errorReporter.onException(e);
}
return Collections.emptyList();
}
private void migrateOldFunctions() {
final String xml = preferences.getString(OldFunctions.PREFS_KEY, null);
if (isEmpty(xml)) {
return;
}
try {
final Serializer serializer = new Persister();
final OldFunctions oldFunctions = serializer.read(OldFunctions.class, xml);
if (oldFunctions != null) {
List<CppFunction> functions = OldFunctions.toCppFunctions(oldFunctions);
FileSaver.save(getFunctionsFile(), Json.toJson(functions).toString());
}
preferences.edit().remove(OldFunctions.PREFS_KEY).apply();
} catch (Exception e) {
errorReporter.onException(e);
}
}
@Override
public synchronized void save() {
handler.removeCallbacks(writeTask);
handler.postDelayed(writeTask, 500);
}
@NonNull
private File getFunctionsFile() {
return new File(application.getFilesDir(), "functions.json");
} }
@Nonnull @Nonnull
@ -111,29 +179,28 @@ public class FunctionsRegistry extends BaseEntitiesRegistry<Function, AFunction>
public String getDescription(@Nonnull String name) { public String getDescription(@Nonnull String name) {
final Function function = get(name); final Function function = get(name);
String result = null; String description = null;
if (function instanceof CustomFunction) { if (function instanceof CustomFunction) {
result = ((CustomFunction) function).getDescription(); description = ((CustomFunction) function).getDescription();
} }
if (Strings.isEmpty(result)) { if (!Strings.isEmpty(description)) {
result = super.getDescription(name); return description;
} }
return super.getDescription(name);
return result;
} }
@Nonnull @Nonnull
@Override @Override
protected JBuilder<? extends Function> createBuilder(@Nonnull AFunction function) { protected JBuilder<? extends Function> createBuilder(@Nonnull OldFunction function) {
return new FunctionBuilderAdapter(new AFunction.Builder(function)); return new FunctionBuilderAdapter(new OldFunction.Builder(function));
} }
@Override @Override
protected AFunction transform(@Nonnull Function function) { protected OldFunction transform(@Nonnull Function function) {
if (function instanceof CustomFunction) { if (function instanceof CustomFunction) {
return AFunction.fromIFunction((CustomFunction) function); return OldFunction.fromIFunction((CustomFunction) function);
} else { } else {
return null; return null;
} }
@ -141,7 +208,35 @@ public class FunctionsRegistry extends BaseEntitiesRegistry<Function, AFunction>
@Nonnull @Nonnull
@Override @Override
protected PersistedEntitiesContainer<AFunction> createPersistenceContainer() { protected PersistedEntitiesContainer<OldFunction> createPersistenceContainer() {
return new Functions(); return new OldFunctions();
}
private class WriteTask implements Runnable {
@Override
public void run() {
Check.isMainThread();
final List<CppFunction> functions = new ArrayList<>();
for (Function function : getEntities()) {
if (function.isSystem()) {
continue;
}
if (function instanceof CustomFunction) {
functions.add(CppFunction.builder((CustomFunction) function).build());
}
}
backgroundThread.execute(new Runnable() {
@Override
public void run() {
final JSONArray array = Json.toJson(functions);
try {
FileSaver.save(getFunctionsFile(), array.toString());
} catch (IOException e) {
errorReporter.onException(e);
}
}
});
}
} }
} }

22
app/src/main/java/org/solovyev/android/calculator/OperatorsRegistry.java
View File

@ -22,17 +22,14 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import org.solovyev.android.calculator.model.EntityDao; import jscl.math.operator.Operator;
import org.solovyev.common.JBuilder; import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathRegistry; import org.solovyev.common.math.MathRegistry;
import javax.annotation.Nonnull;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.annotation.Nonnull;
import jscl.math.operator.Operator;
public class OperatorsRegistry extends BaseEntitiesRegistry<Operator, PersistedEntity> { public class OperatorsRegistry extends BaseEntitiesRegistry<Operator, PersistedEntity> {
@Nonnull @Nonnull
@ -49,9 +46,8 @@ public class OperatorsRegistry extends BaseEntitiesRegistry<Operator, PersistedE
substitutes.put("Σ", "sum"); substitutes.put("Σ", "sum");
} }
public OperatorsRegistry(@Nonnull MathRegistry<Operator> functionsRegistry, public OperatorsRegistry(@Nonnull MathRegistry<Operator> functionsRegistry) {
@Nonnull EntityDao<PersistedEntity> entityDao) { super(functionsRegistry, OPERATOR_DESCRIPTION_PREFIX, null);
super(functionsRegistry, OPERATOR_DESCRIPTION_PREFIX, entityDao);
} }
@Nonnull @Nonnull
@ -70,22 +66,12 @@ public class OperatorsRegistry extends BaseEntitiesRegistry<Operator, PersistedE
return null; return null;
} }
@Override
public void load() {
// not supported yet
}
@Nonnull @Nonnull
@Override @Override
protected JBuilder<? extends Operator> createBuilder(@Nonnull PersistedEntity entity) { protected JBuilder<? extends Operator> createBuilder(@Nonnull PersistedEntity entity) {
return null; //To change body of implemented methods use File | Settings | File Templates. return null; //To change body of implemented methods use File | Settings | File Templates.
} }
@Override
public void save() {
// not supported yet
}
@Override @Override
protected PersistedEntity transform(@Nonnull Operator entity) { protected PersistedEntity transform(@Nonnull Operator entity) {
return null; //To change body of implemented methods use File | Settings | File Templates. return null; //To change body of implemented methods use File | Settings | File Templates.

23
app/src/main/java/org/solovyev/android/calculator/PostfixFunctionsRegistry.java
View File

@ -22,17 +22,14 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import org.solovyev.android.calculator.model.EntityDao; import jscl.math.operator.Operator;
import org.solovyev.common.JBuilder; import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathRegistry; import org.solovyev.common.math.MathRegistry;
import javax.annotation.Nonnull;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.annotation.Nonnull;
import jscl.math.operator.Operator;
public class PostfixFunctionsRegistry extends BaseEntitiesRegistry<Operator, PersistedEntity> { public class PostfixFunctionsRegistry extends BaseEntitiesRegistry<Operator, PersistedEntity> {
@Nonnull @Nonnull
@ -47,12 +44,10 @@ public class PostfixFunctionsRegistry extends BaseEntitiesRegistry<Operator, Per
substitutes.put("°", "degree"); substitutes.put("°", "degree");
} }
public PostfixFunctionsRegistry(@Nonnull MathRegistry<Operator> functionsRegistry, public PostfixFunctionsRegistry(@Nonnull MathRegistry<Operator> functionsRegistry) {
@Nonnull EntityDao<PersistedEntity> entityDao) { super(functionsRegistry, POSTFIX_FUNCTION_DESCRIPTION_PREFIX, null);
super(functionsRegistry, POSTFIX_FUNCTION_DESCRIPTION_PREFIX, entityDao);
} }
@Nonnull @Nonnull
@Override @Override
protected Map<String, String> getSubstitutes() { protected Map<String, String> getSubstitutes() {
@ -69,22 +64,12 @@ public class PostfixFunctionsRegistry extends BaseEntitiesRegistry<Operator, Per
return null; return null;
} }
@Override
public void load() {
// not supported yet
}
@Nonnull @Nonnull
@Override @Override
protected JBuilder<? extends Operator> createBuilder(@Nonnull PersistedEntity entity) { protected JBuilder<? extends Operator> createBuilder(@Nonnull PersistedEntity entity) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void save() {
// not supported yet
}
@Override @Override
protected PersistedEntity transform(@Nonnull Operator entity) { protected PersistedEntity transform(@Nonnull Operator entity) {
return null; return null;

14
app/src/main/java/org/solovyev/android/calculator/VarsRegistry.java
View File

@ -22,21 +22,19 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import org.solovyev.android.calculator.model.MathEntityBuilder; import jscl.math.function.IConstant;
import org.solovyev.android.calculator.model.EntityDao; import org.solovyev.android.calculator.model.EntityDao;
import org.solovyev.android.calculator.model.MathEntityBuilder;
import org.solovyev.android.calculator.model.Var; import org.solovyev.android.calculator.model.Var;
import org.solovyev.android.calculator.model.Vars; import org.solovyev.android.calculator.model.Vars;
import org.solovyev.common.JBuilder; import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathEntity; import org.solovyev.common.math.MathEntity;
import org.solovyev.common.math.MathRegistry; import org.solovyev.common.math.MathRegistry;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.HashMap;
import jscl.math.function.IConstant; import java.util.Map;
public class VarsRegistry extends BaseEntitiesRegistry<IConstant, Var> { public class VarsRegistry extends BaseEntitiesRegistry<IConstant, Var> {
@ -82,8 +80,8 @@ public class VarsRegistry extends BaseEntitiesRegistry<IConstant, Var> {
return substitutes; return substitutes;
} }
public synchronized void load() { public synchronized void init() {
super.load(); super.init();
tryToAddAuxVar("x"); tryToAddAuxVar("x");
tryToAddAuxVar("y"); tryToAddAuxVar("y");

187
app/src/main/java/org/solovyev/android/calculator/function/CppFunction.java Normal file
View File

@ -0,0 +1,187 @@
package org.solovyev.android.calculator.function;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import jscl.math.function.IFunction;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.json.Json;
import org.solovyev.android.calculator.json.Jsonable;
import org.solovyev.common.text.Strings;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public class CppFunction implements Jsonable {
public static final Json.Creator<CppFunction> JSON_CREATOR = new Json.Creator<CppFunction>() {
@NonNull
@Override
public CppFunction create(@NonNull JSONObject json) throws JSONException {
return new CppFunction(json);
}
};
private static final String JSON_NAME = "n";
private static final String JSON_BODY = "b";
private static final String JSON_PARAMETERS = "ps";
private static final String JSON_DESCRIPTION = "d";
@Nonnull
protected final List<String> parameters = new ArrayList<>();
@Nonnull
protected String name;
@Nonnull
protected String body;
@Nonnull
protected String description = "";
private CppFunction(@Nonnull String name, @Nonnull String body) {
Check.isNotEmpty(name);
Check.isNotEmpty(body);
this.name = name;
this.body = body;
}
private CppFunction(@NonNull JSONObject json) throws JSONException {
name = json.getString(JSON_NAME);
body = json.getString(JSON_BODY);
final JSONArray array = json.optJSONArray(JSON_PARAMETERS);
if (array != null) {
for (int i = 0; i < array.length(); i++) {
final String parameter = array.getString(i);
if (!TextUtils.isEmpty(parameter)) {
parameters.add(parameter);
}
}
}
description = json.optString(JSON_DESCRIPTION, "");
}
private CppFunction(@NonNull CppFunction that) {
name = that.name;
body = that.body;
description = that.description;
parameters.addAll(that.parameters);
}
private CppFunction(@NonNull IFunction that) {
name = that.getName();
body = that.getContent();
description = Strings.getNotEmpty(that.getDescription(), "");
parameters.addAll(that.getParameterNames());
}
@Nonnull
public static Builder builder(@Nonnull String name, @Nonnull String body) {
return new Builder(name, body);
}
@Nonnull
public static Builder builder(@Nonnull CppFunction function) {
return new Builder(function);
}
@Nonnull
public static Builder builder(@Nonnull IFunction function) {
return new Builder(function);
}
@Nonnull
@Override
public JSONObject toJson() throws JSONException {
final JSONObject json = new JSONObject();
json.put(JSON_NAME, name);
json.put(JSON_BODY, body);
if (!parameters.isEmpty()) {
final JSONArray array = new JSONArray();
int j = 0;
for (int i = 0; i < parameters.size(); i++) {
final String parameter = parameters.get(i);
if (!TextUtils.isEmpty(parameter)) {
array.put(j++, parameter);
}
}
json.put(JSON_PARAMETERS, array);
}
if (!TextUtils.isEmpty(description)) {
json.put(JSON_DESCRIPTION, description);
}
return json;
}
@Nonnull
public String getBody() {
return body;
}
@Nonnull
public String getDescription() {
return description;
}
@Nonnull
public List<String> getParameters() {
return parameters;
}
@Nonnull
public String getName() {
return name;
}
public static final class Builder extends CppFunction {
private boolean built;
private Builder(@Nonnull String name, @Nonnull String body) {
super(name, body);
}
public Builder(@NonNull CppFunction function) {
super(function);
}
public Builder(@NonNull IFunction function) {
super(function);
}
@Nonnull
public Builder withDescription(@Nonnull String description) {
Check.isTrue(!built);
this.description = description;
return this;
}
@Nonnull
public Builder withParameters(@Nonnull Collection<? extends String> parameters) {
Check.isTrue(!built);
this.parameters.addAll(parameters);
return this;
}
@Nonnull
public Builder withParameter(@Nonnull String parameter) {
Check.isTrue(!built);
parameters.add(parameter);
return this;
}
@Nonnull
public CppFunction build() {
built = true;
return this;
}
public void withValuesFrom(@Nonnull IFunction that) {
Check.isTrue(!built);
name = that.getName();
body = that.getContent();
description = Strings.getNotEmpty(that.getDescription(), "");
parameters.clear();
parameters.addAll(that.getParameterNames());
}
}
}

55
app/src/main/java/org/solovyev/android/calculator/function/EditFunctionFragment.java
View File

@ -36,52 +36,29 @@ import android.support.v4.app.FragmentManager;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.text.Editable; import android.text.Editable;
import android.view.ContextMenu; import android.view.*;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import butterknife.Bind;
import org.solovyev.android.calculator.App; import butterknife.ButterKnife;
import org.solovyev.android.calculator.BaseDialogFragment; import jscl.math.Generic;
import org.solovyev.android.calculator.CalculatorEventData; import jscl.math.function.*;
import org.solovyev.android.calculator.CalculatorEventListener; import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.CalculatorEventType;
import org.solovyev.android.calculator.CalculatorUtils;
import org.solovyev.android.calculator.DisplayState;
import org.solovyev.android.calculator.KeyboardUi;
import org.solovyev.android.calculator.KeyboardWindow;
import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.math.edit.CalculatorFunctionsActivity; import org.solovyev.android.calculator.math.edit.CalculatorFunctionsActivity;
import org.solovyev.android.calculator.math.edit.FunctionsFragment; import org.solovyev.android.calculator.math.edit.FunctionsFragment;
import org.solovyev.android.calculator.math.edit.MathEntityRemover; import org.solovyev.android.calculator.math.edit.MathEntityRemover;
import org.solovyev.android.calculator.math.edit.VarEditorSaver; import org.solovyev.android.calculator.math.edit.VarEditorSaver;
import org.solovyev.android.calculator.model.AFunction; import org.solovyev.android.calculator.model.OldFunction;
import org.solovyev.common.math.MathRegistry; import org.solovyev.common.math.MathRegistry;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import butterknife.Bind;
import butterknife.ButterKnife;
import jscl.math.Generic;
import jscl.math.function.Constant;
import jscl.math.function.CustomFunction;
import jscl.math.function.Function;
import jscl.math.function.IConstant;
import jscl.math.function.IFunction;
public class EditFunctionFragment extends BaseDialogFragment implements CalculatorEventListener, View.OnClickListener, View.OnFocusChangeListener, View.OnKeyListener { public class EditFunctionFragment extends BaseDialogFragment implements CalculatorEventListener, View.OnClickListener, View.OnFocusChangeListener, View.OnKeyListener {
private static final String ARG_INPUT = "input"; private static final String ARG_INPUT = "input";
@ -143,7 +120,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements Calculat
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) { protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
builder.setNegativeButton(R.string.c_cancel, null); builder.setNegativeButton(R.string.c_cancel, null);
builder.setPositiveButton(R.string.ok, null); builder.setPositiveButton(R.string.ok, null);
final AFunction function = input.getFunction(); final OldFunction function = input.getFunction();
builder.setTitle(function == null ? R.string.function_create_function : R.string.function_edit_function); builder.setTitle(function == null ? R.string.function_create_function : R.string.function_edit_function);
if (function != null) { if (function != null) {
builder.setNeutralButton(R.string.c_remove, null); builder.setNeutralButton(R.string.c_remove, null);
@ -168,7 +145,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements Calculat
tryClose(); tryClose();
} }
}); });
final AFunction function = input.getFunction(); final OldFunction function = input.getFunction();
if (function != null) { if (function != null) {
final Function customFunction = new CustomFunction.Builder(function).create(); final Function customFunction = new CustomFunction.Builder(function).create();
final Button neutral = dialog.getButton(AlertDialog.BUTTON_NEUTRAL); final Button neutral = dialog.getButton(AlertDialog.BUTTON_NEUTRAL);
@ -308,7 +285,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements Calculat
} }
}; };
@Nullable @Nullable
private AFunction function; private OldFunction function;
@Nullable @Nullable
private String name; private String name;
@Nullable @Nullable
@ -343,7 +320,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements Calculat
in.readTypedList(parameterNames, STRING_CREATOR); in.readTypedList(parameterNames, STRING_CREATOR);
result.parameterNames = parameterNames; result.parameterNames = parameterNames;
result.function = (AFunction) in.readSerializable(); result.function = (OldFunction) in.readSerializable();
return result; return result;
} }
@ -356,7 +333,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements Calculat
@Nonnull @Nonnull
public static Input newFromFunction(@Nonnull IFunction function) { public static Input newFromFunction(@Nonnull IFunction function) {
final Input result = new Input(); final Input result = new Input();
result.function = AFunction.fromIFunction(function); result.function = OldFunction.fromIFunction(function);
return result; return result;
} }
@ -369,7 +346,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements Calculat
final Input result = new Input(); final Input result = new Input();
if (function != null) { if (function != null) {
result.function = AFunction.fromIFunction(function); result.function = OldFunction.fromIFunction(function);
} }
result.name = name; result.name = name;
result.content = value; result.content = value;
@ -398,7 +375,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements Calculat
} }
@Nullable @Nullable
public AFunction getFunction() { public OldFunction getFunction() {
return function; return function;
} }

19
app/src/main/java/org/solovyev/android/calculator/function/FunctionBuilderAdapter.java
View File

@ -22,15 +22,14 @@
package org.solovyev.android.calculator.function; package org.solovyev.android.calculator.function;
import org.solovyev.android.calculator.model.AFunction;
import org.solovyev.android.calculator.model.MathEntityBuilder;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.CustomFunctionCalculationException; import jscl.CustomFunctionCalculationException;
import jscl.math.function.CustomFunction; import jscl.math.function.CustomFunction;
import jscl.math.function.Function; import jscl.math.function.Function;
import org.solovyev.android.calculator.model.MathEntityBuilder;
import org.solovyev.android.calculator.model.OldFunction;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/** /**
* User: serso * User: serso
@ -40,9 +39,9 @@ import jscl.math.function.Function;
public final class FunctionBuilderAdapter implements MathEntityBuilder<Function> { public final class FunctionBuilderAdapter implements MathEntityBuilder<Function> {
@Nonnull @Nonnull
private final AFunction.Builder nestedBuilder; private final OldFunction.Builder nestedBuilder;
public FunctionBuilderAdapter(@Nonnull AFunction.Builder nestedBuilder) { public FunctionBuilderAdapter(@Nonnull OldFunction.Builder nestedBuilder) {
this.nestedBuilder = nestedBuilder; this.nestedBuilder = nestedBuilder;
} }
@ -69,8 +68,8 @@ public final class FunctionBuilderAdapter implements MathEntityBuilder<Function>
@Nonnull @Nonnull
@Override @Override
public Function create() throws CustomFunctionCalculationException, AFunction.Builder.CreationException { public Function create() throws CustomFunctionCalculationException, OldFunction.Builder.CreationException {
final AFunction function = nestedBuilder.create(); final OldFunction function = nestedBuilder.create();
return new CustomFunction.Builder(function).create(); return new CustomFunction.Builder(function).create();
} }
} }

31
app/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java
View File

@ -24,25 +24,22 @@ package org.solovyev.android.calculator.function;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import jscl.CustomFunctionCalculationException;
import jscl.math.function.Function;
import jscl.math.function.IFunction;
import org.solovyev.android.calculator.EntitiesRegistry; import org.solovyev.android.calculator.EntitiesRegistry;
import org.solovyev.android.calculator.FunctionsRegistry; import org.solovyev.android.calculator.FunctionsRegistry;
import org.solovyev.android.calculator.Locator; import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.math.edit.VarEditorSaver; import org.solovyev.android.calculator.math.edit.VarEditorSaver;
import org.solovyev.android.calculator.model.AFunction; import org.solovyev.android.calculator.model.OldFunction;
import org.solovyev.common.msg.MessageType; import org.solovyev.common.msg.MessageType;
import org.solovyev.common.text.Strings; import org.solovyev.common.text.Strings;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collections;
import jscl.CustomFunctionCalculationException; import java.util.List;
import jscl.math.function.Function;
import jscl.math.function.IFunction;
public class FunctionEditorSaver implements View.OnClickListener { public class FunctionEditorSaver implements View.OnClickListener {
@ -50,7 +47,7 @@ public class FunctionEditorSaver implements View.OnClickListener {
private final Object source; private final Object source;
@Nonnull @Nonnull
private final AFunction.Builder builder; private final OldFunction.Builder builder;
@Nullable @Nullable
private final IFunction editedInstance; private final IFunction editedInstance;
@ -58,11 +55,7 @@ public class FunctionEditorSaver implements View.OnClickListener {
@Nonnull @Nonnull
private final View view; private final View view;
@Nonnull public FunctionEditorSaver(@Nonnull OldFunction.Builder builder,
private final EntitiesRegistry<Function> mathRegistry;
public FunctionEditorSaver(@Nonnull AFunction.Builder builder,
@Nullable IFunction editedInstance, @Nullable IFunction editedInstance,
@Nonnull View view, @Nonnull View view,
@Nonnull EntitiesRegistry<Function> registry, @Nonnull EntitiesRegistry<Function> registry,
@ -71,7 +64,6 @@ public class FunctionEditorSaver implements View.OnClickListener {
this.builder = builder; this.builder = builder;
this.editedInstance = editedInstance; this.editedInstance = editedInstance;
this.view = view; this.view = view;
this.mathRegistry = registry;
this.source = source; this.source = source;
} }
@ -107,11 +99,12 @@ public class FunctionEditorSaver implements View.OnClickListener {
parameterNames = Collections.emptyList(); parameterNames = Collections.emptyList();
} }
final FunctionsRegistry registry = Locator.getInstance().getEngine().getFunctionsRegistry();
if (VarEditorSaver.isValidName(name)) { if (VarEditorSaver.isValidName(name)) {
boolean canBeSaved = false; boolean canBeSaved = false;
final Function entityFromRegistry = mathRegistry.get(name); final Function entityFromRegistry = registry.get(name);
if (entityFromRegistry == null) { if (entityFromRegistry == null) {
canBeSaved = true; canBeSaved = true;
} else if (editedInstance != null && entityFromRegistry.getId().equals(editedInstance.getId())) { } else if (editedInstance != null && entityFromRegistry.getId().equals(editedInstance.getId())) {
@ -144,10 +137,10 @@ public class FunctionEditorSaver implements View.OnClickListener {
Locator.getInstance().getNotifier().showMessage(error, MessageType.error); Locator.getInstance().getNotifier().showMessage(error, MessageType.error);
} else { } else {
try { try {
FunctionsRegistry.saveFunction(mathRegistry, new FunctionBuilderAdapter(builder), editedInstance, source, true); registry.add(new FunctionBuilderAdapter(builder), editedInstance, source);
} catch (CustomFunctionCalculationException e) { } catch (CustomFunctionCalculationException e) {
Locator.getInstance().getNotifier().showMessage(e); Locator.getInstance().getNotifier().showMessage(e);
} catch (AFunction.Builder.CreationException e) { } catch (OldFunction.Builder.CreationException e) {
Locator.getInstance().getNotifier().showMessage(e); Locator.getInstance().getNotifier().showMessage(e);
} }
} }

20
app/src/main/java/org/solovyev/android/calculator/history/History.java
View File

@ -35,7 +35,7 @@ import org.json.JSONException;
import org.solovyev.android.Check; import org.solovyev.android.Check;
import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.Engine.Preferences; import org.solovyev.android.calculator.Engine.Preferences;
import org.solovyev.android.io.FileLoader; import org.solovyev.android.calculator.json.Json;
import org.solovyev.android.io.FileSaver; import org.solovyev.android.io.FileSaver;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -106,18 +106,6 @@ public class History {
return states; return states;
} }
@Nonnull
static List<HistoryState> loadStates(@Nonnull File file) throws IOException, JSONException {
if (!file.exists()) {
return Collections.emptyList();
}
final CharSequence json = FileLoader.load(file);
if (isEmpty(json)) {
return Collections.emptyList();
}
return RecentHistory.fromJson(new JSONArray(json.toString()));
}
private static boolean isIntermediate(@Nonnull String olderText, private static boolean isIntermediate(@Nonnull String olderText,
@Nonnull String newerText, @Nonnull String newerText,
@NonNull String groupingSeparator) { @NonNull String groupingSeparator) {
@ -200,7 +188,7 @@ public class History {
if (states == null) { if (states == null) {
return; return;
} }
final JSONArray json = RecentHistory.toJson(states); final JSONArray json = Json.toJson(states);
FileSaver.save(getSavedHistoryFile(), json.toString()); FileSaver.save(getSavedHistoryFile(), json.toString());
preferences.edit().remove(OLD_HISTORY_PREFS_KEY).apply(); preferences.edit().remove(OLD_HISTORY_PREFS_KEY).apply();
} catch (IOException e) { } catch (IOException e) {
@ -227,7 +215,7 @@ public class History {
@Nonnull @Nonnull
private List<HistoryState> tryLoadStates(@NonNull File file) { private List<HistoryState> tryLoadStates(@NonNull File file) {
try { try {
return loadStates(file); return Json.load(file, HistoryState.JSON_CREATOR);
} catch (IOException | JSONException e) { } catch (IOException | JSONException e) {
errorReporter.onException(e); errorReporter.onException(e);
} }
@ -411,7 +399,7 @@ public class History {
@Override @Override
public void run() { public void run() {
final File file = recent ? getRecentHistoryFile() : getSavedHistoryFile(); final File file = recent ? getRecentHistoryFile() : getSavedHistoryFile();
final JSONArray array = RecentHistory.toJson(states); final JSONArray array = Json.toJson(states);
try { try {
FileSaver.save(file, array.toString()); FileSaver.save(file, array.toString());
} catch (IOException e) { } catch (IOException e) {

12
app/src/main/java/org/solovyev/android/calculator/history/HistoryState.java
View File

@ -3,18 +3,21 @@ package org.solovyev.android.calculator.history;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.solovyev.android.Check; import org.solovyev.android.Check;
import org.solovyev.android.calculator.DisplayState; import org.solovyev.android.calculator.DisplayState;
import org.solovyev.android.calculator.EditorState; import org.solovyev.android.calculator.EditorState;
import org.solovyev.android.calculator.json.Json;
import org.solovyev.android.calculator.json.Jsonable;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static android.text.TextUtils.isEmpty; import static android.text.TextUtils.isEmpty;
public class HistoryState implements Parcelable { public class HistoryState implements Parcelable, Jsonable {
public static final Creator<HistoryState> CREATOR = new Creator<HistoryState>() { public static final Creator<HistoryState> CREATOR = new Creator<HistoryState>() {
@Override @Override
@ -27,6 +30,13 @@ public class HistoryState implements Parcelable {
return new HistoryState[size]; return new HistoryState[size];
} }
}; };
public static final Json.Creator<HistoryState> JSON_CREATOR = new Json.Creator<HistoryState>() {
@NonNull
@Override
public HistoryState create(@NonNull JSONObject json) throws JSONException {
return new HistoryState(json);
}
};
private static final String JSON_EDITOR = "e"; private static final String JSON_EDITOR = "e";
private static final String JSON_DISPLAY = "d"; private static final String JSON_DISPLAY = "d";
private static final String JSON_TIME = "t"; private static final String JSON_TIME = "t";

31
app/src/main/java/org/solovyev/android/calculator/history/RecentHistory.java
View File

@ -3,7 +3,6 @@ package org.solovyev.android.calculator.history;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -117,34 +116,4 @@ public class RecentHistory {
return Collections.unmodifiableList(list.subList(0, current + 1)); return Collections.unmodifiableList(list.subList(0, current + 1));
} }
@NonNull
public static JSONArray toJson(@NonNull List<HistoryState> states) {
final JSONArray array = new JSONArray();
for (int i = 0; i < states.size(); i++) {
final HistoryState state = states.get(i);
try {
array.put(i, state.toJson());
} catch (JSONException e) {
Log.e(History.TAG, e.getMessage(), e);
}
}
return array;
}
@NonNull
public static List<HistoryState> fromJson(@NonNull JSONArray array) {
final List<HistoryState> states = new ArrayList<>(array.length());
for (int i = 0; i < array.length(); i++) {
final JSONObject json = array.optJSONObject(i);
if (json == null) {
continue;
}
try {
states.add(HistoryState.create(json));
} catch (JSONException e) {
Log.e(History.TAG, e.getMessage(), e);
}
}
return states;
}
} }

74
app/src/main/java/org/solovyev/android/calculator/json/Json.java Normal file
View File

@ -0,0 +1,74 @@
package org.solovyev.android.calculator.json;
import android.support.annotation.NonNull;
import android.util.Log;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.solovyev.android.io.FileLoader;
import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import static android.text.TextUtils.isEmpty;
public final class Json {
@NonNull
private static final String TAG = "Json";
private Json() {
}
@NonNull
public static <T> List<T> fromJson(@NonNull JSONArray array, @NonNull Creator<T> creator) {
final List<T> items = new ArrayList<>(array.length());
for (int i = 0; i < array.length(); i++) {
final JSONObject json = array.optJSONObject(i);
if (json == null) {
continue;
}
try {
items.add(creator.create(json));
} catch (JSONException e) {
Log.e(TAG, e.getMessage(), e);
}
}
return items;
}
@NonNull
public static JSONArray toJson(@NonNull List<? extends Jsonable> items) {
final JSONArray array = new JSONArray();
for (int i = 0; i < items.size(); i++) {
final Jsonable item = items.get(i);
try {
array.put(i, item.toJson());
} catch (JSONException e) {
Log.e(TAG, e.getMessage(), e);
}
}
return array;
}
@Nonnull
public static <T> List<T> load(@Nonnull File file, @NonNull Creator<T> creator) throws IOException, JSONException {
if (!file.exists()) {
return Collections.emptyList();
}
final CharSequence json = FileLoader.load(file);
if (isEmpty(json)) {
return Collections.emptyList();
}
return fromJson(new JSONArray(json.toString()), creator);
}
public interface Creator<T> {
@NonNull
T create(@NonNull JSONObject json) throws JSONException;
}
}

11
app/src/main/java/org/solovyev/android/calculator/json/Jsonable.java Normal file
View File

@ -0,0 +1,11 @@
package org.solovyev.android.calculator.json;
import org.json.JSONException;
import org.json.JSONObject;
import javax.annotation.Nonnull;
public interface Jsonable {
@Nonnull
JSONObject toJson() throws JSONException;
}

47
app/src/main/java/org/solovyev/android/calculator/model/EntityDao.java
View File

@ -22,46 +22,35 @@
package org.solovyev.android.calculator.model; package org.solovyev.android.calculator.model;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Resources;
import android.preference.PreferenceManager;
import org.simpleframework.xml.Serializer; import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.core.Persister; import org.simpleframework.xml.core.Persister;
import org.solovyev.android.calculator.CalculatorApplication;
import org.solovyev.android.calculator.PersistedEntitiesContainer; import org.solovyev.android.calculator.PersistedEntitiesContainer;
import org.solovyev.android.calculator.PersistedEntity; import org.solovyev.android.calculator.PersistedEntity;
import java.io.StringWriter;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.io.StringWriter;
public class EntityDao<T extends PersistedEntity> { public class EntityDao<T extends PersistedEntity> {
@Nullable @Nonnull
private final String preferenceString; private final String preferenceString;
@Nonnull @Nonnull
private final Context context;
@Nullable
private final Class<? extends PersistedEntitiesContainer<T>> persistenceContainerClass; private final Class<? extends PersistedEntitiesContainer<T>> persistenceContainerClass;
@Nonnull
private final SharedPreferences preferences;
public EntityDao(@Nullable String preferenceString, public EntityDao(@Nonnull String preferenceString,
@Nonnull Application application, @Nonnull Class<? extends PersistedEntitiesContainer<T>> persistenceContainerClass, @Nonnull SharedPreferences preferences) {
@Nullable Class<? extends PersistedEntitiesContainer<T>> persistenceContainerClass) {
this.preferenceString = preferenceString; this.preferenceString = preferenceString;
this.context = application;
this.persistenceContainerClass = persistenceContainerClass; this.persistenceContainerClass = persistenceContainerClass;
this.preferences = preferences;
} }
public void save(@Nonnull PersistedEntitiesContainer<T> container) { public void save(@Nonnull PersistedEntitiesContainer<T> container) {
if (preferenceString != null) { final SharedPreferences.Editor editor = preferences.edit();
final SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
final SharedPreferences.Editor editor = settings.edit();
final StringWriter sw = new StringWriter(); final StringWriter sw = new StringWriter();
final Serializer serializer = new Persister(); final Serializer serializer = new Persister();
@ -72,17 +61,11 @@ public class EntityDao<T extends PersistedEntity> {
} }
editor.putString(preferenceString, sw.toString()); editor.putString(preferenceString, sw.toString());
editor.apply(); editor.apply();
} }
}
@Nullable @Nullable
public PersistedEntitiesContainer<T> load() { public PersistedEntitiesContainer<T> load() {
if (persistenceContainerClass != null && preferenceString != null) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
if (preferences != null) {
final String value = preferences.getString(preferenceString, null); final String value = preferences.getString(preferenceString, null);
if (value != null) { if (value != null) {
final Serializer serializer = new Persister(); final Serializer serializer = new Persister();
@ -92,21 +75,7 @@ public class EntityDao<T extends PersistedEntity> {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
}
}
return null; return null;
} }
@Nullable
public String getDescription(@Nonnull String descriptionId) {
final Resources resources = context.getResources();
final int stringId = resources.getIdentifier(descriptionId, "string", CalculatorApplication.class.getPackage().getName());
try {
return resources.getString(stringId);
} catch (Resources.NotFoundException e) {
return null;
}
}
} }

44
app/src/main/java/org/solovyev/android/calculator/model/Functions.java
View File

@ -1,44 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator.model;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
import org.solovyev.android.calculator.PersistedEntitiesContainer;
import java.util.ArrayList;
import java.util.List;
@Root
public class Functions implements PersistedEntitiesContainer<AFunction> {
@ElementList(type = AFunction.class)
private List<AFunction> functions = new ArrayList<AFunction>();
public Functions() {
}
public List<AFunction> getEntities() {
return functions;
}
}

30
app/src/main/java/org/solovyev/android/calculator/model/AFunction.java → app/src/main/java/org/solovyev/android/calculator/model/OldFunction.java
View File

@ -22,6 +22,7 @@
package org.solovyev.android.calculator.model; package org.solovyev.android.calculator.model;
import jscl.math.function.IFunction;
import org.simpleframework.xml.Element; import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList; import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root; import org.simpleframework.xml.Root;
@ -34,19 +35,16 @@ import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageLevel; import org.solovyev.common.msg.MessageLevel;
import org.solovyev.common.text.Strings; import org.solovyev.common.text.Strings;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.math.function.IFunction;
@Root(name = "function") @Root(name = "function")
public class AFunction implements IFunction, PersistedEntity, Serializable { public class OldFunction implements IFunction, PersistedEntity, Serializable {
@Transient @Transient
private Integer id; private Integer id;
@ -70,22 +68,22 @@ public class AFunction implements IFunction, PersistedEntity, Serializable {
@Nonnull @Nonnull
private String description = ""; private String description = "";
public AFunction() { public OldFunction() {
} }
public AFunction(Integer id) { public OldFunction(Integer id) {
this.id = id; this.id = id;
} }
public static AFunction fromIFunction(@Nonnull IFunction function) { public static OldFunction fromIFunction(@Nonnull IFunction function) {
final AFunction result = new AFunction(); final OldFunction result = new OldFunction();
copy(result, function); copy(result, function);
return result; return result;
} }
private static void copy(@Nonnull AFunction target, private static void copy(@Nonnull OldFunction target,
@Nonnull IFunction source) { @Nonnull IFunction source) {
target.name = source.getName(); target.name = source.getName();
target.content = source.getContent(); target.content = source.getContent();
@ -174,7 +172,7 @@ public class AFunction implements IFunction, PersistedEntity, Serializable {
this.parameterNames = parameterNames; this.parameterNames = parameterNames;
} }
public static class Builder implements MathEntityBuilder<AFunction> { public static class Builder implements MathEntityBuilder<OldFunction> {
@Nonnull @Nonnull
private String name; private String name;
@ -243,12 +241,12 @@ public class AFunction implements IFunction, PersistedEntity, Serializable {
} }
@Nonnull @Nonnull
public AFunction create() throws AFunction.Builder.CreationException { public OldFunction create() throws OldFunction.Builder.CreationException {
final AFunction result; final OldFunction result;
if (id != null) { if (id != null) {
result = new AFunction(id); result = new OldFunction(id);
} else { } else {
result = new AFunction(); result = new OldFunction();
} }
result.name = name; result.name = name;

65
app/src/main/java/org/solovyev/android/calculator/model/OldFunctions.java Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator.model;
import android.text.TextUtils;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
import org.solovyev.android.calculator.PersistedEntitiesContainer;
import org.solovyev.android.calculator.function.CppFunction;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
@Root(name = "Functions")
public class OldFunctions implements PersistedEntitiesContainer<OldFunction> {
public static final String PREFS_KEY = "org.solovyev.android.calculator.CalculatorModel_functions";
@ElementList(type = OldFunction.class)
private List<OldFunction> functions = new ArrayList<>();
public OldFunctions() {
}
@Nonnull
public static List<CppFunction> toCppFunctions(@Nonnull OldFunctions oldFunctions) {
final List<CppFunction> functions = new ArrayList<>();
for (OldFunction oldFunction : oldFunctions.getEntities()) {
final String name = oldFunction.getName();
final String body = oldFunction.getContent();
if (TextUtils.isEmpty(name) || TextUtils.isEmpty(body)) {
continue;
}
functions.add(CppFunction.builder(name, body)
.withParameters(oldFunction.getParameterNames())
.withDescription(oldFunction.getDescription()).build());
}
return functions;
}
public List<OldFunction> getEntities() {
return functions;
}
}

23
app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
View File

@ -23,9 +23,8 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.content.Context; import android.content.Context;
import com.squareup.otto.Bus; import com.squareup.otto.Bus;
import jscl.JsclMathEngine;
import org.junit.Assert; import org.junit.Assert;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.robolectric.fakes.RoboSharedPreferences; import org.robolectric.fakes.RoboSharedPreferences;
@ -34,12 +33,9 @@ import org.solovyev.android.calculator.language.Languages;
import org.solovyev.android.calculator.model.EntityDao; import org.solovyev.android.calculator.model.EntityDao;
import org.solovyev.android.calculator.plot.CalculatorPlotter; import org.solovyev.android.calculator.plot.CalculatorPlotter;
import java.io.ByteArrayInputStream; import javax.annotation.Nonnull;
import java.io.ByteArrayOutputStream; import javax.annotation.Nullable;
import java.io.IOException; import java.io.*;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -47,11 +43,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.JsclMathEngine;
/** /**
* User: serso * User: serso
* Date: 10/7/12 * Date: 10/7/12
@ -104,9 +95,9 @@ public class CalculatorTestUtils {
final JsclMathEngine jsclEngine = JsclMathEngine.getInstance(); final JsclMathEngine jsclEngine = JsclMathEngine.getInstance();
final VarsRegistry varsRegistry = new VarsRegistry(jsclEngine.getConstantsRegistry(), entityDao); final VarsRegistry varsRegistry = new VarsRegistry(jsclEngine.getConstantsRegistry(), entityDao);
final FunctionsRegistry functionsRegistry = new FunctionsRegistry(jsclEngine.getFunctionsRegistry(), entityDao); final FunctionsRegistry functionsRegistry = new FunctionsRegistry(jsclEngine.getFunctionsRegistry());
final OperatorsRegistry operatorsRegistry = new OperatorsRegistry(jsclEngine.getOperatorsRegistry(), entityDao); final OperatorsRegistry operatorsRegistry = new OperatorsRegistry(jsclEngine.getOperatorsRegistry());
final PostfixFunctionsRegistry postfixFunctionsRegistry = new PostfixFunctionsRegistry(jsclEngine.getPostfixFunctionsRegistry(), entityDao); final PostfixFunctionsRegistry postfixFunctionsRegistry = new PostfixFunctionsRegistry(jsclEngine.getPostfixFunctionsRegistry());
return new Engine(jsclEngine, varsRegistry, functionsRegistry, operatorsRegistry, postfixFunctionsRegistry); return new Engine(jsclEngine, varsRegistry, functionsRegistry, operatorsRegistry, postfixFunctionsRegistry);
} }

3
app/src/test/java/org/solovyev/android/calculator/history/HistoryTest.java
View File

@ -34,6 +34,7 @@ import org.robolectric.annotation.Config;
import org.solovyev.android.CalculatorTestRunner; import org.solovyev.android.CalculatorTestRunner;
import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.jscl.JsclOperation; import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.android.calculator.json.Json;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.io.File; import java.io.File;
@ -280,7 +281,7 @@ public class HistoryTest {
@Test @Test
public void testShouldLoadStates() throws Exception { public void testShouldLoadStates() throws Exception {
final List<HistoryState> states = History.loadStates(new File(HistoryTest.class.getResource("recent-history.json").getFile())); final List<HistoryState> states = Json.load(new File(HistoryTest.class.getResource("recent-history.json").getFile()));
assertEquals(8, states.size()); assertEquals(8, states.size());
HistoryState state = states.get(0); HistoryState state = states.get(0);

42
app/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java → app/src/test/java/org/solovyev/android/calculator/model/OldFunctionsTest.java
View File

@ -22,6 +22,7 @@
package org.solovyev.android.calculator.model; package org.solovyev.android.calculator.model;
import jscl.util.ExpressionGenerator;
import org.hamcrest.BaseMatcher; import org.hamcrest.BaseMatcher;
import org.hamcrest.Description; import org.hamcrest.Description;
import org.junit.Assert; import org.junit.Assert;
@ -34,24 +35,17 @@ import org.solovyev.common.Objects;
import org.solovyev.common.equals.CollectionEqualizer; import org.solovyev.common.equals.CollectionEqualizer;
import org.solovyev.common.text.Strings; import org.solovyev.common.text.Strings;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Random;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.io.StringWriter;
import jscl.util.ExpressionGenerator; import java.util.*;
/** /**
* User: serso * User: serso
* Date: 11/14/12 * Date: 11/14/12
* Time: 8:06 PM * Time: 8:06 PM
*/ */
public class FunctionsTest { public class OldFunctionsTest {
private static final String xml = "<functions>\n" + private static final String xml = "<functions>\n" +
" <functions class=\"java.util.ArrayList\">\n" + " <functions class=\"java.util.ArrayList\">\n" +
@ -95,23 +89,23 @@ public class FunctionsTest {
@Test @Test
public void testXml() throws Exception { public void testXml() throws Exception {
final Functions in = new Functions(); final OldFunctions in = new OldFunctions();
AFunction first = new AFunction.Builder("test", "x+y", Arrays.asList("x", "y")).setDescription("description").setSystem(false).create(); OldFunction first = new OldFunction.Builder("test", "x+y", Arrays.asList("x", "y")).setDescription("description").setSystem(false).create();
in.getEntities().add(first); in.getEntities().add(first);
AFunction second = new AFunction.Builder("z_2", "e^(z_1^2+z_2^2)", Arrays.asList("z_1", "z_2")).setSystem(true).create(); OldFunction second = new OldFunction.Builder("z_2", "e^(z_1^2+z_2^2)", Arrays.asList("z_1", "z_2")).setSystem(true).create();
in.getEntities().add(second); in.getEntities().add(second);
AFunction third = new AFunction.Builder("z_2", "e^(z_1^2+z_2^2)", Arrays.asList("z_1", "z_2")).setSystem(true).setDescription("").create(); OldFunction third = new OldFunction.Builder("z_2", "e^(z_1^2+z_2^2)", Arrays.asList("z_1", "z_2")).setSystem(true).setDescription("").create();
in.getEntities().add(third); in.getEntities().add(third);
final Functions out = testXml(in, xml); final OldFunctions out = testXml(in, xml);
Assert.assertTrue(!out.getEntities().isEmpty()); Assert.assertTrue(!out.getEntities().isEmpty());
final AFunction firstOut = out.getEntities().get(0); final OldFunction firstOut = out.getEntities().get(0);
final AFunction secondOut = out.getEntities().get(1); final OldFunction secondOut = out.getEntities().get(1);
assertEquals(first, firstOut); assertEquals(first, firstOut);
assertEquals(second, secondOut); assertEquals(second, secondOut);
@ -119,7 +113,7 @@ public class FunctionsTest {
} }
@Nonnull @Nonnull
private Functions testXml(@Nonnull Functions in, @Nullable String expectedXml) throws Exception { private OldFunctions testXml(@Nonnull OldFunctions in, @Nullable String expectedXml) throws Exception {
final String actualXml = toXml(in); final String actualXml = toXml(in);
if (expectedXml != null) { if (expectedXml != null) {
@ -127,13 +121,13 @@ public class FunctionsTest {
} }
final Serializer serializer = new Persister(); final Serializer serializer = new Persister();
final Functions out = serializer.read(Functions.class, actualXml); final OldFunctions out = serializer.read(OldFunctions.class, actualXml);
final String actualXml2 = toXml(out); final String actualXml2 = toXml(out);
Assert.assertEquals(actualXml, actualXml2); Assert.assertEquals(actualXml, actualXml2);
return out; return out;
} }
private String toXml(Functions in) throws Exception { private String toXml(OldFunctions in) throws Exception {
final StringWriter sw = new StringWriter(); final StringWriter sw = new StringWriter();
final Serializer serializer = new Persister(); final Serializer serializer = new Persister();
serializer.write(in, sw); serializer.write(in, sw);
@ -142,7 +136,7 @@ public class FunctionsTest {
@Test @Test
public void testRandomXml() throws Exception { public void testRandomXml() throws Exception {
final Functions in = new Functions(); final OldFunctions in = new OldFunctions();
final Random random = new Random(new Date().getTime()); final Random random = new Random(new Date().getTime());
@ -156,7 +150,7 @@ public class FunctionsTest {
parameterNames.add(String.valueOf(paramsString.charAt(j))); parameterNames.add(String.valueOf(paramsString.charAt(j)));
} }
final AFunction.Builder builder = new AFunction.Builder("test_" + i, content, parameterNames); final OldFunction.Builder builder = new OldFunction.Builder("test_" + i, content, parameterNames);
if (random.nextBoolean()) { if (random.nextBoolean()) {
builder.setDescription(Strings.generateRandomString(random.nextInt(100))); builder.setDescription(Strings.generateRandomString(random.nextInt(100)));
@ -170,8 +164,8 @@ public class FunctionsTest {
testXml(in, null); testXml(in, null);
} }
private void assertEquals(@Nonnull final AFunction expected, private void assertEquals(@Nonnull final OldFunction expected,
@Nonnull AFunction actual) { @Nonnull OldFunction actual) {
//Assert.assertEquals(expected.getId(), actual.getId()); //Assert.assertEquals(expected.getId(), actual.getId());
Assert.assertEquals(expected.getContent(), actual.getContent()); Assert.assertEquals(expected.getContent(), actual.getContent());
Assert.assertEquals(expected.getDescription(), actual.getDescription()); Assert.assertEquals(expected.getDescription(), actual.getDescription());