[gnome-calculator] GCalc: renamed Constant to MathConstant
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] GCalc: renamed Constant to MathConstant
- Date: Thu, 17 Oct 2019 19:07:41 +0000 (UTC)
commit b9149c1d8858d7df3d0434f21dc007c131ef3cc4
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Oct 17 11:09:25 2019 -0500
GCalc: renamed Constant to MathConstant
gcalc/gcalc-constant.vala | 32 -----
gcalc/gcalc-function-acos.vala | 2 +-
gcalc/gcalc-function.vala | 2 +-
gcalc/gcalc-gconstant.vala | 16 +--
gcalc/gcalc-gparameter.vala | 8 +-
gcalc/gcalc-gvariable.vala | 2 +-
gcalc/gcalc-math-assign.vala | 2 +-
gcalc/gcalc-math-constant.vala | 71 +++++++++++
gcalc/gcalc-math-polynomial.vala | 8 +-
gcalc/gcalc-parameter.vala | 2 +-
gcalc/gcalc-parser.vala | 4 +-
gcalc/gcalc-term.vala | 24 ++--
gcalc/gcalc-variable.vala | 4 +-
gcalc/meson.build | 2 +-
tests/gcalc-parsing.vala | 92 +++++++-------
tests/gcalc-solving-basic.vala | 258 +++++++++++++++++++--------------------
16 files changed, 284 insertions(+), 245 deletions(-)
---
diff --git a/gcalc/gcalc-function-acos.vala b/gcalc/gcalc-function-acos.vala
index af14d78e..2eca01ec 100644
--- a/gcalc/gcalc-function-acos.vala
+++ b/gcalc/gcalc-function-acos.vala
@@ -19,7 +19,7 @@
* Daniel Espinosa <esodan gmail com>
*/
/**
- * Function to calculate arc cosine of a {@link Constant} in radians
+ * Function to calculate arc cosine of a {@link MathConstant} in radians
*/
public class GCalc.GFunctionAcos : GFunction {
diff --git a/gcalc/gcalc-function.vala b/gcalc/gcalc-function.vala
index 923219ea..3420c27f 100644
--- a/gcalc/gcalc-function.vala
+++ b/gcalc/gcalc-function.vala
@@ -44,7 +44,7 @@ public interface GCalc.Function : Object, MathExpression {
/**
* Evaluate the function returning a resulting {@link MathExpression}.
*
- * In some cases return is a {@link Constant}
+ * In some cases return is a {@link MathConstant}
*/
public abstract MathExpression evaluate () throws GLib.Error;
/**
diff --git a/gcalc/gcalc-gconstant.vala b/gcalc/gcalc-gconstant.vala
index 51fa569a..5d7fef9f 100644
--- a/gcalc/gcalc-gconstant.vala
+++ b/gcalc/gcalc-gconstant.vala
@@ -18,7 +18,7 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GCalc.GConstant : Expression, Constant {
+public class GCalc.GConstant : Expression, MathConstant {
private MPC.Complex _complex = MPC.Complex (1000);
internal unowned MPC.Complex get_complex () { return _complex; }
@@ -42,7 +42,7 @@ public class GCalc.GConstant : Expression, Constant {
_complex.set_double (real, imag);
}
- // Constant Interface
+ // MathConstant Interface
internal double real () {
return _complex.get_real_double ();
}
@@ -55,7 +55,7 @@ public class GCalc.GConstant : Expression, Constant {
_complex.set_mpreal (r);
}
- internal Constant add (Constant c)
+ internal MathConstant add (MathConstant c)
requires (c is GConstant)
{
var res = MPC.Complex (1000);
@@ -65,7 +65,7 @@ public class GCalc.GConstant : Expression, Constant {
return new GConstant.internal_complex (res);
}
- internal Constant subtract (Constant c)
+ internal MathConstant subtract (MathConstant c)
requires (c is GConstant)
{
var res = MPC.Complex (1000);
@@ -75,7 +75,7 @@ public class GCalc.GConstant : Expression, Constant {
return new GConstant.internal_complex (res);
}
- internal Constant multiply (Constant c)
+ internal MathConstant multiply (MathConstant c)
requires (c is GConstant)
{
var res = MPC.Complex (1000);
@@ -85,7 +85,7 @@ public class GCalc.GConstant : Expression, Constant {
return new GConstant.internal_complex (res);
}
- internal Constant divide (Constant c)
+ internal MathConstant divide (MathConstant c)
requires (c is GConstant)
{
var res = MPC.Complex (1000);
@@ -95,14 +95,14 @@ public class GCalc.GConstant : Expression, Constant {
return new GConstant.internal_complex (res);
}
- internal Constant neg ()
+ internal MathConstant neg ()
{
var res = MPC.Complex (1000);
res.neg (_complex);
return new GConstant.internal_complex (res);
}
- internal Constant pow (Constant c)
+ internal MathConstant pow (MathConstant c)
requires (c is GConstant)
{
var res = MPC.Complex (1000);
diff --git a/gcalc/gcalc-gparameter.vala b/gcalc/gcalc-gparameter.vala
index 6192fbac..8aeee975 100644
--- a/gcalc/gcalc-gparameter.vala
+++ b/gcalc/gcalc-gparameter.vala
@@ -25,21 +25,21 @@ public class GCalc.GParameter : GCalc.GVariable, Parameter {
}
internal void set_value (GLib.Value val) throws GLib.Error {
- Constant c = new GConstant.integer (0);
+ MathConstant c = new GConstant.integer (0);
if (val.holds (GLib.Type.INT)) {
c = new GConstant.integer ((int) val);
} else if (val.holds (GLib.Type.DOUBLE)) {
c = new GConstant.@double ((double) val);
} else if (val.holds (GLib.Type.FLOAT)) {
c = new GConstant.@double ((double) ((float) val));
- } else if (val.type ().is_a (typeof (GCalc.Constant))) {
- c = (GCalc.Constant) ((Object) val);
+ } else if (val.type ().is_a (typeof (GCalc.MathConstant))) {
+ c = (GCalc.MathConstant) ((Object) val);
}
@value = c;
}
internal GLib.Value get_value () {
- var v = GLib.Value (typeof (GCalc.Constant));
+ var v = GLib.Value (typeof (GCalc.MathConstant));
v = @value;
return v;
}
diff --git a/gcalc/gcalc-gvariable.vala b/gcalc/gcalc-gvariable.vala
index 890975ce..fbb24720 100644
--- a/gcalc/gcalc-gvariable.vala
+++ b/gcalc/gcalc-gvariable.vala
@@ -21,7 +21,7 @@
public class GCalc.GVariable : Expression, Variable, Hashable {
public string name { get; construct set; }
- internal Constant value { get; set; }
+ internal MathConstant value { get; set; }
internal Variable bind { get; set; }
construct {
diff --git a/gcalc/gcalc-math-assign.vala b/gcalc/gcalc-math-assign.vala
index a08d1e14..f661ce42 100644
--- a/gcalc/gcalc-math-assign.vala
+++ b/gcalc/gcalc-math-assign.vala
@@ -37,7 +37,7 @@ public interface GCalc.MathAssign : Object, MathExpression, MathOperator, MathBi
if (p == null) {
throw new AssigError.INVALID_STRUCTURE_ERROR ("Invalid polynomial object in assign");
}
- var ca = p.evaluate () as Constant;
+ var ca = p.evaluate () as MathConstant;
if (ca == null) {
throw new AssigError.INVALID_STRUCTURE_ERROR ("Invalid polynomial evaluation in assign; should a
constant no Variable update was done");
}
diff --git a/gcalc/gcalc-math-constant.vala b/gcalc/gcalc-math-constant.vala
new file mode 100644
index 00000000..76890e54
--- /dev/null
+++ b/gcalc/gcalc-math-constant.vala
@@ -0,0 +1,71 @@
+/* gcalc-math-constant.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>
+ */
+/**
+ * A constant value in a math expression.
+ *
+ * This constant is a complex number with real and imaginary parts;
+ * and multiple-precision.
+ */
+public interface GCalc.MathConstant : Object, MathExpression {
+ /**
+ * Returns the real part of the complex number
+ */
+ public abstract double real ();
+ /**
+ * Returns the imaginary part of the complex number
+ */
+ public abstract double imag ();
+ /**
+ * Set the complex number to zero
+ */
+ public abstract void zero ();
+ /**
+ * Add this value with another complex number and returns
+ * the result
+ */
+ public abstract MathConstant add (MathConstant c);
+ /**
+ * Subtract another complex number from this value and returns
+ * the result
+ */
+ public abstract MathConstant subtract (MathConstant c);
+ /**
+ * Multipy another complex number with this value and returns
+ * the result
+ */
+ public abstract MathConstant multiply (MathConstant c);
+ /**
+ * Divide this value as numerator with another complex number as denominator
+ * and returns the result
+ */
+ public abstract MathConstant divide (MathConstant c);
+ /**
+ * Changes the direction of this complex value and returns
+ * the result
+ */
+ public abstract MathConstant neg ();
+ /**
+ * Pows this value using another complex number and returns
+ * the result
+ */
+ public abstract MathConstant pow (MathConstant c);
+}
+
diff --git a/gcalc/gcalc-math-polynomial.vala b/gcalc/gcalc-math-polynomial.vala
index bce9ac68..7b232be1 100644
--- a/gcalc/gcalc-math-polynomial.vala
+++ b/gcalc/gcalc-math-polynomial.vala
@@ -40,8 +40,8 @@ public interface GCalc.MathPolynomial : Object, MathExpression {
res = er;
break;
}
- if (res is Constant && er is Constant) {
- res = ((Constant) res).add ((Constant) er);
+ if (res is MathConstant && er is MathConstant) {
+ res = ((MathConstant) res).add ((MathConstant) er);
break;
}
}
@@ -49,8 +49,8 @@ public interface GCalc.MathPolynomial : Object, MathExpression {
current = null;
if (res == null) {
res = re;
- } else if (res is Constant && re is Constant) {
- res = ((Constant) res).add ((Constant) re);
+ } else if (res is MathConstant && re is MathConstant) {
+ res = ((MathConstant) res).add ((MathConstant) re);
}
if (res != null) {
}
diff --git a/gcalc/gcalc-parameter.vala b/gcalc/gcalc-parameter.vala
index bfa1c2f8..719fabf9 100644
--- a/gcalc/gcalc-parameter.vala
+++ b/gcalc/gcalc-parameter.vala
@@ -23,7 +23,7 @@
* expected to be resolved as part of an {@link MathExpression} evaluation,
* but by asigning its value.
*
- * Currently the value will be converted to a {@link Constant} if possible.
+ * Currently the value will be converted to a {@link MathConstant} if possible.
*/
public interface GCalc.Parameter : Object, MathExpression, Variable {
public abstract void set_value (GLib.Value val) throws GLib.Error;
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-parser.vala
index 6fa1734d..e2905116 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-parser.vala
@@ -354,7 +354,7 @@ public class GCalc.Parser : Object {
current_parent = current;
current = opp;
expected.clear ();
- } else if ((current is Constant || current is Variable)
+ } else if ((current is MathConstant || current is Variable)
&& current_parent is Term && top_parent is MathPolynomial) {
// New term
var t = new GTerm ();
@@ -392,7 +392,7 @@ public class GCalc.Parser : Object {
if (current is MathOperator) {
throw new ParserError.INVALID_TOKEN_ERROR ("Found an unexpected expression for a multiply operator");
}
- if ((current is Constant || current is Variable || current is Group || current is Function)
+ if ((current is MathConstant || current is Variable || current is Group || current is Function)
&& current_parent is Term && top_parent is MathPolynomial) {
current_parent.expressions.add (op);
current = op;
diff --git a/gcalc/gcalc-term.vala b/gcalc/gcalc-term.vala
index 93300e96..b989fbdf 100644
--- a/gcalc/gcalc-term.vala
+++ b/gcalc/gcalc-term.vala
@@ -26,8 +26,8 @@ public interface GCalc.Term : Object, MathExpression {
MathExpression res = new GErrorExpression ();
var e = evaluate ();
var e2 = t.evaluate ();
- if (e is Constant && e2 is Constant) {
- res = ((Constant) e).add ((Constant) e2);
+ if (e is MathConstant && e2 is MathConstant) {
+ res = ((MathConstant) e).add ((MathConstant) e2);
}
return res;
}
@@ -47,13 +47,13 @@ public interface GCalc.Term : Object, MathExpression {
}
current_operator = e as MathOperator;
continue;
- } else if (e is Constant) {
+ } else if (e is MathConstant) {
if (current == null) {
current = e;
first = false;
- } else if (current is Constant) {
+ } else if (current is MathConstant) {
if (current_operator != null) {
- current = evaluate_constants ((Constant) current, (Constant) e, current_operator);
+ current = evaluate_constants ((MathConstant) current, (MathConstant) e, current_operator);
}
}
} else if (e is Group) {
@@ -61,9 +61,9 @@ public interface GCalc.Term : Object, MathExpression {
if (current == null) {
current = ev;
first = false;
- } else if (current is Constant && ev is Constant) {
+ } else if (current is MathConstant && ev is MathConstant) {
if (current_operator != null) {
- current = evaluate_constants ((Constant) current, (Constant) ev, current_operator);
+ current = evaluate_constants ((MathConstant) current, (MathConstant) ev, current_operator);
}
}
} else if (e is Function) {
@@ -71,9 +71,9 @@ public interface GCalc.Term : Object, MathExpression {
if (current == null) {
current = ev;
first = false;
- } else if (current is Constant && ev is Constant) {
+ } else if (current is MathConstant && ev is MathConstant) {
if (current_operator != null) {
- current = evaluate_constants ((Constant) current, (Constant) ev, current_operator);
+ current = evaluate_constants ((MathConstant) current, (MathConstant) ev, current_operator);
}
}
} else if (e is Variable) {
@@ -81,9 +81,9 @@ public interface GCalc.Term : Object, MathExpression {
if (current == null) {
current = ev;
first = false;
- } else if (current is Constant && ev is Constant) {
+ } else if (current is MathConstant && ev is MathConstant) {
if (current_operator != null) {
- current = evaluate_constants ((Constant) current, (Constant) ev, current_operator);
+ current = evaluate_constants ((MathConstant) current, (MathConstant) ev, current_operator);
}
}
}
@@ -93,7 +93,7 @@ public interface GCalc.Term : Object, MathExpression {
}
return current;
}
- public static MathExpression evaluate_constants (Constant c1, Constant c2, MathOperator op)
+ public static MathExpression evaluate_constants (MathConstant c1, MathConstant c2, MathOperator op)
throws GLib.Error
{
MathExpression res = null;
diff --git a/gcalc/gcalc-variable.vala b/gcalc/gcalc-variable.vala
index 9a69b4bd..04380fb8 100644
--- a/gcalc/gcalc-variable.vala
+++ b/gcalc/gcalc-variable.vala
@@ -23,7 +23,7 @@
*/
public interface GCalc.Variable : Object, MathExpression {
public abstract string name { get; construct set; }
- public abstract Constant @value { get; set; }
+ public abstract MathConstant @value { get; set; }
public abstract Variable bind { get; set; }
public virtual bool binded { get { return bind != null; } }
@@ -44,7 +44,7 @@ public interface GCalc.Variable : Object, MathExpression {
if (e == null) {
throw new VariableError.INVALID_EXPRESSION_DEFINITION ("Can't access to Variable's expression
definition. Unexpected object type");
}
- var exp = e.evaluate () as Constant;
+ var exp = e.evaluate () as MathConstant;
if (exp == null) {
throw new VariableError.EVALUATION_FAIL ("Variable evaluation fail. Variable's value not updated");
}
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 72e3302b..39d1a2f5 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -57,7 +57,6 @@ lib_mpfrg = static_library ('mpfrg',
gcalc_sources = files([
'gcalc-assign.vala',
- 'gcalc-constant.vala',
'gcalc-division.vala',
'gcalc-expression.vala',
'gcalc-expression-container.vala',
@@ -98,6 +97,7 @@ gcalc_sources = files([
'gcalc-gvariable.vala',
'gcalc-hashable.vala',
'gcalc-math-assign.vala',
+ 'gcalc-math-constant.vala',
'gcalc-math-binary-operator.vala',
'gcalc-math-equation.vala',
'gcalc-math-equation-manager.vala',
diff --git a/tests/gcalc-parsing.vala b/tests/gcalc-parsing.vala
index 005cd26c..f0fed8ad 100644
--- a/tests/gcalc-parsing.vala
+++ b/tests/gcalc-parsing.vala
@@ -39,7 +39,7 @@ class Tests {
var t = p.expressions.get_item (0) as Term;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -61,7 +61,7 @@ class Tests {
var t = p.expressions.get_item (0) as Term;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -100,7 +100,7 @@ class Tests {
var t = p.expressions.get_item (0) as Term;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -122,14 +122,14 @@ class Tests {
var t1 = p.expressions.get_item (0) as Term;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
- var c1 = t1.expressions.get_item (0) as Constant;
+ var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var t2 = p.expressions.get_item (1) as Term;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as Plus;
assert (plus != null);
- var c2 = t2.expressions.get_item (1) as Constant;
+ var c2 = t2.expressions.get_item (1) as MathConstant;
assert (c2 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -187,7 +187,7 @@ class Tests {
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as Plus;
assert (plus != null);
- var c2 = t2.expressions.get_item (1) as Constant;
+ var c2 = t2.expressions.get_item (1) as MathConstant;
assert (c2 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -209,7 +209,7 @@ class Tests {
var t1 = p.expressions.get_item (0) as Term;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
- var c1 = t1.expressions.get_item (0) as Constant;
+ var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var t2 = p.expressions.get_item (1) as Term;
assert (t2 != null);
@@ -241,7 +241,7 @@ class Tests {
assert (t1.expressions.get_n_items () == 2);
var minus = t1.expressions.get_item (0) as Minus;
assert (minus != null);
- var c1 = t1.expressions.get_item (1) as Constant;
+ var c1 = t1.expressions.get_item (1) as MathConstant;
assert (c1 != null);
var t2 = p.expressions.get_item (1) as Term;
assert (t2 != null);
@@ -255,7 +255,7 @@ class Tests {
assert (t3.expressions.get_n_items () == 2);
var plus2 = t3.expressions.get_item (0) as Plus;
assert (plus2 != null);
- var c3 = t3.expressions.get_item (1) as Constant;
+ var c3 = t3.expressions.get_item (1) as MathConstant;
assert (c3 != null);
var t4 = p.expressions.get_item (3) as Term;
assert (t4 != null);
@@ -287,7 +287,7 @@ class Tests {
assert (t1.expressions.get_n_items () == 2);
var minus = t1.expressions.get_item (0) as Minus;
assert (minus != null);
- var c1 = t1.expressions.get_item (1) as Constant;
+ var c1 = t1.expressions.get_item (1) as MathConstant;
assert (c1 != null);
var t2 = p.expressions.get_item (1) as Term;
assert (t2 != null);
@@ -301,7 +301,7 @@ class Tests {
assert (t3.expressions.get_n_items () == 2);
var plus2 = t3.expressions.get_item (0) as Plus;
assert (plus2 != null);
- var c3 = t3.expressions.get_item (1) as Constant;
+ var c3 = t3.expressions.get_item (1) as MathConstant;
assert (c3 != null);
var t4 = p.expressions.get_item (3) as Term;
assert (t4 != null);
@@ -330,11 +330,11 @@ class Tests {
var t1 = p.expressions.get_item (0) as Term;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
- var c1 = t1.expressions.get_item (0) as Constant;
+ var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var m = t1.expressions.get_item (1) as Multiply;
assert (m != null);
- var c2 = t1.expressions.get_item (2) as Constant;
+ var c2 = t1.expressions.get_item (2) as MathConstant;
assert (c2 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -386,7 +386,7 @@ class Tests {
assert (t1.expressions.get_n_items () == 4);
var minus = t1.expressions.get_item (0) as Minus;
assert (minus != null);
- var c1 = t1.expressions.get_item (1) as Constant;
+ var c1 = t1.expressions.get_item (1) as MathConstant;
assert (c1 != null);
var m1 = t1.expressions.get_item (2) as Multiply;
assert (m1 != null);
@@ -397,7 +397,7 @@ class Tests {
assert (t2.expressions.get_n_items () == 4);
var plus = t2.expressions.get_item (0) as Plus;
assert (plus != null);
- var c3 = t2.expressions.get_item (1) as Constant;
+ var c3 = t2.expressions.get_item (1) as MathConstant;
assert (c3 != null);
var m2 = t2.expressions.get_item (2) as Multiply;
assert (m2 != null);
@@ -423,11 +423,11 @@ class Tests {
var t1 = p.expressions.get_item (0) as Term;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
- var c1 = t1.expressions.get_item (0) as Constant;
+ var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var m = t1.expressions.get_item (1) as Division;
assert (m != null);
- var c2 = t1.expressions.get_item (2) as Constant;
+ var c2 = t1.expressions.get_item (2) as MathConstant;
assert (c2 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -479,7 +479,7 @@ class Tests {
assert (t1.expressions.get_n_items () == 4);
var minus = t1.expressions.get_item (0) as Minus;
assert (minus != null);
- var c1 = t1.expressions.get_item (1) as Constant;
+ var c1 = t1.expressions.get_item (1) as MathConstant;
assert (c1 != null);
var m1 = t1.expressions.get_item (2) as Division;
assert (m1 != null);
@@ -490,7 +490,7 @@ class Tests {
assert (t2.expressions.get_n_items () == 6);
var plus = t2.expressions.get_item (0) as Plus;
assert (plus != null);
- var c3 = t2.expressions.get_item (1) as Constant;
+ var c3 = t2.expressions.get_item (1) as MathConstant;
assert (c3 != null);
var m2 = t2.expressions.get_item (2) as Multiply;
assert (m2 != null);
@@ -498,7 +498,7 @@ class Tests {
assert (c4 != null);
var m3 = t2.expressions.get_item (4) as Division;
assert (m3 != null);
- var c5 = t2.expressions.get_item (5) as Constant;
+ var c5 = t2.expressions.get_item (5) as MathConstant;
assert (c5 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -506,7 +506,7 @@ class Tests {
});
Test.add_func ("/gcalc/parser/constant/to_string",
()=>{
- Constant c = new GConstant.@double (-1.0) as Constant;
+ MathConstant c = new GConstant.@double (-1.0) as MathConstant;
assert ("-1" in c.to_string ());
});
Test.add_func ("/gcalc/parser/term/parenthesis",
@@ -535,7 +535,7 @@ class Tests {
var t1 = p1.expressions.get_item (0) as Term;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
- var c = t1.expressions.get_item (0) as Constant;
+ var c = t1.expressions.get_item (0) as MathConstant;
assert (c != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -595,7 +595,7 @@ class Tests {
var t11 = p1.expressions.get_item (0) as Term;
assert (t11 != null);
assert (t11.expressions.get_n_items () == 1);
- var c1 = t11.expressions.get_item (0) as Constant;
+ var c1 = t11.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var t2 = p.expressions.get_item (1) as Term;
assert (t2 != null);
@@ -612,7 +612,7 @@ class Tests {
var t21 = p1.expressions.get_item (0) as Term;
assert (t21 != null);
assert (t21.expressions.get_n_items () == 1);
- var c2 = t21.expressions.get_item (0) as Constant;
+ var c2 = t21.expressions.get_item (0) as MathConstant;
assert (c2 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -634,7 +634,7 @@ class Tests {
var t1 = p.expressions.get_item (0) as Term;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
- var c1 = t1.expressions.get_item (0) as Constant;
+ var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var m1 = t1.expressions.get_item (1) as Multiply;
assert (m1 != null);
@@ -648,7 +648,7 @@ class Tests {
var tg1 = pg.expressions.get_item (0) as Term;
assert (tg1 != null);
assert (tg1.expressions.get_n_items () == 1);
- var c2 = tg1.expressions.get_item (0) as Constant;
+ var c2 = tg1.expressions.get_item (0) as MathConstant;
assert (c2 != null);
var tg2 = pg.expressions.get_item (1) as Term;
assert (tg2 != null);
@@ -656,7 +656,7 @@ class Tests {
message (tg2.to_string ());
var plus = tg2.expressions.get_item (0) as Plus;
assert (plus != null);
- var c3 = tg2.expressions.get_item (1) as Constant;
+ var c3 = tg2.expressions.get_item (1) as MathConstant;
assert (c3 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -688,7 +688,7 @@ class Tests {
var tg1 = pg.expressions.get_item (0) as Term;
assert (tg1 != null);
assert (tg1.expressions.get_n_items () == 1);
- var c2 = tg1.expressions.get_item (0) as Constant;
+ var c2 = tg1.expressions.get_item (0) as MathConstant;
assert (c2 != null);
var tg2 = pg.expressions.get_item (1) as Term;
assert (tg2 != null);
@@ -696,11 +696,11 @@ class Tests {
message (tg2.to_string ());
var plus = tg2.expressions.get_item (0) as Plus;
assert (plus != null);
- var c3 = tg2.expressions.get_item (1) as Constant;
+ var c3 = tg2.expressions.get_item (1) as MathConstant;
assert (c3 != null);
var m1 = t1.expressions.get_item (1) as Multiply;
assert (m1 != null);
- var c1 = t1.expressions.get_item (2) as Constant;
+ var c1 = t1.expressions.get_item (2) as MathConstant;
assert (c1 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -751,7 +751,7 @@ class Tests {
assert (t1 != null);
message ("Terms: %u", t1.expressions.get_n_items ());
assert (t1.expressions.get_n_items () == 1);
- var c = t1.expressions.get_item (0) as Constant;
+ var c = t1.expressions.get_item (0) as MathConstant;
assert (c != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -773,11 +773,11 @@ class Tests {
var t = p.expressions.get_item (0) as Term;
assert (t != null);
assert (t.expressions.get_n_items () == 3);
- var c1 = t.expressions.get_item (0) as Constant;
+ var c1 = t.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var pw = t.expressions.get_item (1) as Pow;
assert (pw != null);
- var c2 = t.expressions.get_item (2) as Constant;
+ var c2 = t.expressions.get_item (2) as MathConstant;
assert (c2 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -799,7 +799,7 @@ class Tests {
var t = p.expressions.get_item (0) as Term;
assert (t != null);
assert (t.expressions.get_n_items () == 3);
- var c1 = t.expressions.get_item (0) as Constant;
+ var c1 = t.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var pw = t.expressions.get_item (1) as Pow;
assert (pw != null);
@@ -833,7 +833,7 @@ class Tests {
var t = e.expressions.get_item (0) as Term;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -860,11 +860,11 @@ class Tests {
var t1 = e.expressions.get_item (0) as Term;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 5);
- var c1 = t1.expressions.get_item (0) as Constant;
+ var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
var m1 = t1.expressions.get_item (1) as Multiply;
assert (m1 != null);
- var c2 = t1.expressions.get_item (2) as Constant;
+ var c2 = t1.expressions.get_item (2) as MathConstant;
assert (c2 != null);
var m2 = t1.expressions.get_item (3) as Multiply;
assert (m2 != null);
@@ -875,7 +875,7 @@ class Tests {
assert (t2.expressions.get_n_items () == 2);
var pl = t2.expressions.get_item (0) as Plus;
assert (pl != null);
- var c3 = t2.expressions.get_item (1) as Constant;
+ var c3 = t2.expressions.get_item (1) as MathConstant;
assert (c3 != null);
} catch (GLib.Error error) {
warning ("Error: %s", error.message);
@@ -941,7 +941,7 @@ class Tests {
assert (e.expressions.get_n_items () == 1);
var t = e.expressions.get_item (0) as Term;
assert (t != null);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
var eq2 = eqman.equations.get_item (1) as MathEquation;
assert (eq2 != null);
@@ -979,7 +979,7 @@ class Tests {
assert (e.expressions.get_n_items () == 1);
var t = e.expressions.get_item (0) as Term;
assert (t != null);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
var eq2 = eqman.equations.get_item (1) as MathEquation;
assert (eq2 != null);
@@ -1024,7 +1024,7 @@ class Tests {
assert (e.expressions.get_n_items () == 1);
var t = e.expressions.get_item (0) as Term;
assert (t != null);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
var eq2 = eqman.equations.get_item (1) as MathEquation;
assert (eq2 != null);
@@ -1125,8 +1125,8 @@ class Tests {
assert (eq != null);
var r = eq.solve ();
assert (r.expression != null);
- assert (r.expression is Constant);
- var cr = r.expression as Constant;
+ assert (r.expression is MathConstant);
+ var cr = r.expression as MathConstant;
assert (cr != null);
assert (cr.real () == 0.0);
var p = eq.variables.find_named ("param1") as GCalc.Parameter;
@@ -1134,13 +1134,13 @@ class Tests {
p.set_value (10.0);
r = eq.solve ();
assert (r.expression != null);
- assert (r.expression is Constant);
- cr = r.expression as Constant;
+ assert (r.expression is MathConstant);
+ cr = r.expression as MathConstant;
assert (cr != null);
assert (cr.real () == 10.0);
var eq2 = eqman.equations.get_item (1) as MathEquation;
assert (eq2 != null);
- var cr2 = r.expression as Constant;
+ var cr2 = r.expression as MathConstant;
assert (cr2 != null);
assert (cr2.real () == 10.0);
} catch (GLib.Error error) {
diff --git a/tests/gcalc-solving-basic.vala b/tests/gcalc-solving-basic.vala
index d8d66591..58339089 100644
--- a/tests/gcalc-solving-basic.vala
+++ b/tests/gcalc-solving-basic.vala
@@ -89,14 +89,14 @@ class Tests {
assert (e != null);
var t = e.expressions.get_item (0) as Term;
assert (t != null);
- var c = t.expressions.get_item (0) as Constant;
+ var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
var res = c.solve ();
assert (res != null);
assert (res.expression != null);
- var rc = res.expression as Constant;
+ var rc = res.expression as MathConstant;
assert (rc != null);
- message ("Constant Result: %s", rc.to_string ());
+ message ("MathConstant Result: %s", rc.to_string ());
assert (rc.real () == 1.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -119,9 +119,9 @@ class Tests {
assert (res.expression != null);
message ("Result type: %s", res.expression.get_type ().name ());
assert (!(res is ErrorResult));
- var rc = res.expression as Constant;
+ var rc = res.expression as MathConstant;
assert (rc != null);
- message ("Constant Result: %s", rc.to_string ());
+ message ("MathConstant Result: %s", rc.to_string ());
assert (rc.real () == 1.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -144,9 +144,9 @@ class Tests {
assert (res.expression != null);
message ("Result type: %s", res.expression.get_type ().name ());
assert (!(res is ErrorResult));
- var rc = res.expression as Constant;
+ var rc = res.expression as MathConstant;
assert (rc != null);
- message ("Constant Result: %s", rc.to_string ());
+ message ("MathConstant Result: %s", rc.to_string ());
assert (rc.real () == 15.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -169,9 +169,9 @@ class Tests {
assert (res.expression != null);
message ("Result type: %s", res.expression.get_type ().name ());
assert (!(res is ErrorResult));
- var rc = res.expression as Constant;
+ var rc = res.expression as MathConstant;
assert (rc != null);
- message ("Constant Result: %s", rc.to_string ());
+ message ("MathConstant Result: %s", rc.to_string ());
assert (rc.real () == 5.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -193,7 +193,7 @@ class Tests {
var res = t1.add (t2);
assert (res != null);
message (res.get_type ().name ());
- var c = res as Constant;
+ var c = res as MathConstant;
assert (c != null);
message (c.to_string ());
assert (c.real () == 2.0);
@@ -215,7 +215,7 @@ class Tests {
var res = e.evaluate ();
assert (res != null);
message (res.get_type ().name ());
- var c = res as Constant;
+ var c = res as MathConstant;
assert (c != null);
message (c.to_string ());
assert (c.real () == -2.0);
@@ -237,7 +237,7 @@ class Tests {
var res = e.evaluate ();
assert (res != null);
message (res.get_type ().name ());
- var c = res as Constant;
+ var c = res as MathConstant;
assert (c != null);
message (c.to_string ());
assert (c.real () == 7.0);
@@ -260,9 +260,9 @@ class Tests {
assert (t != null);
var g = t.expressions.get_item (0) as Group;
assert (g != null);
- var res = g.evaluate () as Constant;
+ var res = g.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 1.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -279,9 +279,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 1.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -298,9 +298,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 5.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -317,9 +317,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 6.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -340,9 +340,9 @@ class Tests {
assert (t != null);
var g = t.expressions.get_item (0) as Group;
assert (g != null);
- var res = g.evaluate () as Constant;
+ var res = g.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 3.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -363,9 +363,9 @@ class Tests {
assert (t != null);
var g = t.expressions.get_item (0) as Group;
assert (g != null);
- var res = g.evaluate () as Constant;
+ var res = g.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 14.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -382,9 +382,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 5.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -401,9 +401,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 25.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -420,9 +420,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 26.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -439,9 +439,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 25.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -458,9 +458,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == -103.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -472,7 +472,7 @@ class Tests {
var c1 = new GConstant.@double (9.0);
var f = new GFunctionSqrt ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 3.0);
@@ -486,7 +486,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionExp ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 1.0);
@@ -500,7 +500,7 @@ class Tests {
var c1 = new GConstant.@double (1.0);
var f = new GFunctionLog ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -514,7 +514,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionSin ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -528,7 +528,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionCos ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 1.0);
@@ -542,7 +542,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionTan ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -556,7 +556,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionAsin ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -570,7 +570,7 @@ class Tests {
var c1 = new GConstant.@double (1.0);
var f = new GFunctionAcos ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -584,7 +584,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionAtan ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -598,7 +598,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionSinh ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -612,7 +612,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionCosh ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 1.0);
@@ -626,7 +626,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionTanh ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -640,7 +640,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionAsinh ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -654,7 +654,7 @@ class Tests {
var c1 = new GConstant.@double (1.0);
var f = new GFunctionAcosh ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -668,7 +668,7 @@ class Tests {
var c1 = new GConstant.@double (0.0);
var f = new GFunctionAtanh ();
f.expressions.add (c1);
- var c2 = f.evaluate () as Constant;
+ var c2 = f.evaluate () as MathConstant;
assert (c2 != null);
message (c2.to_string ());
assert (c2.real () == 0.0);
@@ -692,9 +692,9 @@ class Tests {
var f = t.expressions.get_item (0) as Function;
assert (f != null);
assert (f.closed);
- var res = f.evaluate () as Constant;
+ var res = f.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 0.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -711,9 +711,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 0.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -730,9 +730,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 3.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -749,9 +749,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 3.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -768,9 +768,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 3.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -787,9 +787,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 1.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -806,9 +806,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 5.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -825,9 +825,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 5.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -844,9 +844,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 1.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -863,9 +863,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 2.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -882,9 +882,9 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 3.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -902,9 +902,9 @@ class Tests {
message ("Equation: %s", eq.to_string ());
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == -7.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -922,9 +922,9 @@ class Tests {
message ("Equation: %s", eq.to_string ());
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 1.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -942,9 +942,9 @@ class Tests {
message ("Equation: %s", eq.to_string ());
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 23.5);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -962,9 +962,9 @@ class Tests {
message ("Equation: %s", eq.to_string ());
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 27.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -982,9 +982,9 @@ class Tests {
message ("Equation: %s", eq.to_string ());
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 256.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -1002,9 +1002,9 @@ class Tests {
message ("Equation: %s", eq.to_string ());
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 256.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -1022,9 +1022,9 @@ class Tests {
message ("Equation: %s", eq.to_string ());
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var res = e.evaluate () as Constant;
+ var res = e.evaluate () as MathConstant;
assert (res != null);
- message ("Constant Result: %s", res.to_string ());
+ message ("MathConstant Result: %s", res.to_string ());
assert (res.real () == 28.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -1041,16 +1041,16 @@ class Tests {
assert (eq != null);
var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
- var res1 = a.evaluate () as Constant;
+ var res1 = a.evaluate () as MathConstant;
assert (res1 != null);
- message ("Constant Result: %s", res1.to_string ());
+ message ("MathConstant Result: %s", res1.to_string ());
assert (res1.real () == 3.0);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
assert (v != null);
- var res2 = v.evaluate () as Constant;
+ var res2 = v.evaluate () as MathConstant;
assert (res2 != null);
- message ("Constant Result: %s", res2.to_string ());
+ message ("MathConstant Result: %s", res2.to_string ());
assert (res2.real () == 3.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -1067,16 +1067,16 @@ class Tests {
assert (eq != null);
var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
- var res1 = a.evaluate () as Constant;
+ var res1 = a.evaluate () as MathConstant;
assert (res1 != null);
- message ("Constant Result: %s", res1.to_string ());
+ message ("MathConstant Result: %s", res1.to_string ());
assert (res1.real () == 48.0);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
assert (v != null);
- var res2 = v.evaluate () as Constant;
+ var res2 = v.evaluate () as MathConstant;
assert (res2 != null);
- message ("Constant Result: %s", res2.to_string ());
+ message ("MathConstant Result: %s", res2.to_string ());
assert (res2.real () == 48.0);
} catch (GLib.Error e) {
warning ("Error: %s", e.message);
@@ -1096,9 +1096,9 @@ class Tests {
warning ("Error: %s", (res as ErrorResult).message);
}
assert (res.expression != null);
- assert (res.expression is Constant);
+ assert (res.expression is MathConstant);
message ("Result: %s", res.expression.to_string ());
- var c = res.expression as Constant;
+ var c = res.expression as MathConstant;
assert (c != null);
assert (c.real () == 3.0);
} catch (GLib.Error e) {
@@ -1120,9 +1120,9 @@ class Tests {
warning ("Error: %s", (res as ErrorResult).message);
}
assert (res.expression != null);
- assert (res.expression is Constant);
+ assert (res.expression is MathConstant);
message ("Result: %s", res.expression.to_string ());
- var c = res.expression as Constant;
+ var c = res.expression as MathConstant;
assert (c != null);
assert (c.real () == 3.0);
var eq2 = eqman.equations.get_item (0) as MathEquation;
@@ -1132,9 +1132,9 @@ class Tests {
warning ("Error: %s", (res2 as ErrorResult).message);
}
assert (res2.expression != null);
- assert (res2.expression is Constant);
+ assert (res2.expression is MathConstant);
message ("Result: %s", res2.expression.to_string ());
- var c2 = res2.expression as Constant;
+ var c2 = res2.expression as MathConstant;
assert (c2 != null);
assert (c2.real () == 3.0);
} catch (GLib.Error e) {
@@ -1156,9 +1156,9 @@ class Tests {
warning ("Error: %s", (res as ErrorResult).message);
}
assert (res.expression != null);
- assert (res.expression is Constant);
+ assert (res.expression is MathConstant);
message ("Result: %s", res.expression.to_string ());
- var c = res.expression as Constant;
+ var c = res.expression as MathConstant;
assert (c != null);
assert (c.real () == 3.0);
var eq2 = eqman.equations.get_item (0) as MathEquation;
@@ -1168,9 +1168,9 @@ class Tests {
warning ("Error: %s", (res2 as ErrorResult).message);
}
assert (res2.expression != null);
- assert (res2.expression is Constant);
+ assert (res2.expression is MathConstant);
message ("Result: %s", res2.expression.to_string ());
- var c2 = res2.expression as Constant;
+ var c2 = res2.expression as MathConstant;
assert (c2 != null);
assert (c2.real () == 3.0);
} catch (GLib.Error e) {
@@ -1193,9 +1193,9 @@ class Tests {
warning ("Error: %s", (res as ErrorResult).message);
}
assert (res.expression != null);
- assert (res.expression is Constant);
+ assert (res.expression is MathConstant);
message ("Result: %s", res.expression.to_string ());
- var c = res.expression as Constant;
+ var c = res.expression as MathConstant;
assert (c != null);
assert (c.real () == 3.0);
var eq2 = eqman.equations.get_item (0) as MathEquation;
@@ -1205,9 +1205,9 @@ class Tests {
warning ("Error: %s", (res2 as ErrorResult).message);
}
assert (res2.expression != null);
- assert (res2.expression is Constant);
+ assert (res2.expression is MathConstant);
message ("Result: %s", res2.expression.to_string ());
- var c2 = res2.expression as Constant;
+ var c2 = res2.expression as MathConstant;
assert (c2 != null);
assert (c2.real () == 3.0);
var eq3 = eqman.equations.get_item (2) as MathEquation;
@@ -1219,9 +1219,9 @@ class Tests {
}
assert (res3.expression != null);
message ("Result Type: %s", res3.expression.get_type ().name ());
- assert (res3.expression is Constant);
+ assert (res3.expression is MathConstant);
message ("Result: %s", res3.expression.to_string ());
- var c3 = res3.expression as Constant;
+ var c3 = res3.expression as MathConstant;
assert (c3 != null);
assert (c3.real () == 6.0);
} catch (GLib.Error e) {
@@ -1244,9 +1244,9 @@ class Tests {
warning ("Error: %s", (res as ErrorResult).message);
}
assert (res.expression != null);
- assert (res.expression is Constant);
+ assert (res.expression is MathConstant);
message ("Result: %s", res.expression.to_string ());
- var c = res.expression as Constant;
+ var c = res.expression as MathConstant;
assert (c != null);
assert (c.real () == 3.0);
var eq2 = eqman.equations.get_item (0) as MathEquation;
@@ -1256,9 +1256,9 @@ class Tests {
warning ("Error: %s", (res2 as ErrorResult).message);
}
assert (res2.expression != null);
- assert (res2.expression is Constant);
+ assert (res2.expression is MathConstant);
message ("Result: %s", res2.expression.to_string ());
- var c2 = res2.expression as Constant;
+ var c2 = res2.expression as MathConstant;
assert (c2 != null);
assert (c2.real () == 3.0);
var eq3 = eqman.equations.get_item (2) as MathEquation;
@@ -1270,9 +1270,9 @@ class Tests {
}
assert (res3.expression != null);
message ("Result Type: %s", res3.expression.get_type ().name ());
- assert (res3.expression is Constant);
+ assert (res3.expression is MathConstant);
message ("Result: %s", res3.expression.to_string ());
- var c3 = res3.expression as Constant;
+ var c3 = res3.expression as MathConstant;
assert (c3 != null);
assert (c3.real () == 30.0);
} catch (GLib.Error e) {
@@ -1295,9 +1295,9 @@ class Tests {
warning ("Error: %s", (res as ErrorResult).message);
}
assert (res.expression != null);
- assert (res.expression is Constant);
+ assert (res.expression is MathConstant);
message ("Result: %s", res.expression.to_string ());
- var c = res.expression as Constant;
+ var c = res.expression as MathConstant;
assert (c != null);
assert (c.real () == 3.0);
var eq2 = eqman.equations.get_item (0) as MathEquation;
@@ -1307,9 +1307,9 @@ class Tests {
warning ("Error: %s", (res2 as ErrorResult).message);
}
assert (res2.expression != null);
- assert (res2.expression is Constant);
+ assert (res2.expression is MathConstant);
message ("Result: %s", res2.expression.to_string ());
- var c2 = res2.expression as Constant;
+ var c2 = res2.expression as MathConstant;
assert (c2 != null);
assert (c2.real () == 3.0);
var eq3 = eqman.equations.get_item (2) as MathEquation;
@@ -1321,9 +1321,9 @@ class Tests {
}
assert (res3.expression != null);
message ("Result Type: %s", res3.expression.get_type ().name ());
- assert (res3.expression is Constant);
+ assert (res3.expression is MathConstant);
message ("Result: %s", res3.expression.to_string ());
- var c3 = res3.expression as Constant;
+ var c3 = res3.expression as MathConstant;
assert (c3 != null);
assert (c3.real () == 31.5);
} catch (GLib.Error e) {
@@ -1347,9 +1347,9 @@ class Tests {
warning ("Error: %s", (res as ErrorResult).message);
}
assert (res.expression != null);
- assert (res.expression is Constant);
+ assert (res.expression is MathConstant);
message ("Result: %s", res.expression.to_string ());
- var c = res.expression as Constant;
+ var c = res.expression as MathConstant;
assert (c != null);
assert (c.real () == 3.0);
var eq2 = eqman.equations.get_item (0) as MathEquation;
@@ -1359,9 +1359,9 @@ class Tests {
warning ("Error: %s", (res2 as ErrorResult).message);
}
assert (res2.expression != null);
- assert (res2.expression is Constant);
+ assert (res2.expression is MathConstant);
message ("Result: %s", res2.expression.to_string ());
- var c2 = res2.expression as Constant;
+ var c2 = res2.expression as MathConstant;
assert (c2 != null);
assert (c2.real () == 3.0);
var eq3 = eqman.equations.get_item (2) as MathEquation;
@@ -1373,9 +1373,9 @@ class Tests {
}
assert (res3.expression != null);
message ("Result Type: %s", res3.expression.get_type ().name ());
- assert (res3.expression is Constant);
+ assert (res3.expression is MathConstant);
message ("Result: %s", res3.expression.to_string ());
- var c3 = res3.expression as Constant;
+ var c3 = res3.expression as MathConstant;
assert (c3 != null);
assert (c3.real () == 31.5);
var eq4 = eqman.equations.get_item (3) as MathEquation;
@@ -1387,9 +1387,9 @@ class Tests {
}
assert (res4.expression != null);
message ("Result Type: %s", res4.expression.get_type ().name ());
- assert (res4.expression is Constant);
+ assert (res4.expression is MathConstant);
message ("Result: %s", res4.expression.to_string ());
- var c4 = res4.expression as Constant;
+ var c4 = res4.expression as MathConstant;
assert (c4 != null);
assert (c4.real () == 8.16);
} catch (GLib.Error e) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
