X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fmatrix_checks.cpp;h=9e907ec365127aa63a70091d15a44e9664813079;hp=80d8bf95a718d9f2d9b961bb82d8e3c1fd638a0e;hb=ff6822e9aa640a0ee6eeb653e891a236a19a1e64;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/check/matrix_checks.cpp b/check/matrix_checks.cpp
index 80d8bf95..9e907ec3 100644
--- a/check/matrix_checks.cpp
+++ b/check/matrix_checks.cpp
@@ -3,7 +3,7 @@
  *  Here we test manipulations on GiNaC's symbolic matrices. */
 
 /*
- *  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
@@ -21,8 +21,11 @@
  */
 
 #include <stdexcept>
-#include <ginac/ginac.h>
+#include "ginac.h"
+
+#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
+#endif // ndef NO_NAMESPACE_GINAC
 
 static unsigned matrix_determinants(void)
 {
@@ -123,10 +126,10 @@ static unsigned matrix_invert2(void)
     matrix m_i = m.inverse();
     ex det = m.determinant().expand();
     
-    if ( (normal(m_i(0,0)*det) != d) ||
-         (normal(m_i(0,1)*det) != -b) ||
-         (normal(m_i(1,0)*det) != -c) ||
-         (normal(m_i(1,1)*det) != a) ) {
+    if ((normal(m_i(0,0)*det) != d) ||
+        (normal(m_i(0,1)*det) != -b) ||
+        (normal(m_i(1,0)*det) != -c) ||
+        (normal(m_i(1,1)*det) != a)) {
         clog << "inversion of 2x2 matrix " << m
              << " erroneously returned " << m_i << endl;
         return 1;
@@ -146,15 +149,15 @@ static unsigned matrix_invert3(void)
     matrix m_i = m.inverse();
     ex det = m.determinant().normal().expand();
     
-    if ( (normal(m_i(0,0)*det) != (e*i-f*h)) ||
-         (normal(m_i(0,1)*det) != (c*h-b*i)) ||
-         (normal(m_i(0,2)*det) != (b*f-c*e)) ||
-         (normal(m_i(1,0)*det) != (f*g-d*i)) ||
-         (normal(m_i(1,1)*det) != (a*i-c*g)) ||
-         (normal(m_i(1,2)*det) != (c*d-a*f)) ||
-         (normal(m_i(2,0)*det) != (d*h-e*g)) ||
-         (normal(m_i(2,1)*det) != (b*g-a*h)) ||
-         (normal(m_i(2,2)*det) != (a*e-b*d)) ) {
+    if ((normal(m_i(0,0)*det) != (e*i-f*h)) ||
+        (normal(m_i(0,1)*det) != (c*h-b*i)) ||
+        (normal(m_i(0,2)*det) != (b*f-c*e)) ||
+        (normal(m_i(1,0)*det) != (f*g-d*i)) ||
+        (normal(m_i(1,1)*det) != (a*i-c*g)) ||
+        (normal(m_i(1,2)*det) != (c*d-a*f)) ||
+        (normal(m_i(2,0)*det) != (d*h-e*g)) ||
+        (normal(m_i(2,1)*det) != (b*g-a*h)) ||
+        (normal(m_i(2,2)*det) != (a*e-b*d))) {
         clog << "inversion of 3x3 matrix " << m
              << " erroneously returned " << m_i << endl;
         return 1;
@@ -227,7 +230,7 @@ unsigned matrix_checks(void)
     result += matrix_invert3();
     result += matrix_misc();
     
-    if (! result) {
+    if (!result) {
         cout << " passed ";
         clog << "(no output)" << endl;
     } else {