* Definition of expression pairs (building blocks of expairseq). */
/*
- * GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#ifndef __GINAC_EXPAIR_H__
#define __GINAC_EXPAIR_H__
-#include <ginac/ex.h>
-#include <ginac/numeric.h>
+#include "ex.h"
+#include "numeric.h"
+#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
/** A pair of expressions.
* This similar to, but slightly extended STL's pair<> but we need to account
public:
expair() {}
~expair() {}
- expair(expair const & other) : rest(other.rest), coeff(other.coeff)
+ expair(const expair & other) : rest(other.rest), coeff(other.coeff)
{
GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
}
- expair const & operator=(expair const & other)
+ const expair & operator=(const expair & other)
{
if (this != &other) {
rest=other.rest;
}
return *this;
}
- expair(ex const & r, ex const & c) : rest(r), coeff(c)
+ expair(const ex & r, const ex & c) : rest(r), coeff(c)
{
GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
}
{
GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
return is_ex_exactly_of_type(rest,numeric) &&
- (ex_to_numeric(coeff).compare(numONE())==0);
+ (coeff.is_equal(ex(1)));
}
- bool is_equal(expair const & other) const
+ bool is_equal(const expair & other) const
{
return (rest.is_equal(other.rest) && coeff.is_equal(other.coeff));
}
- bool is_less(expair const & other) const
+ bool is_less(const expair & other) const
{
return (rest.compare(other.rest)<0) ||
(!(other.rest.compare(rest)<0) && (coeff.compare(other.coeff)<0));
}
- int compare(expair const & other) const
+ int compare(const expair & other) const
{
int cmpval=rest.compare(other.rest);
if (cmpval!=0) return cmpval;
return cmpval;
}
- bool is_less_old2(expair const & other) const
+ bool is_less_old2(const expair & other) const
{
/*
bool this_numeric_with_coeff_1=is_numeric_with_coeff_1();
*/
if (is_ex_exactly_of_type(rest,numeric) &&
is_ex_exactly_of_type(other.rest,numeric)) {
- if (ex_to_numeric(coeff).compare(numONE())==0) {
- if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+ if (coeff.is_equal(ex(1))) {
+ if ((other.coeff).is_equal(ex(1))) {
// both have coeff 1: compare rests
return rest.compare(other.rest)<0;
}
// only this has coeff 1: >
return false;
- } else if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+ } else if ((other.coeff).is_equal(ex(1))) {
// only other has coeff 1: <
return true;
}
(!(other.rest.compare(rest)<0) &&
(coeff.compare(other.coeff)<0));
}
- int compare_old2(expair const & other) const
+ int compare_old2(const expair & other) const
{
if (is_ex_exactly_of_type(rest,numeric) &&
is_ex_exactly_of_type(other.rest,numeric)) {
- if (ex_to_numeric(coeff).compare(numONE())==0) {
- if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+ if ((coeff).is_equal(ex(1))) {
+ if ((other.coeff).is_equal(ex(1))) {
// both have coeff 1: compare rests
return rest.compare(other.rest);
}
// only this has coeff 1: >
return 1;
- } else if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+ } else if ((other.coeff).is_equal(ex(1))) {
// only other has coeff 1: <
return -1;
}
if (cmpval!=0) return cmpval;
return coeff.compare(other.coeff);
}
- bool is_less_old(expair const & other) const
+ bool is_less_old(const expair & other) const
{
return (rest.compare(other.rest)<0) ||
(!(other.rest.compare(rest)<0) && (coeff.compare(other.coeff)<0));
}
- int compare_old(expair const & other) const
+ int compare_old(const expair & other) const
{
int cmpval=rest.compare(other.rest);
if (cmpval!=0) return cmpval;
class expair_is_less
{
public:
- bool operator()(expair const & lh, expair const & rh) const
+ bool operator()(const expair & lh, const expair & rh) const
{
return lh.is_less(rh);
}
class expair_is_less_old
{
public:
- bool operator()(expair const & lh, expair const & rh) const
+ bool operator()(const expair & lh, const expair & rh) const
{
return lh.is_less_old(rh);
}
};
+#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
#endif // ndef __GINAC_EXPAIR_H__