- collect_common_factors() works better with negative powers

[ginac.git] / check / exam_numeric.cpp

diff --git a/check/exam_numeric.cpp b/check/exam_numeric.cpp
index fd1bf872c3296f41f5686af4c5355032d6ed68bd..1be029857dfb889f1ab6bf7b146163f9eb07bb06 100644 (file)
--- a/check/exam_numeric.cpp
+++ b/check/exam_numeric.cpp
@@ -4,7 +4,7 @@
  *  tests on these numbers like is_integer() etc... */
 
 /*
  *  tests on these numbers like is_integer() etc... */
 
 /*

- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 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
  *
  *  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


@@ -23,6 +23,8 @@
 
 #include "exams.h"
 
 
 #include "exams.h"
 

+#include <sstream>
+

 /* Simple and maybe somewhat pointless consistency tests of assorted tests and
  * conversions. */
 static unsigned exam_numeric1(void)
 /* Simple and maybe somewhat pointless consistency tests of assorted tests and
  * conversions. */
 static unsigned exam_numeric1(void)


@@ -79,7 +81,7 @@ static unsigned exam_numeric1(void)
        }
        
        e2 = test_int1 + a;
        }
        
        e2 = test_int1 + a;

-       if (ex_to_numeric(e2).is_integer()) {
+       if (e2.info(info_flags::integer)) {

                clog << "expression " << e2
                     << " erroneously recognized as integer" << endl;
                ++result;
                clog << "expression " << e2
                     << " erroneously recognized as integer" << endl;
                ++result;


@@ -315,6 +317,62 @@ static unsigned exam_numeric5(void)
        return result;
 }
 
        return result;
 }
 

+/* This test checks whether the numeric output/parsing routines are
+   consistent. */
+static unsigned exam_numeric6(void)
+{
+       unsigned result = 0;
+
+       symbol sym("sym");
+       vector<ex> test_numbers;
+       test_numbers.push_back(numeric(0));                     // zero
+       test_numbers.push_back(numeric(1));                     // one
+       test_numbers.push_back(numeric(-1));            // minus one
+       test_numbers.push_back(numeric(42));            // positive integer
+       test_numbers.push_back(numeric(-42));           // negative integer
+       test_numbers.push_back(numeric(14,3));          // positive rational
+       test_numbers.push_back(numeric(-14,3));         // negative rational
+       test_numbers.push_back(numeric(3.141));         // positive decimal
+       test_numbers.push_back(numeric(-3.141));        // negative decimal
+       test_numbers.push_back(numeric(0.1974));        // positive decimal, leading zero
+       test_numbers.push_back(numeric(-0.1974));       // negative decimal, leading zero
+       test_numbers.push_back(sym);                            // symbol
+
+       for (vector<ex>::const_iterator br=test_numbers.begin(); br<test_numbers.end(); ++br) {
+               for (vector<ex>::const_iterator bi=test_numbers.begin(); bi<test_numbers.end(); ++bi) {
+
+                       for (vector<ex>::const_iterator er=test_numbers.begin(); er<test_numbers.end(); ++er) {
+                               for (vector<ex>::const_iterator ei=test_numbers.begin(); ei<test_numbers.end(); ++ei) {
+
+                                       // Construct expression, don't test invalid ones
+                                       ex base = (*br) + (*bi)*I, exponent = (*er) + (*ei)*I, x;
+                                       try {
+                                               x = pow(base, exponent);
+                                       } catch (...) {
+                                               continue;
+                                       }
+
+                                       // Print to string
+                                       std::ostringstream s;
+                                       s << x;
+
+                                       // Read back expression from string
+                                       string x_as_string = s.str();
+                                       ex x_again(x_as_string, lst(sym));
+
+                                       // They should be equal
+                                       if (!x_again.is_equal(x)) {
+                                               clog << x << " was read back as " << x_again << endl;
+                                               ++result;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       return result;
+}
+

 unsigned exam_numeric(void)
 {
        unsigned result = 0;
 unsigned exam_numeric(void)
 {
        unsigned result = 0;


@@ -327,6 +385,7 @@ unsigned exam_numeric(void)
        result += exam_numeric3();  cout << '.' << flush;
        result += exam_numeric4();  cout << '.' << flush;
        result += exam_numeric5();  cout << '.' << flush;
        result += exam_numeric3();  cout << '.' << flush;
        result += exam_numeric4();  cout << '.' << flush;
        result += exam_numeric5();  cout << '.' << flush;

+       result += exam_numeric6();  cout << '.' << flush;

        
        if (!result) {
                cout << " passed " << endl;
        
        if (!result) {
                cout << " passed " << endl;