[gnome-calculator/60-split-out-a-backend-library] gcalc: implemented exp() function



commit 9a6084a0dddabbb53a65630aff85084d630f2e27
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Fri Jan 4 16:04:11 2019 -0600

    gcalc: implemented exp() function

 gcalc/gcalc-function-exp.vala           | 54 +++++++++++++++++++++++++++++++++
 gcalc/gcalc-function-sqrt.vala          |  3 +-
 gcalc/gcalc-gmath-equation-manager.vala |  1 +
 gcalc/meson.build                       |  1 +
 tests/gcalc-solving-basic.vala          | 20 ++++++++++--
 5 files changed, 75 insertions(+), 4 deletions(-)
---
diff --git a/gcalc/gcalc-function-exp.vala b/gcalc/gcalc-function-exp.vala
new file mode 100644
index 00000000..4114b74a
--- /dev/null
+++ b/gcalc/gcalc-function-exp.vala
@@ -0,0 +1,54 @@
+/* gcalc-function-exp.vala
+ *
+ * Copyright (C) 2018  Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Daniel Espinosa <esodan gmail com>
+ */
+public class GCalc.GFunctionExp : GFunction {
+
+  public GFunctionExp () {
+    base ("sqrt", 1);
+    param_types.add (new GConstant ());
+  }
+
+  public override Expression call () throws GLib.Error
+  {
+    verify_params ();
+    GConstant c = null;
+    var exp = parameters.get_item (0) as Expression;
+    if (exp == null) {
+      throw new FunctionError.INVOCATION_ERROR ("Invalid parameter type. Expected %s", 
typeof(Expression).name ());
+    }
+    var ev = exp.solve ();
+    if (ev is ErrorResult) {
+       throw new FunctionError.INVOCATION_ERROR ("Invalid expression: %s", ((ErrorResult) ev).to_string ());
+    }
+    if (ev is Result) {
+      c = ((Result) ev).expression as GConstant;
+    }
+    if (c == null) {
+       throw new FunctionError.INVOCATION_ERROR ("Invalid expression in result");
+    }
+    var p1 = MPC.Complex (1000);
+    p1.set (c.get_complex ());
+    var res = MPC.Complex (1000);
+    res.exp (p1);
+    var nc = new GConstant.internal_complex (res);
+    return nc as Expression;
+  }
+}
+
diff --git a/gcalc/gcalc-function-sqrt.vala b/gcalc/gcalc-function-sqrt.vala
index fa337023..403b95b2 100644
--- a/gcalc/gcalc-function-sqrt.vala
+++ b/gcalc/gcalc-function-sqrt.vala
@@ -1,4 +1,4 @@
-/* gcalc-gfunction.vala
+/* gcalc-function-sqrt.vala
  *
  * Copyright (C) 2018  Daniel Espinosa <esodan gmail com>
  *
@@ -19,6 +19,7 @@
  *      Daniel Espinosa <esodan gmail com>
  */
 public class GCalc.GFunctionSqrt : GFunction {
+
   public GFunctionSqrt () {
     base ("sqrt", 1);
     param_types.add (new GConstant ());
diff --git a/gcalc/gcalc-gmath-equation-manager.vala b/gcalc/gcalc-gmath-equation-manager.vala
index 8d1007fb..99143228 100644
--- a/gcalc/gcalc-gmath-equation-manager.vala
+++ b/gcalc/gcalc-gmath-equation-manager.vala
@@ -29,6 +29,7 @@ public class GCalc.GMathEquationManager : Object, MathEquationManager {
   construct {
     // Initialize default Functions
     functions.add (new GFunctionSqrt ());
+    functions.add (new GFunctionExp ());
   }
 }
 
diff --git a/gcalc/meson.build b/gcalc/meson.build
index a97375eb..2374b990 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -46,6 +46,7 @@ sources = files([
        'gcalc-expression.vala',
        'gcalc-expression-container.vala',
        'gcalc-function.vala',
+       'gcalc-function-exp.vala',
        'gcalc-function-sqrt.vala',
        'gcalc-error-result.vala',
        'gcalc-gexpression.vala',
diff --git a/tests/gcalc-solving-basic.vala b/tests/gcalc-solving-basic.vala
index c4eb27c6..18cb5263 100644
--- a/tests/gcalc-solving-basic.vala
+++ b/tests/gcalc-solving-basic.vala
@@ -470,9 +470,9 @@ class Tests {
     ()=>{
       try {
         var c1 = new GConstant.@double (9.0);
-        var fsqrt = new GFunctionSqrt ();
-        fsqrt.parameters.add (c1);
-        var c2 = fsqrt.call () as Constant;
+        var f = new GFunctionSqrt ();
+        f.parameters.add (c1);
+        var c2 = f.call () as Constant;
         assert (c2 != null);
         message (c2.to_string ());
         assert (c2.real () == 3.0);
@@ -480,6 +480,20 @@ class Tests {
         warning ("Error: %s", e.message);
       }
     });
+    Test.add_func ("/gcalc/solve/function/exp",
+    ()=>{
+      try {
+        var c1 = new GConstant.@double (0.0);
+        var f = new GFunctionExp ();
+        f.parameters.add (c1);
+        var c2 = f.call () as Constant;
+        assert (c2 != null);
+        message (c2.to_string ());
+        assert (c2.real () == 1.0);
+      } catch (GLib.Error e) {
+        warning ("Error: %s", e.message);
+      }
+    });
     return Test.run ();
   }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]