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

Plotter preferences

Browse Source
This commit is contained in:
Sergey Solovyev 2012-10-04 22:39:32 +04:00
parent d8015e48c7
commit 8a525e270a
14 changed files with 1443 additions and 1217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
calculatorpp/AndroidManifest.xml
View File

@ -1,57 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="81" android:versionName="1.3.2" <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="81" android:versionName="1.3.2"
package="org.solovyev.android.calculator"> package="org.solovyev.android.calculator">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="com.android.vending.BILLING"/> <uses-permission android:name="com.android.vending.BILLING"/>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
<application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme"> <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme">
<activity android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan"> <activity android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:label="@string/c_app_settings" android:name=".CalculatorPreferencesActivity"/> <activity android:label="@string/c_app_settings" android:name=".CalculatorPreferencesActivity"/>
<activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/> <activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
<activity android:label="@string/c_about" android:name=".about.CalculatorAboutActivity"/> <activity android:label="@string/c_about" android:name=".about.CalculatorAboutActivity"/>
<activity android:label="@string/c_help" android:name=".help.CalculatorHelpActivity"/> <activity android:label="@string/c_help" android:name=".help.CalculatorHelpActivity"/>
<activity android:label="@string/c_functions" android:name=".math.edit.CalculatorFunctionsActivity"/> <activity android:label="@string/c_functions" android:name=".math.edit.CalculatorFunctionsActivity"/>
<activity android:label="@string/c_operators" android:name=".math.edit.CalculatorOperatorsActivity"/> <activity android:label="@string/c_operators" android:name=".math.edit.CalculatorOperatorsActivity"/>
<activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/> <activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
<activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/> <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
<activity android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/>
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:name="com.google.ads.AdActivity"/>
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:name="com.google.ads.AdActivity"/>
<service android:name="net.robotmedia.billing.BillingService"/>
<receiver android:name="net.robotmedia.billing.BillingReceiver"> <service android:name="net.robotmedia.billing.BillingService"/>
<intent-filter> <receiver android:name="net.robotmedia.billing.BillingReceiver">
<action android:name="com.android.vending.billing.IN_APP_NOTIFY"/> <intent-filter>
<action android:name="com.android.vending.billing.RESPONSE_CODE"/> <action android:name="com.android.vending.billing.IN_APP_NOTIFY"/>
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED"/> <action android:name="com.android.vending.billing.RESPONSE_CODE"/>
</intent-filter> <action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED"/>
</receiver> </intent-filter>
</receiver>
<activity android:name="org.acra.CrashReportDialog"
android:theme="@android:style/Theme.Dialog" <activity android:name="org.acra.CrashReportDialog"
android:launchMode="singleInstance" android:theme="@android:style/Theme.Dialog"
android:excludeFromRecents="true" android:launchMode="singleInstance"
android:finishOnTaskLaunch="true" /> android:excludeFromRecents="true"
android:finishOnTaskLaunch="true" />
</application>
</application>
</manifest> </manifest>

15
calculatorpp/res/values/arrays.xml
View File

@ -87,4 +87,19 @@
<item>bin</item> <item>bin</item>
</string-array> </string-array>
<string-array name="graph_line_color_names">
<item>White</item>
<item>Grey</item>
<item>Red</item>
<item>Blue</item>
<item>Green</item>
</string-array>
<string-array name="graph_line_color_values">
<item>white</item>
<item>grey</item>
<item>red</item>
<item>blue</item>
<item>green</item>
</string-array>
</resources> </resources>

2
calculatorpp/res/values/theme_default.xml
View File

@ -108,6 +108,8 @@
<!-- action bar--> <!-- action bar-->
<item name="actionBarTabStyle">@style/default_actionbar_tab_style</item> <item name="actionBarTabStyle">@style/default_actionbar_tab_style</item>
<item name="android:actionBarTabStyle">@style/default_actionbar_tab_style</item>
<item name="actionBarStyle">@style/default_actionbar_style</item> <item name="actionBarStyle">@style/default_actionbar_style</item>
<item name="android:actionBarStyle">@style/default_actionbar_style</item>
</style> </style>
</resources> </resources>

2
calculatorpp/res/values/theme_metro_blue.xml
View File

@ -38,7 +38,9 @@
<!--action bar--> <!--action bar-->
<item name="actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item> <item name="actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
<item name="android:actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
<item name="actionBarStyle">@style/metro_blue_actionbar_style</item> <item name="actionBarStyle">@style/metro_blue_actionbar_style</item>
<item name="android:actionBarStyle">@style/metro_blue_actionbar_style</item>
</style> </style>
</resources> </resources>

22
calculatorpp/res/xml/plot_preferences.xml Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<android.preference.CheckBoxPreference
a:key="graph_interpolate"
a:title="Interpolate function's graph"
a:summary="If checked cubic interpolation will be used in function graph drawing"/>
<ListPreference a:key="graph_line_color_real"
a:title="Color of real part of functions graph"
a:summary="Sets color of real part functions graph"
a:entries="@array/graph_line_color_names"
a:entryValues="@array/graph_line_color_values"/>
<ListPreference a:key="graph_line_color_imag"
a:title="Color of imaginary part of functions graph"
a:summary="Sets color of imaginary part functions graph"
a:entries="@array/graph_line_color_names"
a:entryValues="@array/graph_line_color_values"/>
</PreferenceScreen>

117
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
View File

@ -1,56 +1,61 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.View; import android.view.View;
import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.app.SherlockFragmentActivity;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.about.CalculatorFragmentType; import org.solovyev.android.calculator.about.CalculatorFragmentType;
/** /**
* User: serso * User: serso
* Date: 9/25/12 * Date: 9/25/12
* Time: 10:31 PM * Time: 10:31 PM
*/ */
public interface CalculatorActivityHelper { public interface CalculatorActivityHelper {
void onCreate(@NotNull SherlockFragmentActivity activity, @Nullable Bundle savedInstanceState); void onCreate(@NotNull SherlockFragmentActivity activity, @Nullable Bundle savedInstanceState);
void onCreate(@NotNull Activity activity, @Nullable Bundle savedInstanceState); void onCreate(@NotNull Activity activity, @Nullable Bundle savedInstanceState);
void onSaveInstanceState(@NotNull SherlockFragmentActivity activity, @NotNull Bundle outState); void onSaveInstanceState(@NotNull SherlockFragmentActivity activity, @NotNull Bundle outState);
void onSaveInstanceState(@NotNull Activity activity, @NotNull Bundle outState); void onSaveInstanceState(@NotNull Activity activity, @NotNull Bundle outState);
int getLayoutId(); int getLayoutId();
@NotNull @NotNull
CalculatorPreferences.Gui.Theme getTheme(); CalculatorPreferences.Gui.Theme getTheme();
void onResume(@NotNull SherlockFragmentActivity activity); void onResume(@NotNull SherlockFragmentActivity activity);
void onResume(@NotNull Activity activity); void onResume(@NotNull Activity activity);
void onPause(@NotNull Activity activity); void onPause(@NotNull Activity activity);
void onPause(@NotNull SherlockFragmentActivity activity); void onPause(@NotNull SherlockFragmentActivity activity);
void onDestroy(@NotNull SherlockFragmentActivity activity); void onDestroy(@NotNull SherlockFragmentActivity activity);
void onDestroy(@NotNull Activity activity); void onDestroy(@NotNull Activity activity);
void addTab(@NotNull SherlockFragmentActivity activity, void addTab(@NotNull SherlockFragmentActivity activity,
@NotNull String tag, @NotNull String tag,
@NotNull Class<? extends Fragment> fragmentClass, @NotNull Class<? extends Fragment> fragmentClass,
@Nullable Bundle fragmentArgs, @Nullable Bundle fragmentArgs,
int captionResId, int captionResId,
int parentViewId); int parentViewId);
void addTab(@NotNull SherlockFragmentActivity activity, void addTab(@NotNull SherlockFragmentActivity activity,
@NotNull CalculatorFragmentType fragmentType, @NotNull CalculatorFragmentType fragmentType,
@Nullable Bundle fragmentArgs, @Nullable Bundle fragmentArgs,
int parentViewId); int parentViewId);
void setFragment(@NotNull SherlockFragmentActivity activity,
void logDebug(@NotNull String message); @NotNull CalculatorFragmentType fragmentType,
@Nullable Bundle fragmentArgs,
void processButtons(@NotNull Activity activity, @NotNull View root); int parentViewId);
}
void logDebug(@NotNull String message);
void processButtons(@NotNull Activity activity, @NotNull View root);
}

449
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
View File

@ -1,219 +1,230 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.app.Activity; import android.app.Activity;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log; import android.support.v4.app.FragmentManager;
import android.view.View; import android.support.v4.app.FragmentTransaction;
import com.actionbarsherlock.app.ActionBar; import android.util.Log;
import com.actionbarsherlock.app.SherlockFragmentActivity; import android.view.View;
import org.jetbrains.annotations.NotNull; import com.actionbarsherlock.app.ActionBar;
import org.jetbrains.annotations.Nullable; import com.actionbarsherlock.app.SherlockFragmentActivity;
import org.solovyev.android.AndroidUtils; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.about.CalculatorFragmentType; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.sherlock.tabs.ActionBarFragmentTabListener; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.calculator.about.CalculatorFragmentType;
/** import org.solovyev.android.sherlock.tabs.ActionBarFragmentTabListener;
* User: serso
* Date: 9/25/12 /**
* Time: 10:32 PM * User: serso
*/ * Date: 9/25/12
public class CalculatorActivityHelperImpl extends AbstractCalculatorHelper implements CalculatorActivityHelper { * Time: 10:32 PM
*/
/* public class CalculatorActivityHelperImpl extends AbstractCalculatorHelper implements CalculatorActivityHelper {
**********************************************************************
* /*
* CONSTANTS **********************************************************************
* *
********************************************************************** * CONSTANTS
*/ *
**********************************************************************
/* */
**********************************************************************
* /*
* FIELDS **********************************************************************
* *
********************************************************************** * FIELDS
*/ *
**********************************************************************
private int layoutId; */
private boolean homeIcon = false; private int layoutId;
@NotNull private boolean homeIcon = false;
private CalculatorPreferences.Gui.Theme theme;
@NotNull
private int selectedNavigationIndex = 0; private CalculatorPreferences.Gui.Theme theme;
public CalculatorActivityHelperImpl(int layoutId, @NotNull String logTag) { private int selectedNavigationIndex = 0;
super(logTag);
this.layoutId = layoutId; public CalculatorActivityHelperImpl(int layoutId, @NotNull String logTag) {
} super(logTag);
this.layoutId = layoutId;
public CalculatorActivityHelperImpl(int layoutId, boolean homeIcon) { }
this.layoutId = layoutId;
this.homeIcon = homeIcon; public CalculatorActivityHelperImpl(int layoutId, boolean homeIcon) {
} this.layoutId = layoutId;
this.homeIcon = homeIcon;
@Override }
public void onCreate(@NotNull Activity activity, @Nullable Bundle savedInstanceState) {
super.onCreate(activity); @Override
public void onCreate(@NotNull Activity activity, @Nullable Bundle savedInstanceState) {
if (activity instanceof CalculatorEventListener) { super.onCreate(activity);
CalculatorLocatorImpl.getInstance().getCalculator().addCalculatorEventListener((CalculatorEventListener) activity);
} if (activity instanceof CalculatorEventListener) {
CalculatorLocatorImpl.getInstance().getCalculator().addCalculatorEventListener((CalculatorEventListener) activity);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity); }
this.theme = CalculatorPreferences.Gui.getTheme(preferences); final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
activity.setTheme(this.theme.getThemeId());
this.theme = CalculatorPreferences.Gui.getTheme(preferences);
activity.setContentView(layoutId); activity.setTheme(this.theme.getThemeId());
final View root = activity.findViewById(R.id.main_layout); activity.setContentView(layoutId);
if (root != null) {
processButtons(activity, root); final View root = activity.findViewById(R.id.main_layout);
} else { if (root != null) {
Log.e(CalculatorActivityHelperImpl.class.getSimpleName(), "Root is null for " + activity.getClass().getName()); processButtons(activity, root);
} } else {
} Log.e(CalculatorActivityHelperImpl.class.getSimpleName(), "Root is null for " + activity.getClass().getName());
}
@Override }
public void onCreate(@NotNull final SherlockFragmentActivity activity, @Nullable Bundle savedInstanceState) {
this.onCreate((Activity) activity, savedInstanceState); @Override
public void onCreate(@NotNull final SherlockFragmentActivity activity, @Nullable Bundle savedInstanceState) {
final ActionBar actionBar = activity.getSupportActionBar(); this.onCreate((Activity) activity, savedInstanceState);
actionBar.setDisplayUseLogoEnabled(false);
actionBar.setDisplayHomeAsUpEnabled(homeIcon); final ActionBar actionBar = activity.getSupportActionBar();
actionBar.setHomeButtonEnabled(false); actionBar.setDisplayUseLogoEnabled(false);
actionBar.setDisplayShowHomeEnabled(true); actionBar.setDisplayHomeAsUpEnabled(homeIcon);
actionBar.setHomeButtonEnabled(false);
toggleTitle(activity, true); actionBar.setDisplayShowHomeEnabled(true);
actionBar.setIcon(R.drawable.icon_action_bar); toggleTitle(activity, true);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
} actionBar.setIcon(R.drawable.icon_action_bar);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
private void toggleTitle(@NotNull SherlockFragmentActivity activity, boolean showTitle) { }
final ActionBar actionBar = activity.getSupportActionBar();
private void toggleTitle(@NotNull SherlockFragmentActivity activity, boolean showTitle) {
if (activity instanceof CalculatorActivity) { final ActionBar actionBar = activity.getSupportActionBar();
if (AndroidUtils.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT) {
actionBar.setDisplayShowTitleEnabled(true); if (activity instanceof CalculatorActivity) {
} else { if (AndroidUtils.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT) {
actionBar.setDisplayShowTitleEnabled(false); actionBar.setDisplayShowTitleEnabled(true);
} } else {
} else { actionBar.setDisplayShowTitleEnabled(false);
actionBar.setDisplayShowTitleEnabled(showTitle); }
} } else {
} actionBar.setDisplayShowTitleEnabled(showTitle);
}
public void restoreSavedTab(@NotNull SherlockFragmentActivity activity) { }
final ActionBar actionBar = activity.getSupportActionBar();
if (selectedNavigationIndex >= 0 && selectedNavigationIndex < actionBar.getTabCount()) { public void restoreSavedTab(@NotNull SherlockFragmentActivity activity) {
actionBar.setSelectedNavigationItem(selectedNavigationIndex); final ActionBar actionBar = activity.getSupportActionBar();
} if (selectedNavigationIndex >= 0 && selectedNavigationIndex < actionBar.getTabCount()) {
} actionBar.setSelectedNavigationItem(selectedNavigationIndex);
}
@Override }
public void onSaveInstanceState(@NotNull SherlockFragmentActivity activity, @NotNull Bundle outState) {
onSaveInstanceState((Activity) activity, outState); @Override
} public void onSaveInstanceState(@NotNull SherlockFragmentActivity activity, @NotNull Bundle outState) {
onSaveInstanceState((Activity) activity, outState);
@Override }
public void onSaveInstanceState(@NotNull Activity activity, @NotNull Bundle outState) {
} @Override
public void onSaveInstanceState(@NotNull Activity activity, @NotNull Bundle outState) {
@Override }
public void onResume(@NotNull Activity activity) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity); @Override
public void onResume(@NotNull Activity activity) {
final CalculatorPreferences.Gui.Theme newTheme = CalculatorPreferences.Gui.theme.getPreference(preferences); final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
if (!theme.equals(newTheme)) {
AndroidUtils.restartActivity(activity); final CalculatorPreferences.Gui.Theme newTheme = CalculatorPreferences.Gui.theme.getPreference(preferences);
} if (!theme.equals(newTheme)) {
} AndroidUtils.restartActivity(activity);
}
@Override }
public void onPause(@NotNull Activity activity) {
} @Override
public void onPause(@NotNull Activity activity) {
@Override }
public void onPause(@NotNull SherlockFragmentActivity activity) {
onPause((Activity) activity); @Override
public void onPause(@NotNull SherlockFragmentActivity activity) {
final int selectedNavigationIndex = activity.getSupportActionBar().getSelectedNavigationIndex(); onPause((Activity) activity);
if (selectedNavigationIndex >= 0) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity); final int selectedNavigationIndex = activity.getSupportActionBar().getSelectedNavigationIndex();
final SharedPreferences.Editor editor = preferences.edit(); if (selectedNavigationIndex >= 0) {
editor.putInt(getSavedTabPreferenceName(activity), selectedNavigationIndex); final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
editor.commit(); final SharedPreferences.Editor editor = preferences.edit();
} editor.putInt(getSavedTabPreferenceName(activity), selectedNavigationIndex);
editor.commit();
} }
@NotNull }
private String getSavedTabPreferenceName(@NotNull Activity activity) {
return "tab_" + activity.getClass().getSimpleName(); @NotNull
} private String getSavedTabPreferenceName(@NotNull Activity activity) {
return "tab_" + activity.getClass().getSimpleName();
@Override }
public void onDestroy(@NotNull Activity activity) {
super.onDestroy(activity); @Override
public void onDestroy(@NotNull Activity activity) {
if (activity instanceof CalculatorEventListener) { super.onDestroy(activity);
CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener((CalculatorEventListener) activity);
} if (activity instanceof CalculatorEventListener) {
} CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener((CalculatorEventListener) activity);
}
@Override }
public void onDestroy(@NotNull SherlockFragmentActivity activity) {
this.onDestroy((Activity) activity); @Override
} public void onDestroy(@NotNull SherlockFragmentActivity activity) {
this.onDestroy((Activity) activity);
@Override }
public void addTab(@NotNull SherlockFragmentActivity activity,
@NotNull String tag, @Override
@NotNull Class<? extends Fragment> fragmentClass, public void addTab(@NotNull SherlockFragmentActivity activity,
@Nullable Bundle fragmentArgs, @NotNull String tag,
int captionResId, @NotNull Class<? extends Fragment> fragmentClass,
int parentViewId) { @Nullable Bundle fragmentArgs,
final ActionBar actionBar = activity.getSupportActionBar(); int captionResId,
int parentViewId) {
final ActionBar.Tab tab = actionBar.newTab(); final ActionBar actionBar = activity.getSupportActionBar();
tab.setTag(tag);
tab.setText(captionResId); final ActionBar.Tab tab = actionBar.newTab();
tab.setTag(tag);
final ActionBarFragmentTabListener listener = new ActionBarFragmentTabListener(activity, tag, fragmentClass, fragmentArgs, parentViewId); tab.setText(captionResId);
tab.setTabListener(listener);
actionBar.addTab(tab); final ActionBarFragmentTabListener listener = new ActionBarFragmentTabListener(activity, tag, fragmentClass, fragmentArgs, parentViewId);
} tab.setTabListener(listener);
actionBar.addTab(tab);
@Override }
public void addTab(@NotNull SherlockFragmentActivity activity, @NotNull CalculatorFragmentType fragmentType, @Nullable Bundle fragmentArgs, int parentViewId) {
addTab(activity, fragmentType.getFragmentTag(), fragmentType.getFragmentClass(), fragmentArgs, fragmentType.getDefaultTitleResId(), parentViewId); @Override
} public void addTab(@NotNull SherlockFragmentActivity activity, @NotNull CalculatorFragmentType fragmentType, @Nullable Bundle fragmentArgs, int parentViewId) {
addTab(activity, fragmentType.getFragmentTag(), fragmentType.getFragmentClass(), fragmentArgs, fragmentType.getDefaultTitleResId(), parentViewId);
@Override }
public int getLayoutId() {
return layoutId; @Override
} public void setFragment(@NotNull SherlockFragmentActivity activity, @NotNull CalculatorFragmentType fragmentType, @Nullable Bundle fragmentArgs, int parentViewId) {
final Fragment fragment = Fragment.instantiate(activity, fragmentType.getFragmentClass().getName(), fragmentArgs);
@Override final FragmentManager fm = activity.getSupportFragmentManager();
@NotNull final FragmentTransaction ft = fm.beginTransaction();
public CalculatorPreferences.Gui.Theme getTheme() { ft.add(parentViewId, fragment);
return theme; ft.commit();
} }
@Override @Override
public void onResume(@NotNull SherlockFragmentActivity activity) { public int getLayoutId() {
onResume((Activity) activity); return layoutId;
}
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
selectedNavigationIndex = preferences.getInt(getSavedTabPreferenceName(activity), -1); @Override
restoreSavedTab(activity); @NotNull
} public CalculatorPreferences.Gui.Theme getTheme() {
} return theme;
}
@Override
public void onResume(@NotNull SherlockFragmentActivity activity) {
onResume((Activity) activity);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
selectedNavigationIndex = preferences.getInt(getSavedTabPreferenceName(activity), -1);
restoreSavedTab(activity);
}
}

5
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
View File

@ -5,6 +5,7 @@ import org.jetbrains.annotations.NotNull;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.calculator.math.MathType; import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine; import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.calculator.plot.GraphLineColor;
import org.solovyev.android.prefs.BooleanPreference; import org.solovyev.android.prefs.BooleanPreference;
import org.solovyev.android.prefs.IntegerPreference; import org.solovyev.android.prefs.IntegerPreference;
import org.solovyev.android.prefs.Preference; import org.solovyev.android.prefs.Preference;
@ -98,7 +99,9 @@ public final class CalculatorPreferences {
} }
public static class Graph { public static class Graph {
public static final Preference<Boolean> showComplexGraph = new BooleanPreference("show_complex_graph", false); public static final Preference<Boolean> interpolate = new BooleanPreference("graph_interpolate", true);
public static final Preference<GraphLineColor> lineColorReal = StringPreference.newInstance("graph_line_color_real", GraphLineColor.white, GraphLineColor.class);
public static final Preference<GraphLineColor> lineColorImag = StringPreference.newInstance("graph_line_color_imag", GraphLineColor.blue, GraphLineColor.class);
} }

5
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
View File

@ -39,7 +39,10 @@ public class CalculatorPreferencesActivity extends SherlockPreferenceActivity im
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences); //noinspection deprecation
addPreferencesFromResource(R.xml.preferences);
//noinspection deprecation
addPreferencesFromResource(R.xml.plot_preferences);
final Preference adFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY); final Preference adFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY);
adFreePreference.setEnabled(false); adFreePreference.setEnabled(false);

66
calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
View File

@ -1,32 +1,34 @@
package org.solovyev.android.calculator.plot; package org.solovyev.android.calculator.plot;
import android.content.Intent; import android.app.ActionBar;
import android.os.Bundle; import android.content.Intent;
import org.jetbrains.annotations.Nullable; import android.os.Bundle;
import org.solovyev.android.calculator.CalculatorFragmentActivity; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.CalculatorFragmentActivity;
import org.solovyev.android.calculator.about.CalculatorFragmentType; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.about.CalculatorFragmentType;
/**
* User: serso /**
* Date: 9/30/12 * User: serso
* Time: 4:56 PM * Date: 9/30/12
*/ * Time: 4:56 PM
public class CalculatorPlotActivity extends CalculatorFragmentActivity { */
public class CalculatorPlotActivity extends CalculatorFragmentActivity {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) { @Override
super.onCreate(savedInstanceState); public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final Intent intent = getIntent();
final Intent intent = getIntent();
final Bundle arguments;
if (intent != null) { final Bundle arguments;
arguments = intent.getExtras(); if (intent != null) {
} else { arguments = intent.getExtras();
arguments = null; } else {
} arguments = null;
}
getActivityHelper().addTab(this, CalculatorFragmentType.plotter, arguments, R.id.main_layout);
} getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
} getActivityHelper().setFragment(this, CalculatorFragmentType.plotter, arguments, R.id.main_layout);
}
}

1059
calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
View File

File diff suppressed because it is too large Load Diff

21
calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java Normal file
View File

@ -0,0 +1,21 @@
package org.solovyev.android.calculator.plot;
import android.os.Bundle;
import com.actionbarsherlock.app.SherlockPreferenceActivity;
import org.solovyev.android.calculator.R;
/**
* User: serso
* Date: 10/4/12
* Time: 9:01 PM
*/
public class CalculatorPlotPreferenceActivity extends SherlockPreferenceActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//noinspection deprecation
addPreferencesFromResource(R.xml.plot_preferences);
}
}

28
calculatorpp/src/main/java/org/solovyev/android/calculator/plot/GraphLineColor.java Normal file
View File

@ -0,0 +1,28 @@
package org.solovyev.android.calculator.plot;
import android.graphics.Color;
/**
* User: serso
* Date: 10/4/12
* Time: 10:08 PM
*/
public enum GraphLineColor {
white(Color.WHITE),
grey(Color.GRAY),
red(Color.RED),
blue(Color.rgb(16, 100, 140)),
green(Color.GREEN);
private final int color;
private GraphLineColor(int color) {
this.color = color;
}
public int getColor() {
return this.color;
}
}

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

@ -1,336 +1,420 @@
/* /*
* Copyright (c) 2009-2011. Created by serso aka se.solovyev. * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
* or visit http://se.solovyev.org * or visit http://se.solovyev.org
*/ */
package org.solovyev.android.calculator.plot; package org.solovyev.android.calculator.plot;
import android.util.Log; import android.util.Log;
import jscl.math.Expression; import jscl.math.Expression;
import jscl.math.Generic; import jscl.math.Generic;
import jscl.math.JsclInteger; import jscl.math.JsclInteger;
import jscl.math.NumericWrapper; import jscl.math.NumericWrapper;
import jscl.math.function.Constant; import jscl.math.function.Constant;
import jscl.math.numeric.Complex; import jscl.math.numeric.Complex;
import jscl.math.numeric.Numeric; import jscl.math.numeric.Numeric;
import jscl.math.numeric.Real; import jscl.math.numeric.Real;
import org.achartengine.util.MathHelper; import org.achartengine.chart.CubicLineChart;
import org.jetbrains.annotations.NotNull; import org.achartengine.chart.PointStyle;
import org.jetbrains.annotations.Nullable; import org.achartengine.chart.ScatterChart;
import org.achartengine.chart.XYChart;
/** import org.achartengine.model.XYMultipleSeriesDataset;
* User: serso import org.achartengine.renderer.BasicStroke;
* Date: 12/5/11 import org.achartengine.renderer.XYMultipleSeriesRenderer;
* Time: 8:58 PM import org.achartengine.renderer.XYSeriesRenderer;
*/ import org.achartengine.util.MathHelper;
public final class PlotUtils { import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
private static final double MAX_Y_DIFF = 1;
private static final double MAX_X_DIFF = 1; /**
* User: serso
// not intended for instantiation * Date: 12/5/11
private PlotUtils() { * Time: 8:58 PM
throw new AssertionError(); */
} public final class PlotUtils {
public static boolean addXY(double minValue, private static final double MAX_Y_DIFF = 1;
double maxValue, private static final double MAX_X_DIFF = 1;
@NotNull Generic expression, static final int DEFAULT_NUMBER_OF_STEPS = 100;
@NotNull Constant variable,
@NotNull MyXYSeries realSeries, // not intended for instantiation
@Nullable MyXYSeries imagSeries, private PlotUtils() {
boolean addExtra, throw new AssertionError();
int numberOfSteps) throws ArithmeticException { }
boolean imagExists = false; public static boolean addXY(double minValue,
double maxValue,
double min = Math.min(minValue, maxValue); @NotNull Generic expression,
double max = Math.max(minValue, maxValue); @NotNull Constant variable,
double dist = max - min; @NotNull MyXYSeries realSeries,
if (addExtra) { @Nullable MyXYSeries imagSeries,
min = min - dist; boolean addExtra,
max = max + dist; int numberOfSteps) throws ArithmeticException {
}
boolean imagExists = false;
final double eps = 0.000000001;
double min = Math.min(minValue, maxValue);
final double defaultStep = Math.max(dist / numberOfSteps, eps); double max = Math.max(minValue, maxValue);
double step = defaultStep; double dist = max - min;
if (addExtra) {
final Point real = new Point(); min = min - dist;
final Point imag = new Point(); max = max + dist;
}
double x = min;
final double eps = 0.000000001;
while (x <= max) {
final double defaultStep = Math.max(dist / numberOfSteps, eps);
boolean needToCalculateRealY = realSeries.needToAdd(step, x); double step = defaultStep;
if (needToCalculateRealY) { final Point real = new Point();
final Complex c = calculatorExpression(expression, variable, x); final Point imag = new Point();
Double y = prepareY(c.realPart());
double x = min;
if (y != null) {
real.moveToNextPoint(x, y); while (x <= max) {
addSingularityPoint(realSeries, real);
realSeries.add(x, y); boolean needToCalculateRealY = realSeries.needToAdd(step, x);
}
if (needToCalculateRealY) {
boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(step, x); final Complex c = calculatorExpression(expression, variable, x);
if (needToCalculateImagY) { Double y = prepareY(c.realPart());
y = prepareY(c.imaginaryPart());
if (y != null) { if (y != null) {
imag.moveToNextPoint(x, y); real.moveToNextPoint(x, y);
addSingularityPoint(imagSeries, imag); addSingularityPoint(realSeries, real);
imagSeries.add(x, y); realSeries.add(x, y);
} }
if (c.imaginaryPart() != 0d) {
imagExists = true; boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(step, x);
} if (needToCalculateImagY) {
} y = prepareY(c.imaginaryPart());
} else { if (y != null) {
boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(step, x); imag.moveToNextPoint(x, y);
if (needToCalculateImagY) { addSingularityPoint(imagSeries, imag);
final Complex c = calculatorExpression(expression, variable, x); imagSeries.add(x, y);
Double y = prepareY(c.imaginaryPart()); }
if (y != null) { if (c.imaginaryPart() != 0d) {
imag.moveToNextPoint(x, y); imagExists = true;
addSingularityPoint(imagSeries, imag); }
imagSeries.add(x, y); }
} } else {
if (c.imaginaryPart() != 0d) { boolean needToCalculateImagY = imagSeries != null && imagSeries.needToAdd(step, x);
imagExists = true; if (needToCalculateImagY) {
} final Complex c = calculatorExpression(expression, variable, x);
} Double y = prepareY(c.imaginaryPart());
} if (y != null) {
imag.moveToNextPoint(x, y);
step = updateStep(real, step, defaultStep / 2); addSingularityPoint(imagSeries, imag);
imagSeries.add(x, y);
x += step; }
} if (c.imaginaryPart() != 0d) {
imagExists = true;
return imagExists; }
} }
}
private static class Point {
private static final double DEFAULT = Double.MIN_VALUE; step = updateStep(real, step, defaultStep / 2);
private double x0 = DEFAULT; x += step;
private double x1 = DEFAULT; }
private double x2 = DEFAULT;
return imagExists;
private double y0 = DEFAULT; }
private double y1 = DEFAULT;
private double y2 = DEFAULT; @NotNull
static String getImagFunctionName(@NotNull Constant variable) {
private Point() { return "g(" + variable.getName() + ")" + " = " + "Im(ƒ(" + variable.getName() + "))";
} }
public void moveToNextPoint(double x, double y) { @NotNull
if ( this.x2 == x ) { private static String getRealFunctionName(@NotNull Generic expression, @NotNull Constant variable) {
return; return "ƒ(" + variable.getName() + ")" + " = " + expression.toString();
} }
this.x0 = this.x1; @NotNull
this.x1 = this.x2; static XYChart prepareChart(final double minValue,
this.x2 = x; final double maxValue,
@NotNull final Generic expression,
this.y0 = this.y1; @NotNull final Constant variable,
this.y1 = this.y2; int bgColor,
this.y2 = y; boolean interpolate,
} int realLineColor,
int imagLineColor) {
public boolean isFullyDefined() { final MyXYSeries realSeries = new MyXYSeries(getRealFunctionName(expression, variable), DEFAULT_NUMBER_OF_STEPS * 2);
return x0 != DEFAULT && x1 != DEFAULT && x2 != DEFAULT && y0 != DEFAULT && y1 != DEFAULT && y2 != DEFAULT; final MyXYSeries imagSeries = new MyXYSeries(getImagFunctionName(variable), DEFAULT_NUMBER_OF_STEPS * 2);
}
boolean imagExists = addXY(minValue, maxValue, expression, variable, realSeries, imagSeries, false, DEFAULT_NUMBER_OF_STEPS);
public double getDx2() {
return x2 - x1; final XYMultipleSeriesDataset data = new XYMultipleSeriesDataset();
} data.addSeries(realSeries);
if (imagExists) {
public double getAbsDx2() { data.addSeries(imagSeries);
if ( x2 > x1 ) { }
return Math.abs(x2 - x1);
} else { final XYMultipleSeriesRenderer renderer = new XYMultipleSeriesRenderer();
return Math.abs(x1 - x2); renderer.setShowGrid(true);
} renderer.setXTitle(variable.getName());
} renderer.setYTitle("f(" + variable.getName() + ")");
renderer.setChartTitleTextSize(25);
public double getAbsDx1() { renderer.setAxisTitleTextSize(25);
if ( x1 > x0 ) { renderer.setLabelsTextSize(25);
return Math.abs(x1 - x0); renderer.setLegendTextSize(25);
} else { renderer.setMargins(new int[]{25, 25, 25, 25});
return Math.abs(x0 - x1); renderer.setApplyBackgroundColor(true);
} renderer.setBackgroundColor(bgColor);
} renderer.setMarginsColor(bgColor);
public double getAbsDy1() { renderer.setZoomEnabled(true);
if ( y1 > y0 ) { renderer.setZoomButtonsVisible(true);
return Math.abs(y1 - y0);
} else { renderer.addSeriesRenderer(createCommonRenderer(realLineColor));
return Math.abs(y0 - y1); if (imagExists) {
} renderer.addSeriesRenderer(createImagRenderer(imagLineColor));
} }
public double getAbsDy2() { if (interpolate) {
if ( y2 > y1 ) { return new CubicLineChart(data, renderer, 0.1f);
return Math.abs(y2 - y1); } else {
} else { return new ScatterChart(data, renderer);
return Math.abs(y1 - y2); }
} }
}
static XYSeriesRenderer createImagRenderer(int color) {
public double getX0() { final XYSeriesRenderer imagRenderer = createCommonRenderer(color);
return x0; imagRenderer.setStroke(BasicStroke.DASHED);
} return imagRenderer;
}
public double getX1() {
return x1; @NotNull
} private static XYSeriesRenderer createCommonRenderer(int color) {
final XYSeriesRenderer renderer = new XYSeriesRenderer();
public double getX2() { renderer.setFillPoints(true);
return x2; renderer.setPointStyle(PointStyle.CIRCLE);
} renderer.setLineWidth(3);
renderer.setColor(color);
public boolean isX2Defined() { renderer.setStroke(BasicStroke.SOLID);
return x2 != DEFAULT; return renderer;
} }
public double getY0() { private static class Point {
return y0; private static final double DEFAULT = Double.MIN_VALUE;
}
private double x0 = DEFAULT;
public double getY1() { private double x1 = DEFAULT;
return y1; private double x2 = DEFAULT;
}
private double y0 = DEFAULT;
public double getY2() { private double y1 = DEFAULT;
return y2; private double y2 = DEFAULT;
}
private Point() {
public void clearHistory () { }
this.x0 = DEFAULT;
this.x1 = DEFAULT; public void moveToNextPoint(double x, double y) {
this.y0 = DEFAULT; if ( this.x2 == x ) {
this.y1 = DEFAULT; return;
} }
public double getAbsDyDx2() { this.x0 = this.x1;
double dx2 = this.getAbsDx2(); this.x1 = this.x2;
double dy2 = this.getAbsDy2(); this.x2 = x;
return dy2 / dx2;
} this.y0 = this.y1;
this.y1 = this.y2;
public double getAbsDyDx1() { this.y2 = y;
double dx1 = this.getAbsDx1(); }
double dy1 = this.getAbsDy1();
return dy1 / dx1; public boolean isFullyDefined() {
} return x0 != DEFAULT && x1 != DEFAULT && x2 != DEFAULT && y0 != DEFAULT && y1 != DEFAULT && y2 != DEFAULT;
}
public double getDyDx1() {
double result = getAbsDyDx1(); public double getDx2() {
return y1 > y0 ? result : -result; return x2 - x1;
} }
public double getDyDx2() { public double getAbsDx2() {
double result = getAbsDyDx2(); if ( x2 > x1 ) {
return y2 > y1 ? result : -result; return Math.abs(x2 - x1);
} } else {
return Math.abs(x1 - x2);
@Override }
public String toString() { }
return "Point{" +
"x0=" + x0 + public double getAbsDx1() {
", x1=" + x1 + if ( x1 > x0 ) {
", x2=" + x2 + return Math.abs(x1 - x0);
", y0=" + y0 + } else {
", y1=" + y1 + return Math.abs(x0 - x1);
", y2=" + y2 + }
'}'; }
}
} public double getAbsDy1() {
if ( y1 > y0 ) {
private static double updateStep(@NotNull Point real, return Math.abs(y1 - y0);
double step, } else {
double eps) { return Math.abs(y0 - y1);
if ( !real.isFullyDefined() ) { }
return step; }
} else {
double dydx2 = real.getAbsDyDx2(); public double getAbsDy2() {
double dydx1 = real.getAbsDyDx1(); if ( y2 > y1 ) {
return Math.abs(y2 - y1);
double k = dydx2 / dydx1; } else {
return Math.abs(y1 - y2);
if ( k > 1 ) { }
step = step / k; }
} else if ( k > 0 ) {
step = step * k; public double getX0() {
} return x0;
}
return Math.max(step, eps);
} public double getX1() {
} return x1;
}
@NotNull
public static Complex calculatorExpression(@NotNull Generic expression, @NotNull Constant variable, double x) { public double getX2() {
return unwrap(expression.substitute(variable, Expression.valueOf(x)).numeric()); return x2;
} }
public static void addSingularityPoint(@NotNull MyXYSeries series, public boolean isX2Defined() {
@NotNull Point point) { return x2 != DEFAULT;
if (point.isFullyDefined()) { }
// y or prevY should be more than 1d because if they are too small false singularity may occur (e.g., 1/0.000000000000000001)
// double dy0 = y1 - y0; public double getY0() {
// double dx0 = x1 - x0; return y0;
// double dydx0 = dy0 / dx0; }
double dy2 = point.getAbsDy2(); public double getY1() {
double dx2 = point.getAbsDx2(); return y1;
//double dx1 = x2 - x1; }
// double dydx1 = dy2 / dx1;
public double getY2() {
if ( dy2 > MAX_Y_DIFF && dx2 < MAX_X_DIFF && isDifferentSign(point.getY2(), point.getY1()) && isDifferentSign(point.getDyDx1(), point.getDyDx2())) { return y2;
Log.d(CalculatorPlotActivity.class.getName(), "Singularity: " + point); }
//Log.d(CalculatorPlotActivity.class.getName(), String.valueOf(prevX + Math.abs(x - prevX) / 2) + ", null");
series.add(point.getX1() + point.getAbsDx2() / 2, MathHelper.NULL_VALUE); public void clearHistory () {
point.clearHistory(); this.x0 = DEFAULT;
} this.x1 = DEFAULT;
} this.y0 = DEFAULT;
} this.y1 = DEFAULT;
}
private static boolean isDifferentSign(@NotNull Double y0, @NotNull Double y1) {
return (y0 >= 0 && y1 < 0) || (y1 >= 0 && y0 < 0); public double getAbsDyDx2() {
} double dx2 = this.getAbsDx2();
double dy2 = this.getAbsDy2();
@Nullable return dy2 / dx2;
public static Double prepareY(double y) { }
if (Double.isNaN(y)) {
return null; public double getAbsDyDx1() {
} else { double dx1 = this.getAbsDx1();
return y; double dy1 = this.getAbsDy1();
} return dy1 / dx1;
} }
@NotNull public double getDyDx1() {
public static Complex unwrap(@Nullable Generic numeric) { double result = getAbsDyDx1();
if (numeric instanceof JsclInteger) { return y1 > y0 ? result : -result;
return Complex.valueOf(((JsclInteger) numeric).intValue(), 0d); }
} else if (numeric instanceof NumericWrapper) {
return unwrap(((NumericWrapper) numeric).content()); public double getDyDx2() {
} else { double result = getAbsDyDx2();
throw new ArithmeticException(); return y2 > y1 ? result : -result;
} }
}
@Override
@NotNull public String toString() {
public static Complex unwrap(@Nullable Numeric content) { return "Point{" +
if (content instanceof Real) { "x0=" + x0 +
return Complex.valueOf(((Real) content).doubleValue(), 0d); ", x1=" + x1 +
} else if (content instanceof Complex) { ", x2=" + x2 +
return ((Complex) content); ", y0=" + y0 +
} else { ", y1=" + y1 +
throw new ArithmeticException(); ", y2=" + y2 +
} '}';
} }
} }
private static double updateStep(@NotNull Point real,
double step,
double eps) {
if ( !real.isFullyDefined() ) {
return step;
} else {
double dydx2 = real.getAbsDyDx2();
double dydx1 = real.getAbsDyDx1();
double k = dydx2 / dydx1;
if ( k > 1 ) {
step = step / k;
} else if ( k > 0 ) {
step = step * k;
}
return Math.max(step, eps);
}
}
@NotNull
public static Complex calculatorExpression(@NotNull Generic expression, @NotNull Constant variable, double x) {
return unwrap(expression.substitute(variable, Expression.valueOf(x)).numeric());
}
public static void addSingularityPoint(@NotNull MyXYSeries series,
@NotNull Point point) {
if (point.isFullyDefined()) {
// y or prevY should be more than 1d because if they are too small false singularity may occur (e.g., 1/0.000000000000000001)
// double dy0 = y1 - y0;
// double dx0 = x1 - x0;
// double dydx0 = dy0 / dx0;
double dy2 = point.getAbsDy2();
double dx2 = point.getAbsDx2();
//double dx1 = x2 - x1;
// double dydx1 = dy2 / dx1;
if ( dy2 > MAX_Y_DIFF && dx2 < MAX_X_DIFF && isDifferentSign(point.getY2(), point.getY1()) && isDifferentSign(point.getDyDx1(), point.getDyDx2())) {
Log.d(CalculatorPlotActivity.class.getName(), "Singularity: " + point);
//Log.d(CalculatorPlotActivity.class.getName(), String.valueOf(prevX + Math.abs(x - prevX) / 2) + ", null");
series.add(point.getX1() + point.getAbsDx2() / 2, MathHelper.NULL_VALUE);
point.clearHistory();
}
}
}
private static boolean isDifferentSign(@NotNull Double y0, @NotNull Double y1) {
return (y0 >= 0 && y1 < 0) || (y1 >= 0 && y0 < 0);
}
@Nullable
public static Double prepareY(double y) {
if (Double.isNaN(y)) {
return null;
} else {
return y;
}
}
@NotNull
public static Complex unwrap(@Nullable Generic numeric) {
if (numeric instanceof JsclInteger) {
return Complex.valueOf(((JsclInteger) numeric).intValue(), 0d);
} else if (numeric instanceof NumericWrapper) {
return unwrap(((NumericWrapper) numeric).content());
} else {
throw new ArithmeticException();
}
}
@NotNull
public static Complex unwrap(@Nullable Numeric content) {
if (content instanceof Real) {
return Complex.valueOf(((Real) content).doubleValue(), 0d);
} else if (content instanceof Complex) {
return ((Complex) content);
} else {
throw new ArithmeticException();
}
}
}