From 386852e83ea8b95cbbb3dba12293f4cb709fb473 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Wed, 21 Jan 2015 15:27:29 -0700 Subject: [PATCH] Fix sqrt[] graphing bug --- src/Ubuntu-R info | 2 ++ src/net/apocalypselabs/symat/CodeCompleter.java | 4 ---- src/net/apocalypselabs/symat/CodeEditor.java | 2 -- src/net/apocalypselabs/symat/Graph.java | 13 +++++++++---- 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/Ubuntu-R info diff --git a/src/Ubuntu-R info b/src/Ubuntu-R info new file mode 100644 index 0000000..800c150 --- /dev/null +++ b/src/Ubuntu-R info @@ -0,0 +1,2 @@ +The ubuntu.ttf font file was originally Ubuntu-R.ttf. +It was changed for several petty reasons. \ No newline at end of file diff --git a/src/net/apocalypselabs/symat/CodeCompleter.java b/src/net/apocalypselabs/symat/CodeCompleter.java index b5d16ac..4e5ad5c 100644 --- a/src/net/apocalypselabs/symat/CodeCompleter.java +++ b/src/net/apocalypselabs/symat/CodeCompleter.java @@ -49,12 +49,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import org.fife.ui.autocomplete.BasicCompletion; -import org.fife.ui.autocomplete.Completion; import org.fife.ui.autocomplete.CompletionProvider; import org.fife.ui.autocomplete.DefaultCompletionProvider; -import org.fife.ui.autocomplete.FunctionCompletion; -import org.fife.ui.autocomplete.MarkupTagCompletion; -import org.fife.ui.autocomplete.ShorthandCompletion; import org.fife.ui.autocomplete.VariableCompletion; /** diff --git a/src/net/apocalypselabs/symat/CodeEditor.java b/src/net/apocalypselabs/symat/CodeEditor.java index 18361e0..f64a85d 100644 --- a/src/net/apocalypselabs/symat/CodeEditor.java +++ b/src/net/apocalypselabs/symat/CodeEditor.java @@ -52,8 +52,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; diff --git a/src/net/apocalypselabs/symat/Graph.java b/src/net/apocalypselabs/symat/Graph.java index da3c47a..1dad9ea 100644 --- a/src/net/apocalypselabs/symat/Graph.java +++ b/src/net/apocalypselabs/symat/Graph.java @@ -288,15 +288,20 @@ public class Graph extends javax.swing.JInternalFrame { try { cr.setVar("x", x); res = solver.evaluate("$x=" + x + ";N[" + formula + "]").toString(); - } catch (MathException | NumberFormatException ex) { + } catch (Exception ex) { res = "0"; } // Omit crazy numbers like 1/0 and stuff - if (Double.parseDouble(res) > Integer.MIN_VALUE) { + try { + if (Double.parseDouble(res) > Integer.MIN_VALUE) { + xx += String.valueOf(x) + " "; + yy += res + " "; + } else { + + } + } catch (Exception ex) { xx += String.valueOf(x) + " "; yy += res + " "; - } else { - } } Debug.println(xx);