[gnome-calculator] GCalc: renamed Term to MathTerm
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] GCalc: renamed Term to MathTerm
- Date: Thu, 17 Oct 2019 19:09:53 +0000 (UTC)
commit 65302f8d31162c773291271691ff411840297fb3
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Oct 17 12:46:34 2019 -0500
GCalc: renamed Term to MathTerm
gcalc/gcalc-gterm.vala | 2 +-
gcalc/gcalc-math-polynomial.vala | 10 +--
gcalc/{gcalc-term.vala => gcalc-math-term.vala} | 6 +-
gcalc/gcalc-parser.vala | 26 +++---
gcalc/meson.build | 2 +-
tests/gcalc-parsing.vala | 112 ++++++++++++------------
tests/gcalc-solving-basic.vala | 20 ++---
7 files changed, 89 insertions(+), 89 deletions(-)
---
diff --git a/gcalc/gcalc-gterm.vala b/gcalc/gcalc-gterm.vala
index ef113f31..59dc77e0 100644
--- a/gcalc/gcalc-gterm.vala
+++ b/gcalc/gcalc-gterm.vala
@@ -18,7 +18,7 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GCalc.GTerm : Expression, Term {
+public class GCalc.GTerm : Expression, MathTerm {
internal override MathResult solve () {
MathResult res = null;
try {
diff --git a/gcalc/gcalc-math-polynomial.vala b/gcalc/gcalc-math-polynomial.vala
index 7b232be1..6cd742f6 100644
--- a/gcalc/gcalc-math-polynomial.vala
+++ b/gcalc/gcalc-math-polynomial.vala
@@ -23,19 +23,19 @@
*/
public interface GCalc.MathPolynomial : Object, MathExpression {
public virtual MathExpression evaluate () throws GLib.Error {
- Term current = null;
+ MathTerm current = null;
MathExpression res = null;
for (uint i = 0; i < expressions.get_n_items (); i++) {
- var e = expressions.get_item (i) as Term;
+ var e = expressions.get_item (i) as MathTerm;
if (e == null) {
continue;
}
if (current == null) {
- current = (Term) e;
+ current = (MathTerm) e;
if (i+1 < expressions.get_n_items ()) {
continue;
}
- var er = ((Term) e).evaluate ();
+ var er = ((MathTerm) e).evaluate ();
if (res == null) {
res = er;
break;
@@ -45,7 +45,7 @@ public interface GCalc.MathPolynomial : Object, MathExpression {
break;
}
}
- var re = current.add ((Term) e);
+ var re = current.add ((MathTerm) e);
current = null;
if (res == null) {
res = re;
diff --git a/gcalc/gcalc-term.vala b/gcalc/gcalc-math-term.vala
similarity index 96%
rename from gcalc/gcalc-term.vala
rename to gcalc/gcalc-math-term.vala
index ae5c2b44..d742d68f 100644
--- a/gcalc/gcalc-term.vala
+++ b/gcalc/gcalc-math-term.vala
@@ -1,4 +1,4 @@
-/* gcalc-term.vala
+/* gcalc-math-term.vala
*
* Copyright (C) 2018 Daniel Espinosa <esodan gmail com>
*
@@ -18,8 +18,8 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public interface GCalc.Term : Object, MathExpression {
- public virtual MathExpression add (Term t) throws GLib.Error {
+public interface GCalc.MathTerm : Object, MathExpression {
+ public virtual MathExpression add (MathTerm t) throws GLib.Error {
if (t.expressions.get_n_items () == 0) {
return new Constant.@double (1.0);
}
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-parser.vala
index 90e48c99..f44a9e3d 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-parser.vala
@@ -82,11 +82,11 @@ public class GCalc.Parser : Object {
top_parent = exp;
expected.clear ();
expected.add(TokenType.OPEN_PARENS);
- } else if (current is MathOperator && current_parent is Term && top_parent is MathPolynomial) {
+ } else if (current is MathOperator && current_parent is MathTerm && top_parent is
MathPolynomial) {
current_parent.expressions.add (sfunc);
current = sfunc;
expected.clear ();
- } else if (current is Term && current_parent is MathPolynomial) {
+ } else if (current is MathTerm && current_parent is MathPolynomial) {
current.expressions.add (sfunc);
current_parent = current;
current = sfunc;
@@ -124,11 +124,11 @@ public class GCalc.Parser : Object {
current_parent = v.parent;
top_parent = current_parent.parent;
expected.clear ();
- } else if (current is MathOperator && current_parent is Term && top_parent is MathPolynomial) {
+ } else if (current is MathOperator && current_parent is MathTerm && top_parent is
MathPolynomial) {
current_parent.expressions.add (v);
current = v;
expected.clear ();
- } else if (current is Term) {
+ } else if (current is MathTerm) {
current.expressions.add (v);
current = v;
current_parent = v.parent;
@@ -153,11 +153,11 @@ public class GCalc.Parser : Object {
current = cexp;
current_parent = t;
top_parent = exp;
- } else if ((current is MathOperator || current is Term) && current_parent is Term && top_parent is
MathPolynomial) {
+ } else if ((current is MathOperator || current is MathTerm) && current_parent is MathTerm &&
top_parent is MathPolynomial) {
current_parent.expressions.add (cexp);
expected.clear ();
current = cexp;
- } else if (current is Term && current_parent is MathPolynomial && (top_parent is MathGroup ||
top_parent is MathFunction)) {
+ } else if (current is MathTerm && current_parent is MathPolynomial && (top_parent is MathGroup ||
top_parent is MathFunction)) {
current.expressions.add (cexp);
top_parent = current_parent;
current_parent = current;
@@ -189,7 +189,7 @@ public class GCalc.Parser : Object {
} else if (current is Variable) {
bool removed = false;
if (current.parent != null) {
- if (current.parent is Term) {
+ if (current.parent is MathTerm) {
var t = current.parent;
if (t.parent != null) {
if (t.parent is MathPolynomial) {
@@ -245,7 +245,7 @@ public class GCalc.Parser : Object {
current = t;
current_parent = fexp;
expected.clear ();
- } else if (current is MathOperator && current_parent is Term && top_parent is MathPolynomial) {
+ } else if (current is MathOperator && current_parent is MathTerm && top_parent is MathPolynomial) {
var g = new Group ();
current_parent.expressions.add (g);
var exp = new Polynomial ();
@@ -282,7 +282,7 @@ public class GCalc.Parser : Object {
}
if (foundp) {
current = par;
- current_parent = par.parent; // Term
+ current_parent = par.parent; // MathTerm
top_parent = current_parent.parent;
}
break;
@@ -348,14 +348,14 @@ public class GCalc.Parser : Object {
top_parent = exp;
eq.expressions.add (exp);
expected.clear ();
- } else if (current_parent is MathPolynomial && current is Term) {
+ } else if (current_parent is MathPolynomial && current is MathTerm) {
current.expressions.add (opp);
top_parent = current_parent;
current_parent = current;
current = opp;
expected.clear ();
} else if ((current is MathConstant || current is Variable)
- && current_parent is Term && top_parent is MathPolynomial) {
+ && current_parent is MathTerm && top_parent is MathPolynomial) {
// New term
var t = new GTerm ();
t.expressions.add (opp);
@@ -363,7 +363,7 @@ public class GCalc.Parser : Object {
current = opp;
current_parent = t;
expected.clear ();
- } else if ((current is MathGroup || current is MathFunction) && current_parent is Term && top_parent is
MathPolynomial) {
+ } else if ((current is MathGroup || current is MathFunction) && current_parent is MathTerm && top_parent
is MathPolynomial) {
// New term
var t = new GTerm ();
t.expressions.add (opp);
@@ -393,7 +393,7 @@ public class GCalc.Parser : Object {
throw new ParserError.INVALID_TOKEN_ERROR ("Found an unexpected expression for a multiply operator");
}
if ((current is MathConstant || current is Variable || current is MathGroup || current is MathFunction)
- && current_parent is Term && top_parent is MathPolynomial) {
+ && current_parent is MathTerm && top_parent is MathPolynomial) {
current_parent.expressions.add (op);
current = op;
expected.clear ();
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 43c31d7d..232566d5 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -104,6 +104,7 @@ gcalc_sources = files([
'gcalc-math-pow.vala',
'gcalc-math-result.vala',
'gcalc-math-solver.vala',
+ 'gcalc-math-term.vala',
'gcalc-minus.vala',
'gcalc-multiply.vala',
'gcalc-parameter.vala',
@@ -113,7 +114,6 @@ gcalc_sources = files([
'gcalc-pow.vala',
'gcalc-result.vala',
'gcalc-solver.vala',
- 'gcalc-term.vala',
'gcalc-variable.vala',
])
diff --git a/tests/gcalc-parsing.vala b/tests/gcalc-parsing.vala
index 4a55c164..d4027167 100644
--- a/tests/gcalc-parsing.vala
+++ b/tests/gcalc-parsing.vala
@@ -36,7 +36,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t = p.expressions.get_item (0) as Term;
+ var t = p.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
var c = t.expressions.get_item (0) as MathConstant;
@@ -58,7 +58,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t = p.expressions.get_item (0) as Term;
+ var t = p.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
var c = t.expressions.get_item (0) as MathConstant;
@@ -97,7 +97,7 @@ class Tests {
var p = assign.expressions.get_item (1) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t = p.expressions.get_item (0) as Term;
+ var t = p.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
var c = t.expressions.get_item (0) as MathConstant;
@@ -119,12 +119,12 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 2);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as MathPlus;
@@ -148,12 +148,12 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 2);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
var c1 = t1.expressions.get_item (0) as Variable;
assert (c1 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as MathPlus;
@@ -177,12 +177,12 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 2);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
var c1 = t1.expressions.get_item (0) as Variable;
assert (c1 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as MathPlus;
@@ -206,12 +206,12 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 2);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as MathPlus;
@@ -236,28 +236,28 @@ class Tests {
assert (p != null);
message ("Terms: %u", p.expressions.get_n_items ());
assert (p.expressions.get_n_items () == 4);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 2);
var minus = t1.expressions.get_item (0) as MathMinus;
assert (minus != null);
var c1 = t1.expressions.get_item (1) as MathConstant;
assert (c1 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as MathPlus;
assert (plus != null);
var c2 = t2.expressions.get_item (1) as Variable;
assert (c2 != null);
- var t3 = p.expressions.get_item (2) as Term;
+ var t3 = p.expressions.get_item (2) as MathTerm;
assert (t3 != null);
assert (t3.expressions.get_n_items () == 2);
var plus2 = t3.expressions.get_item (0) as MathPlus;
assert (plus2 != null);
var c3 = t3.expressions.get_item (1) as MathConstant;
assert (c3 != null);
- var t4 = p.expressions.get_item (3) as Term;
+ var t4 = p.expressions.get_item (3) as MathTerm;
assert (t4 != null);
assert (t4.expressions.get_n_items () == 2);
var plus3 = t4.expressions.get_item (0) as MathPlus;
@@ -282,28 +282,28 @@ class Tests {
assert (p != null);
message ("Terms: %u", p.expressions.get_n_items ());
assert (p.expressions.get_n_items () == 4);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 2);
var minus = t1.expressions.get_item (0) as MathMinus;
assert (minus != null);
var c1 = t1.expressions.get_item (1) as MathConstant;
assert (c1 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as MathPlus;
assert (plus != null);
var c2 = t2.expressions.get_item (1) as Variable;
assert (c2 != null);
- var t3 = p.expressions.get_item (2) as Term;
+ var t3 = p.expressions.get_item (2) as MathTerm;
assert (t3 != null);
assert (t3.expressions.get_n_items () == 2);
var plus2 = t3.expressions.get_item (0) as MathPlus;
assert (plus2 != null);
var c3 = t3.expressions.get_item (1) as MathConstant;
assert (c3 != null);
- var t4 = p.expressions.get_item (3) as Term;
+ var t4 = p.expressions.get_item (3) as MathTerm;
assert (t4 != null);
assert (t4.expressions.get_n_items () == 2);
var minus2 = t4.expressions.get_item (0) as MathMinus;
@@ -327,7 +327,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
var c1 = t1.expressions.get_item (0) as MathConstant;
@@ -354,7 +354,7 @@ class Tests {
assert (p != null);
message ("Terms: %u", p.expressions.get_n_items ());
assert (p.expressions.get_n_items () == 1);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
var c1 = t1.expressions.get_item (0) as Variable;
@@ -381,7 +381,7 @@ class Tests {
assert (p != null);
message ("Terms: %u", p.expressions.get_n_items ());
assert (p.expressions.get_n_items () == 2);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 4);
var minus = t1.expressions.get_item (0) as MathMinus;
@@ -392,7 +392,7 @@ class Tests {
assert (m1 != null);
var c2 = t1.expressions.get_item (3) as Variable;
assert (c2 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 4);
var plus = t2.expressions.get_item (0) as MathPlus;
@@ -420,7 +420,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
var c1 = t1.expressions.get_item (0) as MathConstant;
@@ -447,7 +447,7 @@ class Tests {
assert (p != null);
message ("Terms: %u", p.expressions.get_n_items ());
assert (p.expressions.get_n_items () == 1);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
var c1 = t1.expressions.get_item (0) as Variable;
@@ -474,7 +474,7 @@ class Tests {
assert (p != null);
message ("Terms: %u", p.expressions.get_n_items ());
assert (p.expressions.get_n_items () == 2);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 4);
var minus = t1.expressions.get_item (0) as MathMinus;
@@ -485,7 +485,7 @@ class Tests {
assert (m1 != null);
var c2 = t1.expressions.get_item (3) as Variable;
assert (c2 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 6);
var plus = t2.expressions.get_item (0) as MathPlus;
@@ -522,7 +522,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t = p.expressions.get_item (0) as Term;
+ var t = p.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
var g = t.expressions.get_item (0) as MathGroup;
@@ -532,7 +532,7 @@ class Tests {
var p1 = g.expressions.get_item (0) as MathPolynomial;
assert (p1 != null);
assert (p1.expressions.get_n_items () == 1);
- var t1 = p1.expressions.get_item (0) as Term;
+ var t1 = p1.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
var c = t1.expressions.get_item (0) as MathConstant;
@@ -582,7 +582,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 2);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 1);
var g1 = t1.expressions.get_item (0) as MathGroup;
@@ -592,12 +592,12 @@ class Tests {
var p1 = g1.expressions.get_item (0) as MathPolynomial;
assert (p1 != null);
assert (p1.expressions.get_n_items () == 1);
- var t11 = p1.expressions.get_item (0) as Term;
+ var t11 = p1.expressions.get_item (0) as MathTerm;
assert (t11 != null);
assert (t11.expressions.get_n_items () == 1);
var c1 = t11.expressions.get_item (0) as MathConstant;
assert (c1 != null);
- var t2 = p.expressions.get_item (1) as Term;
+ var t2 = p.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var plus = t2.expressions.get_item (0) as MathPlus;
@@ -609,7 +609,7 @@ class Tests {
var p2 = g2.expressions.get_item (0) as MathPolynomial;
assert (p2 != null);
assert (p2.expressions.get_n_items () == 1);
- var t21 = p1.expressions.get_item (0) as Term;
+ var t21 = p1.expressions.get_item (0) as MathTerm;
assert (t21 != null);
assert (t21.expressions.get_n_items () == 1);
var c2 = t21.expressions.get_item (0) as MathConstant;
@@ -631,7 +631,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
var c1 = t1.expressions.get_item (0) as MathConstant;
@@ -645,12 +645,12 @@ class Tests {
var pg = g.expressions.get_item (0) as MathPolynomial;
assert (pg != null);
assert (pg.expressions.get_n_items () == 2);
- var tg1 = pg.expressions.get_item (0) as Term;
+ var tg1 = pg.expressions.get_item (0) as MathTerm;
assert (tg1 != null);
assert (tg1.expressions.get_n_items () == 1);
var c2 = tg1.expressions.get_item (0) as MathConstant;
assert (c2 != null);
- var tg2 = pg.expressions.get_item (1) as Term;
+ var tg2 = pg.expressions.get_item (1) as MathTerm;
assert (tg2 != null);
assert (tg2.expressions.get_n_items () == 2);
message (tg2.to_string ());
@@ -675,7 +675,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t1 = p.expressions.get_item (0) as Term;
+ var t1 = p.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 3);
var g = t1.expressions.get_item (0) as MathGroup;
@@ -685,12 +685,12 @@ class Tests {
var pg = g.expressions.get_item (0) as MathPolynomial;
assert (pg != null);
assert (pg.expressions.get_n_items () == 2);
- var tg1 = pg.expressions.get_item (0) as Term;
+ var tg1 = pg.expressions.get_item (0) as MathTerm;
assert (tg1 != null);
assert (tg1.expressions.get_n_items () == 1);
var c2 = tg1.expressions.get_item (0) as MathConstant;
assert (c2 != null);
- var tg2 = pg.expressions.get_item (1) as Term;
+ var tg2 = pg.expressions.get_item (1) as MathTerm;
assert (tg2 != null);
assert (tg2.expressions.get_n_items () == 2);
message (tg2.to_string ());
@@ -739,7 +739,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t = p.expressions.get_item (0) as Term;
+ var t = p.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
var f = t.expressions.get_item (0) as MathFunction;
@@ -747,7 +747,7 @@ class Tests {
assert (f.expressions.get_n_items () == 1);
var p1 = f.expressions.get_item (0) as MathPolynomial;
assert (p1 != null);
- var t1 =p1.expressions.get_item (0) as Term;
+ var t1 =p1.expressions.get_item (0) as MathTerm;
assert (t1 != null);
message ("Terms: %u", t1.expressions.get_n_items ());
assert (t1.expressions.get_n_items () == 1);
@@ -770,7 +770,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t = p.expressions.get_item (0) as Term;
+ var t = p.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 3);
var c1 = t.expressions.get_item (0) as MathConstant;
@@ -796,7 +796,7 @@ class Tests {
var p = eq.expressions.get_item (0) as MathPolynomial;
assert (p != null);
assert (p.expressions.get_n_items () == 1);
- var t = p.expressions.get_item (0) as Term;
+ var t = p.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 3);
var c1 = t.expressions.get_item (0) as MathConstant;
@@ -830,7 +830,7 @@ class Tests {
var e = a.expressions.get_item (1) as MathPolynomial;
assert (e != null);
assert (e.expressions.get_n_items () == 1);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
assert (t.expressions.get_n_items () == 1);
var c = t.expressions.get_item (0) as MathConstant;
@@ -857,7 +857,7 @@ class Tests {
var e = a.expressions.get_item (1) as MathPolynomial;
assert (e != null);
assert (e.expressions.get_n_items () == 2);
- var t1 = e.expressions.get_item (0) as Term;
+ var t1 = e.expressions.get_item (0) as MathTerm;
assert (t1 != null);
assert (t1.expressions.get_n_items () == 5);
var c1 = t1.expressions.get_item (0) as MathConstant;
@@ -870,7 +870,7 @@ class Tests {
assert (m2 != null);
var f1 = t1.expressions.get_item (4) as MathFunction;
assert (f1 != null);
- var t2 = e.expressions.get_item (1) as Term;
+ var t2 = e.expressions.get_item (1) as MathTerm;
assert (t2 != null);
assert (t2.expressions.get_n_items () == 2);
var pl = t2.expressions.get_item (0) as MathPlus;
@@ -939,7 +939,7 @@ class Tests {
var e = a.expressions.get_item (1) as MathPolynomial;
assert (e != null);
assert (e.expressions.get_n_items () == 1);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
@@ -950,7 +950,7 @@ class Tests {
var e2 = eq2.expressions.get_item (0) as MathPolynomial;
assert (e2 != null);
assert (e2.expressions.get_n_items () == 1);
- var t2 = e2.expressions.get_item (0) as Term;
+ var t2 = e2.expressions.get_item (0) as MathTerm;
assert (t2 != null);
var v2 = t2.expressions.get_item (0) as Variable;
assert (v2 != null);
@@ -977,7 +977,7 @@ class Tests {
var e = a.expressions.get_item (1) as MathPolynomial;
assert (e != null);
assert (e.expressions.get_n_items () == 1);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
@@ -993,7 +993,7 @@ class Tests {
var e2 = a2.expressions.get_item (1) as MathPolynomial;
assert (e2 != null);
assert (e2.expressions.get_n_items () == 1);
- var t2 = e2.expressions.get_item (0) as Term;
+ var t2 = e2.expressions.get_item (0) as MathTerm;
assert (t2 != null);
var v3 = t2.expressions.get_item (0) as Variable;
assert (v3 != null);
@@ -1022,7 +1022,7 @@ class Tests {
var e = a.expressions.get_item (1) as MathPolynomial;
assert (e != null);
assert (e.expressions.get_n_items () == 1);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
@@ -1038,7 +1038,7 @@ class Tests {
var e2 = a2.expressions.get_item (1) as MathPolynomial;
assert (e2 != null);
assert (e2.expressions.get_n_items () == 1);
- var t2 = e2.expressions.get_item (0) as Term;
+ var t2 = e2.expressions.get_item (0) as MathTerm;
assert (t2 != null);
var v3 = t2.expressions.get_item (0) as Variable;
assert (v3 != null);
@@ -1055,12 +1055,12 @@ class Tests {
assert (e3 != null);
message ("Termns in Polynomial3: %u", e3.expressions.get_n_items ());
assert (e3.expressions.get_n_items () == 2);
- var t3 = e3.expressions.get_item (0) as Term;
+ var t3 = e3.expressions.get_item (0) as MathTerm;
assert (t3 != null);
assert (t3.expressions.get_n_items () == 1);
var v5 = t3.expressions.get_item (0) as Variable;
assert (v5 != null);
- var t4 = e3.expressions.get_item (1) as Term;
+ var t4 = e3.expressions.get_item (1) as MathTerm;
assert (t4 != null);
assert (t4.expressions.get_n_items () == 2);
var plus = t4.expressions.get_item (0) as MathPlus;
@@ -1091,7 +1091,7 @@ class Tests {
var e = a.expressions.get_item (1) as MathPolynomial;
assert (e != null);
assert (e.expressions.get_n_items () == 1);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var ev = t.expressions.get_item (0) as Variable;
assert (ev != null);
@@ -1105,7 +1105,7 @@ class Tests {
var e2 = eq2.expressions.get_item (0) as MathPolynomial;
assert (e2 != null);
assert (e2.expressions.get_n_items () == 1);
- var t2 = e2.expressions.get_item (0) as Term;
+ var t2 = e2.expressions.get_item (0) as MathTerm;
assert (t2 != null);
var v2 = t2.expressions.get_item (0) as Variable;
assert (v2 != null);
diff --git a/tests/gcalc-solving-basic.vala b/tests/gcalc-solving-basic.vala
index 2525d022..6d5664bf 100644
--- a/tests/gcalc-solving-basic.vala
+++ b/tests/gcalc-solving-basic.vala
@@ -87,7 +87,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var c = t.expressions.get_item (0) as MathConstant;
assert (c != null);
@@ -113,7 +113,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
var res = t.solve ();
assert (res != null);
assert (res.expression != null);
@@ -138,7 +138,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
var res = t.solve ();
assert (res != null);
assert (res.expression != null);
@@ -163,7 +163,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
var res = t.solve ();
assert (res != null);
assert (res.expression != null);
@@ -188,8 +188,8 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t1 = e.expressions.get_item (0) as Term;
- var t2 = e.expressions.get_item (1) as Term;
+ var t1 = e.expressions.get_item (0) as MathTerm;
+ var t2 = e.expressions.get_item (1) as MathTerm;
var res = t1.add (t2);
assert (res != null);
message (res.get_type ().name ());
@@ -256,7 +256,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var g = t.expressions.get_item (0) as MathGroup;
assert (g != null);
@@ -336,7 +336,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var g = t.expressions.get_item (0) as MathGroup;
assert (g != null);
@@ -359,7 +359,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var g = t.expressions.get_item (0) as MathGroup;
assert (g != null);
@@ -687,7 +687,7 @@ class Tests {
assert (eq != null);
var e = eq.expressions.get_item (0) as MathPolynomial;
assert (e != null);
- var t = e.expressions.get_item (0) as Term;
+ var t = e.expressions.get_item (0) as MathTerm;
assert (t != null);
var f = t.expressions.get_item (0) as MathFunction;
assert (f != null);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
