- sources now include "ginac.h" instead of <ginac/ginac.h>, changed Makefile.am

  to add ../ginac to include path

diff --git a/check/Makefile.am b/check/Makefile.am
index 5c251ed2686dec0e6fe7f97ee9a44365ba6c0a83..3e1ed8bda4d5dfd27e256590aeac69ea8e85b2b4 100644 (file)
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -7,5 +7,6 @@ check_ginac_SOURCES = paranoia_check.cpp numeric_output.cpp \
   matrix_checks.cpp series_expansion.cpp lortensor_check.cpp \
   fcntimer.cpp main.cpp check.h
 check_ginac_LDADD = ../ginac/libginac.la
+INCLUDES = -I$(srcdir)/../ginac
 CLEANFILES = result.out
 EXTRA_DIST = result.ref run_checks

diff --git a/check/Makefile.in b/check/Makefile.in
index 41fe7c479e74b36c39a72b6537e68b66c42f33c4..539353ccb565a12322102f1648aeb862fa9175ec 100644 (file)
--- a/check/Makefile.in
+++ b/check/Makefile.in
@@ -108,6 +108,7 @@ check_PROGRAMS = check_ginac
 check_ginac_SOURCES = paranoia_check.cpp numeric_output.cpp   numeric_consist.cpp powerlaws.cpp expand_subs.cpp inifcns_consist.cpp   differentiation.cpp poly_gcd.cpp normalization.cpp lsolve_onedim.cpp   matrix_checks.cpp series_expansion.cpp lortensor_check.cpp   fcntimer.cpp main.cpp check.h
 
 check_ginac_LDADD = ../ginac/libginac.la
+INCLUDES = -I$(srcdir)/../ginac
 CLEANFILES = result.out
 EXTRA_DIST = result.ref run_checks
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -252,7 +253,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/check/differentiation.cpp b/check/differentiation.cpp
index ad91add89abc519b868c4719f0dafc80a4fb8714..307bd59a6e0e4d6c85930b3281dc9738ac6e073e 100644 (file)
--- a/check/differentiation.cpp
+++ b/check/differentiation.cpp
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/expand_subs.cpp b/check/expand_subs.cpp
index 4c2236ac89b6f5d844fb70293b97036b3307dded..419cea7f2962fd792d4f8b94013fba5e180c3fdc 100644 (file)
--- a/check/expand_subs.cpp
+++ b/check/expand_subs.cpp
@@ -31,7 +31,7 @@
  */
 
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/inifcns_consist.cpp b/check/inifcns_consist.cpp
index 34a97b69a9946c6f0453045dfeb8bdda41deebfc..c30ddefec5316266970297022066c4816b52f1cc 100644 (file)
--- a/check/inifcns_consist.cpp
+++ b/check/inifcns_consist.cpp
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/lortensor_check.cpp b/check/lortensor_check.cpp
index b8543e4bb0f735bb130f23d2f2926d0851765320..c153ee4932c71ace09b009e1904e945c7457d7b2 100644 (file)
--- a/check/lortensor_check.cpp
+++ b/check/lortensor_check.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <stdexcept>
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/lsolve_onedim.cpp b/check/lsolve_onedim.cpp
index 097a01227b90050b3f7fcadc8736121e22422b9d..99311240cc5c68f0ff06391e6914293bb980d904 100644 (file)
--- a/check/lsolve_onedim.cpp
+++ b/check/lsolve_onedim.cpp
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/matrix_checks.cpp b/check/matrix_checks.cpp
index cfc81fa01cce3814cddab3783ea33ee605eb721f..9e907ec365127aa63a70091d15a44e9664813079 100644 (file)
--- a/check/matrix_checks.cpp
+++ b/check/matrix_checks.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <stdexcept>
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/normalization.cpp b/check/normalization.cpp
index 7144c278ce292f20e7def2ab11017b517e4e870b..4a212988e3d8def83dd21097236207fe97c9060d 100644 (file)
--- a/check/normalization.cpp
+++ b/check/normalization.cpp
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/numeric_consist.cpp b/check/numeric_consist.cpp
index 7d836e303a14b50e7da4c0096d06006839299b56..5839da10e9e7530cb7867cd6dbb6e680c17292ec 100644 (file)
--- a/check/numeric_consist.cpp
+++ b/check/numeric_consist.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <stdlib.h>
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/numeric_output.cpp b/check/numeric_output.cpp
index f2390d2b00c7ae2e9d5d8ff81e2aeb62cb837676..6b3a2599e2d2303fda03074a1e343f6a60cc5f64 100644 (file)
--- a/check/numeric_output.cpp
+++ b/check/numeric_output.cpp
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/paranoia_check.cpp b/check/paranoia_check.cpp
index 1926ada9c244767cf6ef986bc6d7f64cb584c33f..b7552dcdf8508fd7707f5710670f5367cc77889b 100644 (file)
--- a/check/paranoia_check.cpp
+++ b/check/paranoia_check.cpp
@@ -23,15 +23,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
 #endif // ndef NO_NAMESPACE_GINAC
 
 // The very first pair of historic problems had its roots in power.cpp and was
-// finally resolved on April 27th. (Fixing the first on April 23rd actually
-// introduced the second.)
+// finally resolved on April 27th 1999. (Fixing the first on April 23rd
+// actually introduced the second.)
 static unsigned paranoia_check1(void)
 {
     unsigned result = 0;
@@ -95,8 +95,9 @@ static unsigned paranoia_check2(void)
     return result;
 }
 
-// The third bug was introduced on May 18, discovered on May 19 and fixed that
-// same day.  It worked when x was substituted by 1 but not with other numbers:
+// The third bug was introduced on May 18th 1999, discovered on May 19 and
+// fixed that same day.  It worked when x was substituted by 1 but not with
+// other numbers:
 static unsigned paranoia_check3(void)
 {
     unsigned result = 0;
@@ -125,7 +126,7 @@ static unsigned paranoia_check3(void)
     return result;
 }
 
-// The fourth bug was also discovered on May 19 and fixed immediately:
+// The fourth bug was also discovered on May 19th 1999 and fixed immediately:
 static unsigned paranoia_check4(void)
 {
     unsigned result = 0;
@@ -150,7 +151,7 @@ static unsigned paranoia_check4(void)
     return result;
 }
 
-// The fifth oops was discovered on May 20 and fixed a day later:
+// The fifth oops was discovered on May 20th 1999 and fixed a day later:
 static unsigned paranoia_check5(void)
 {
     unsigned result = 0;
@@ -169,7 +170,7 @@ static unsigned paranoia_check5(void)
     return result;
 }
 
-// This one was discovered on Jun 1 and fixed the same day:
+// This one was discovered on Jun 1st 1999 and fixed the same day:
 static unsigned paranoia_check6(void)
 {
     unsigned result = 0;
@@ -186,8 +187,8 @@ static unsigned paranoia_check6(void)
     return result;
 }
 
-// This one was introduced on June 1 by some aggressive manual optimization.
-// Discovered and fixed on June 2.
+// This one was introduced on June 1st 1999 by some aggressive manual
+// optimization. Discovered and fixed on June 2nd.
 static unsigned paranoia_check7(void)
 {
     unsigned result = 0;
@@ -206,8 +207,8 @@ static unsigned paranoia_check7(void)
 }
 
 // This one was a result of the rewrite of mul::max_coefficient when we
-// introduced the overall_coefficient field in expairseq objects on Oct 1.
-// Fixed on Oct 4.
+// introduced the overall_coefficient field in expairseq objects on Oct 1st
+// 1999. Fixed on Oct 4th.
 static unsigned paranoia_check8(void)
 {
     unsigned result = 0;
@@ -225,6 +226,26 @@ static unsigned paranoia_check8(void)
     return result;
 }
 
+// This one was a result of a modification to frac_cancel() & Co. to avoid
+// expanding the numerator and denominator when bringing them from Q[X] to
+// Z[X]. multiply_lcm() forgot to multiply the x-linear term with the LCM of
+// the coefficient's denominators (2 in this case). Introduced on Jan 25th
+// 2000 and fixed on Jan 31th.
+static unsigned paranoia_check9(void)
+{
+    unsigned result = 0;
+    symbol x("x");
+
+    ex e = (exp(-x)-2*x*exp(-x)+pow(x,2)/2*exp(-x))/exp(-x);
+    ex f = e.normal();
+
+    if (!f.is_equal(1-2*x+pow(x,2)/2)) {
+        clog << "normal(" << e << ") returns " << f << " instead of 1-2*x+1/2*x^2\n";
+        ++result;
+    }
+    return result;
+}
+
 unsigned paranoia_check(void)
 {
     unsigned result = 0;
@@ -240,6 +261,7 @@ unsigned paranoia_check(void)
     result += paranoia_check6();
     result += paranoia_check7();
     result += paranoia_check8();
+    result += paranoia_check9();
 
     if (!result) {
         cout << " passed ";

diff --git a/check/poly_gcd.cpp b/check/poly_gcd.cpp
index 1e25add7f2fa257dec3a0e0184b685350da4018e..0e6780c81f65b49362666ce194f5f392f3f9c200 100644 (file)
--- a/check/poly_gcd.cpp
+++ b/check/poly_gcd.cpp
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/powerlaws.cpp b/check/powerlaws.cpp
index 83ea03da832d551b36afa5c81a2a950a6126e28f..e885369c36378f59bb0a34ea82c89ad9c6b61602 100644 (file)
--- a/check/powerlaws.cpp
+++ b/check/powerlaws.cpp
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/check/run_checks b/check/run_checks
index 1c9e6bab33e3163df883960611d05a5eba1b9a24..8d3adcbb4ba9aa3595714de81cb49755b4530adb 100755 (executable)
--- a/check/run_checks
+++ b/check/run_checks
@@ -2,4 +2,4 @@
 echo "Running checks..."
 ./check_ginac 2>result.out
 echo "Comparing output..."
-cmp result.ref result.out
+cmp ${srcdir}/result.ref result.out

diff --git a/check/series_expansion.cpp b/check/series_expansion.cpp
index 6d482baa60f1c260ec62954d0f665846cc955366..4cd169706d0dd4ca418f5ccdd6c70cd5e68ff9f7 100644 (file)
--- a/check/series_expansion.cpp
+++ b/check/series_expansion.cpp
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;